diff options
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/cinelerra/Manifest | 27 | ||||
| -rw-r--r-- | media/video/cinelerra/cinelerra-git_version.diff | 35 | ||||
| -rwxr-xr-x | media/video/cinelerra/cinelerra.SlackBuild | 15 | ||||
| -rw-r--r-- | media/video/cinelerra/slack-required | 1 |
4 files changed, 62 insertions, 16 deletions
diff --git a/media/video/cinelerra/Manifest b/media/video/cinelerra/Manifest index 40b22b60..22772614 100644 --- a/media/video/cinelerra/Manifest +++ b/media/video/cinelerra/Manifest @@ -1,4 +1,25 @@ -MKBUILD cinelerra.mkbuild 3808 MD5 f8dbbdec4bb2346886ce25cffa3b0736 RMD160 2aa96f89fd9419f22f7dba7bd8f9cf2256235f93 SHA1 c9bcf52b141b1bbaed027884314fe190d9e6cf05 SHA256 e07135e5653af22bfb4b17b7989f2b106856f1130d0454ed8d51cd3650802afe SHA512 7817f8b281efab8fed2ffba7ba2dc3b058dcf07b9da9f11047e9224e717180092ad79be8007751c1de511e2daddbc90509d554e12b8df28b7aec56a81ace6655 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MKBUILD cinelerra.mkbuild 3573 MD5 b64de9891e6996d109e84339ad8a432a RMD160 ce9030a5093579b32e4de4e06b2d3efc48679a04 SHA1 7107c8a737d527239df4c87b2ea9fc6cc5e325e3 SHA256 c957b705d6514eba4bfb5c957f3f17b2ac7b4011c3d34061019dcd2efcf80c58 SHA512 a7d5e5dbfa092481deed02abe560fbeacc76afa1dae4bd325098926b8f9c053af00585cb49f7b77518ae1f2098f313c66cd8e22ad86243a622f292f53e945cee 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 6391 MD5 ce32b2915aa1375a98428064542c60d3 RMD160 c8310b229f7acc7cbc5b8dd9d742bf3b2ce8f5a9 SHA1 d52ca7d86a0ff9553dc280f03eae0baf7abeb1cd SHA256 91770999949e6c1164429e9262d69e87e503ee16930cf0d53cfa5bce1975b542 SHA512 cf3bd370090ac652abbaf32b7122540a6e4616d3b99467aae2cb8e7b78a6d804cbeafa7324aeb34c98e38d219c84722b01583f333dbe8018f6ede8a55d9a6b99 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBAgAGBQJJ/er8AAoJEEHL93ESzgeipa4QALOR4yDPRBiMSZ3KuNz4bhgy +eeKrRLXyHDHWOL1q/SPq93fcDF7a4tmFi6M+fVUEzQA/AHeGh0N/Ip7Yu1gl3CVw +aoIuYQdG5KWwoyDu5sBxjmVcyNAwsTaV+QcyCmBnoLKJ/32en8ftqnFDmSIJ2GU1 +sZtk2IJF7df9RWL8CRcCBHj/sgi6lWLaw9BOj0LdPorpRKx6aSEEuiU5U3A00jsW +wUnC03tAEQUZQDREat0fJftu1r5iHieNe7XuE7vTQ259UDooDf7VYlSX1+UsMhpl +mlOR33T15862IEYo0Avj/ueb/XAxyg0PkRMkBKKgV0OjXwuv9GB3eZpDqslmhGfW +ukKJRevw7AhW5a5KtJ1lapfWbPe1E7V1E3Newm/fxcM5zNtBm8OWfHSi1uR9xnKO +/K6r/6mRP4xP8NuGgOEqPbAGYpdO+U8v+9LeRB5QuOoRS5HyXmF6n4dT3mpEAYWp +MZAwLoVYigdpSrZd0jOawGkaUQrLHAg1yu9nhKaYuRPFtefoj5P0pWFL47M6haJL +A1v6aW3BeXXwRWEWgrsGoNrDj1KkgQWwm//0MdmH4kF3RFEEvVvlqgHZy4lK1859 +yaQm2zTK9bllRpiTcc2zOcxUmSzPvpY7h2EEQ78Fhp7WL8qUPHCdI9/bejaJtbym +NXl2ZNCBPUWjhRoRXWUg +=zt52 +-----END PGP SIGNATURE----- diff --git a/media/video/cinelerra/cinelerra-git_version.diff b/media/video/cinelerra/cinelerra-git_version.diff new file mode 100644 index 00000000..04352db7 --- /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.SlackBuild b/media/video/cinelerra/cinelerra.SlackBuild index 78c50cec..511fd10d 100755 --- a/media/video/cinelerra/cinelerra.SlackBuild +++ b/media/video/cinelerra/cinelerra.SlackBuild @@ -15,7 +15,7 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for cinelerra, by Silvio Rhatto -# requires: openexr libdv libx264 mjpegtools fftw liba52 lame libsndfile faac faad2 libraw1394 libiec61883 libavc1394 +# requires: # tested: cinelerra-git_version # model: generic.mkSlackBuild $Rev: 805 $ # @@ -42,7 +42,7 @@ REPOS=${REPOS:=$TMP} SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/cinelerra"} PREFIX=${PREFIX:=/usr} PKG_WORK="$TMP/$SRC_NAME" -CONF_OPTIONS=${CONF_OPTIONS:=""} +CONF_OPTIONS=${CONF_OPTIONS:="--with-external-ffmpeg"} NUMJOBS=${NUMJOBS:=""} # Set system libraries' path and optmization flags based on $ARCH @@ -125,17 +125,6 @@ for patch in $patches; do done # 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 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/media/video/cinelerra/slack-required b/media/video/cinelerra/slack-required index 8b10b8d6..d565a2a4 100644 --- a/media/video/cinelerra/slack-required +++ b/media/video/cinelerra/slack-required @@ -14,3 +14,4 @@ faad2 libraw1394 libiec61883 libavc1394 +ffmpeg |