cinelerra fix and patch added

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

3 files changed, 45 insertions, 16 deletions

diff --git a/media/video/cinelerra/Manifest b/media/video/cinelerra/Manifest
index 40b22b6..cd7b81a 100644
--- a/media/video/cinelerra/Manifest
+++ b/media/video/cinelerra/Manifest
@@ -1,4 +1,5 @@
-MKBUILD cinelerra.mkbuild 3808 MD5 f8dbbdec4bb2346886ce25cffa3b0736 RMD160 2aa96f89fd9419f22f7dba7bd8f9cf2256235f93 SHA1 c9bcf52b141b1bbaed027884314fe190d9e6cf05 SHA256 e07135e5653af22bfb4b17b7989f2b106856f1130d0454ed8d51cd3650802afe SHA512 7817f8b281efab8fed2ffba7ba2dc3b058dcf07b9da9f11047e9224e717180092ad79be8007751c1de511e2daddbc90509d554e12b8df28b7aec56a81ace6655
+MKBUILD cinelerra.mkbuild 3698 MD5 8223865ff2f1655a0efd8ab718f122cc RMD160 07ff411d821a611437742191600878e0dfd891c4 SHA1 63b31c70ca9fcdead01876a44b65c8e4902ae204 SHA256 dfeb07bd9966461408f58f100f98b4c8afa5c8d70686541c32ad258f6e949d1b SHA512 351d3909342cc8208cc0ea51d35b0d6e0e2016d756a17f296e833f07ecfbc8b8b0d3f91dfca174cbcd54000701bc273b42dd2835bf2a1acf6ffdeb2033606b22
 PATCH cinelerra-altivec.diff 1512 MD5 4d355626b69e0a5ec80ffe7b0d67a04a RMD160 1aa86330043b309e2ae8bb0ebcd84112a16aa096 SHA1 078b15b78fbbf1abe61c33360ebf09915570dc98 SHA256 6ea5e62dce887178e0af5664034a10561c804f5b09c47fae16263c6cc40ac3ef SHA512 2c979f10e4a6d047ba1a7d18d62552da946e9ac5e5089edcae44b3817bd5f0f15216c63788e0cd00e4feb5cb3d20d0506f22a838b02598d6d51dacff06e75e56
