merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@233 18ef50b8-d735-4ccd-97c1-689132df3dd9

2 files changed, 174 insertions, 0 deletions

diff --git a/media/video/cinelerra/cinelerra-altivec.diff b/media/video/cinelerra/cinelerra-altivec.diff
new file mode 100644
index 0000000..cf4f57d
--- /dev/null
+++ b/media/video/cinelerra/cinelerra-altivec.diff
@@ -0,0 +1,49 @@
+Index: quicktime/ffmpeg/libavcodec/Makefile.am
+===================================================================
+--- quicktime/ffmpeg/libavcodec/Makefile.am	(revision 958)
++++ quicktime/ffmpeg/libavcodec/Makefile.am	(working copy)
+@@ -11,6 +11,9 @@
+ if TARGET_ARCH_POWERPC
+ MM_DIR = ppc
+ MM_LIB = ppc/libavcodecppc.la
++## if TARGET_ALTIVEC
++MM_FLAGS = -DHAVE_ALTIVEC -maltivec -mabi=altivec
++## endif
+ endif
+ 
+ SUBDIRS = $(MM_DIR)
+Index: quicktime/ffmpeg/libavcodec/ppc/Makefile.am
+===================================================================
+--- quicktime/ffmpeg/libavcodec/ppc/Makefile.am	(revision 958)
++++ quicktime/ffmpeg/libavcodec/ppc/Makefile.am	(working copy)
+@@ -1,15 +1,27 @@
+ noinst_LTLIBRARIES = libavcodecppc.la
+ 
++# experimental code for altivec:
++## if TARGET_ALTIVEC
++ALTIVEC_FLAGS = -maltivec -mabi=altivec -DHAVE_ALTIVEC
++ALTIVEC_FILES = dsputil_altivec.c dsputil_h264_altivec.c fft_altivec.c gmc_altivec.c fdct_altivec.c idct_altivec.c mpegvideo_altivec.c 
++## else
++## ALTIVEC_FLAGS = 
++## ALTIVEC_FILES = 
++## endif
++
++
+ # special options needed due to scarcity of registers
+ AM_CFLAGS = \
+ 	$(LARGEFILE_CFLAGS) \
+ 	$(CPU_CFLAGS) \
++	$(ALTIVEC_FLAGS) \
+ 	-O3 -prefer-non-pic \
+ 	-D_GNU_SOURCE -DHAVE_AV_CONFIG_H -I$(srcdir)/../..
+ 
+ libavcodecppc_la_SOURCES = \
+-	dsputil_ppc.c mpegvideo_ppc.c
++	dsputil_ppc.c mpegvideo_ppc.c \
++	$(ALTIVEC_FILES)
+ 
+-EXTRA_DIST = dsputil_ppc.c \
+-	mpegvideo_ppc.c
++EXTRA_DIST = dsputil_h264_template_altivec.c \
++	dsputil_altivec.h dsputil_ppc.h
+ 
diff --git a/media/video/cinelerra/cinelerra.mkbuild b/media/video/cinelerra/cinelerra.mkbuild
new file mode 100644
index 0000000..0fd8721
--- /dev/null
+++ b/media/video/cinelerra/cinelerra.mkbuild
@@ -0,0 +1,125 @@
+#
+#  This mkbuild is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or any later version.
+#
+#  This mkbuild is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+#  Place - Suite 330, Boston, MA 02111-1307, USA
+#
+
+#--------------------
+# Personal variables
+#--------------------
+# Author name
+[[SLACKBUILD AUTHOR]]="Silvio Rhatto"
+
+# Initials author name
+[[SLACKBUILD AUTHOR INITIALS]]="rha"
+
+#------------------------
+# Construction Variables
+#------------------------
+#
+# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
+[[DOWNLOAD FOLDER URL]]="svn://svn.skolelinux.org/cinelerra/trunk/hvirtual"
+
+# Source base name. if different from PKG_NAME name. Null ("") to default value.
+[[SOURCE NAME]]="cinelerra"
+
+# Package name. Null ("") to auto-set
+# Auto-set, get PKG_NAME from URL downcase(SRC_NAME): http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[PACKAGE NAME]]="cinelerra"
+
+#
+# PKG_NAME version.  Null ("") to auto-set.
+[[VERSION]]="svn_version"
+
+#
+# Dependency list input
+[[SLACK REQUIRED]]="openexr: libdv: libx264: mjpegtools: fftw: liba52: lame: libsndfile: faac: faad2: libraw1394: libiec61883: libavc1394"
+
+#
+# Documentation files
+[[DOCUMENTATION FILES]]="AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README TODO"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="media/viddeo/cinelerra"
+
+#---------------------
+# SlackBuild Sections
+#---------------------
+# Default sections:
+#      head, set_variables, slkflags, start_structure, untar_source,
+#      make_package, install_package, build_package
+# Warning: don't remove '#>>' and "#<<" tags.
+#>> Start SlackBuild Sections:
+ on: head
+ on: slackbuildrc
+ on: set_variables
+ on: slkflags
+ on: error_codes
+ on: start_structure
+off: create_build_user_and_group
+off: download_source
+ on: svn_source
+off: md5sum_download_and_check_0
+off: md5sum_download_and_check_1
+off: gpg_signature_check
+off: untar_source
+ on: patch_source
+ on: configure
+ on: make_package
+ on: install_package
+ on: strip_binaries
+off: compress_manpages
+off: compress_info_files
+off: copy_init_scripts
+off: copy_config_files
+ on: install_documentation
+ on: slackdesc
+off: move_config_files
+off: postinstall_script
+ on: build_package
+ on: clean_builds
+#<< End SlackBuild Sections
+
+#------------------
+# Sections changes
+#------------------
+#>slackdesc
+cinelerra: cinelerra (cinelerra is powerfull Non Linear Video Editor)
+cinelerra:
+cinelerra: Heroine Virtual Ltd. presents an advanced content creation system 
+cinelerra: for Linux. Cinelerra takes what normally is a boring server - studied
+cinelerra: in computer science classrooms, hidden in back offices - and turns it
+cinelerra: into a 50,000 watt flamethrower of multimedia editing.
+cinelerra: 
+cinelerra: This version is the cv.cinelerra.org branch (in fact, a fork).
+cinelerra: 
+cinelerra: http://cv.cinelerra.org/
+cinelerra: 
+#<slackdesc
+
+#p>
+ # Configure
++if [ "$ARCH" == "i586" ] || [ "$ARCH" == "i686" ]; then
++  CONF_OPTIONS="$CONF_OPTIONS --enable-mmx"
++fi
++
++if [ "$HAVE_ALTIVEC" == "true" ]; then
++  CONF_OPTIONS="$CONF_OPTIONS --enable-altivec"
++  if [ -f "$CWD/$PACKAGE-altivec.diff" ]; then
++    patch -p0 < $CWD/$PACKAGE-altivec.diff || exit $ERROR_PATCH
++  fi 
++fi
++
++./autogen.sh || exit $ERROR_CONF
+#<p