-SLACK-REQUIRED slack-required 227 MD5 fc6187d24f2cc8adfc9cbd6153700277 RMD160 62a787c2a1e700d9c2c2f97e3dd62fdd3eb7bfde SHA1 aa816f2a6da9d17c3fa7d207ef4c4398b6666adf SHA256 f3819a9a0ad71dfaece8761c14ac792a94c4427358a12342be38f1f727d6568f SHA512 452508047b803de064498f10166a0df18a9767e20951375587e7562476555ff32adaec628dae1f9b533f389dc5230040a7ae25d574a549de9286523849a226f5
-SLACKBUILD cinelerra.SlackBuild 6786 MD5 9053e59a656cff046c4ea9c2a1e67382 RMD160 468b7bff776ab6422c5c19295b2963fbaf3d0820 SHA1 f50d9ee316f3b17065bc5b64be28df2b79be908a SHA256 70634623522c4996f4f689c9c1bc260ba208aff9829d9fd1da879debccf576c6 SHA512 20119239bd36b8a46228e463dbf0c773a843ad3ba9c1f4441f07ac569227ed38914ab24a7a53467109a15a5e7cce206256866d04632c7332575ad7e4f53174b6
+PATCH cinelerra-git_version.diff 386 MD5 4edab9c08f9aa2a000e8ad2448df3a2f RMD160 d9a5b10836435fce72bc4b3ba0dc169f43b00878 SHA1 fe42ed01fa441d57978f8b3ae08b3375a23411af SHA256 3718f88e955c0f019c506528ea72f02c65cb0e24642e256f8544dfd1d99c4d50 SHA512 aec168d4b79f6d901c75b65e7acb1877678b29fcbcff3136257e3e3ea74d704f7aaba93beb0d9da9ad4223f44c44e482258bf12f6835ca23a601e247badcc905
+SLACK-REQUIRED slack-required 238 MD5 6f4bb0514f34bbdbf57ccccec8e43dde RMD160 501a2205f942d6b3af700fa71527f6fa49fbb9b5 SHA1 62124d02edd9cd533d71e48fbd3ddf931391b837 SHA256 d66761e5d0949530f2acdea4436ee4eb25ae07ab1446b739d97d9add3ef557e6 SHA512 3e9b81f07e31d2d2b1ae75ececfb7baf35d54a94e51efe971d3a95f22cb63bf700751584c8abdfa81bece961651c1d3514b2088ba19d36606ea4b1cab85164ce
+SLACKBUILD cinelerra.SlackBuild 6557 MD5 596c66f43b67951781e4d81a492e842e RMD160 d773eabe77cb5b90bfe9b0034097257f96ae2b3b SHA1 abbd0c8ff67ed9648eec4095cfecd44a4f4db714 SHA256 3533c2c982ba29723a68258365971f82f3896312f50465c4f706587166cc655c SHA512 8610a9487709e8fa3e5d2a61a1b72f2bdff4b532106fb82dbd8af3fd4fa44e24d0db28753945eb2ff07d5dbcb3551bffc015ef753f93ffb863fe1cfe9f7e3d4d
diff --git a/media/video/cinelerra/cinelerra-git_version.diff b/media/video/cinelerra/cinelerra-git_version.diff
new file mode 100644
index 0000000..04352db
--- /dev/null
+++ b/media/video/cinelerra/cinelerra-git_version.diff
@@ -0,0 +1,35 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 85e5614..6cea249 100644
+--- a/cinelerra/ffmpeg.C
++++ b/cinelerra/ffmpeg.C
+@@ -6,6 +6,13 @@ extern "C" {
+ }
+ #endif
+ 
++/* fix for newer ffmpeg */
++#ifndef PIX_FMT_YUV422
++#define PIX_FMT_YUV422 PIX_FMT_YUYV422
++#endif
++#ifndef PIX_FMT_RGBA32 
++#define PIX_FMT_RGBA32 PIX_FMT_RGB32
++#endif 
+ 
+ #include "filebase.h"
+ #include "quicktime.h"
+diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
+index 594a213..a6d272c 100644
+--- a/quicktime/qtffmpeg.c
++++ b/quicktime/qtffmpeg.c
+@@ -8,8 +8,10 @@
+ // FFMPEG front end for quicktime.
+ 
+ 
+-
+-
++// fix for newer ffmpeg, don't break w/ older ones...
++#ifndef PIX_FMT_YUV422
++#define PIX_FMT_YUV422 PIX_FMT_YUYV422
++#endif
+ 
+ 
+ 
diff --git a/media/video/cinelerra/cinelerra.mkbuild b/media/video/cinelerra/cinelerra.mkbuild
index 72f33bb..d11a866 100644
--- a/media/video/cinelerra/cinelerra.mkbuild
+++ b/media/video/cinelerra/cinelerra.mkbuild
@@ -39,9 +39,12 @@
 # PKG_NAME version.  Null ("") to auto-set.
 [[VERSION]]="git_version"
 
+# Other configure arguments
+[[OTHER CONFIGURE ARGS]]="--with-external-ffmpeg"
+
 #
 # Dependency list input
-[[SLACK REQUIRED]]="openexr: libdv: libx264: mjpegtools: fftw: liba52: lame: libsndfile: faac: faad2: libraw1394: libiec61883: libavc1394"
+[[SLACK REQUIRED]]="openexr: libdv: libx264: mjpegtools: fftw: liba52: lame: libsndfile: faac: faad2: libraw1394: libiec61883: libavc1394: ffmpeg"
 
 #
 # Documentation files
@@ -112,16 +115,6 @@ cinelerra:
 
 #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
+#p<
+