diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mlt/Manifest | 21 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.2-motion-est-amd64.patch | 172 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-avdevice.patch | 13 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch | 13 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-bashism.patch | 11 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-double-fps.patch | 16 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch | 24 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-gcc-4.3.patch | 32 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-sox1400.patch | 190 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.2.4-sox1410.patch | 60 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-0.2.4-r2.ebuild | 106 |
11 files changed, 0 insertions, 658 deletions
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 64ff11c6f7a1..1e6388ed7296 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,28 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX mlt-0.2.2-motion-est-amd64.patch 6161 RMD160 3302e660ba2f9723d1881e49ca9f783d5cc31b08 SHA1 43ac8ffe2af0fcfc10b0430fd287a73ebcdaf716 SHA256 0387e9cbc5de63758852d3182af79020cf500338370672359110b6b6154f4dba AUX mlt-0.2.2-motion-est-nonx86.patch 954 RMD160 d769358a03155c4a16db47b5a31fe42aa5aa9d72 SHA1 1307542624b007dba19c13264fc04d1563ed8332 SHA256 28ae719bb0721d1250e14f143c823966e7be362ab1f20d4571d241cc86dfdd68 AUX mlt-0.2.3-nostrip.patch 1763 RMD160 958ea322e598e286dc9adcc6ba509c7b2eeae5b2 SHA1 8a24c74980b8cdefb19164a4c6a36217b23244dd SHA256 1e0945b45245c297464e845bf6409a91582d288047b2b511357ead52be70fceb -AUX mlt-0.2.4-avdevice.patch 516 RMD160 496dcb2d74c2afbd2acab4e24becf063afa5113a SHA1 66719bc6c544c10634eeddc7fce3220080368f2c SHA256 72ef9dc507287859072fa80206dff67d94cc1300c8148054020c9c1db7dd31db -AUX mlt-0.2.4-avfreestatic.patch 432 RMD160 113a11a5c22029bed37277c40d89ca8e7559ffc8 SHA1 c76410d815f4f7d9d167a05f8b21fa84c769bd9b SHA256 58999267a58380d97df275c865566863bf63a0d758924990e1d1ea28669db82e -AUX mlt-0.2.4-bashism.patch 349 RMD160 c9ca1037f00e3aceeb4346f5a7ccf9b6a253541d SHA1 7d467038521074af4a2afcf99bdcb73f1d7505af SHA256 1a99f2f8af86291cac144cf6b12eff88320662d28ba2528722847b171f61b367 -AUX mlt-0.2.4-double-fps.patch 636 RMD160 5d18ce31181b18e2273a4ed909aad91836cd01d8 SHA1 5403d6eae4d4c9d7d7c826c29e80b7a1403f3a17 SHA256 bac9f166389eabdcfdf94f59c1f454e8133fe89331dae01152ea298fbec49c10 -AUX mlt-0.2.4-ffmpegheaders.patch 1102 RMD160 df512477d9d2476fa0b5b36f4369c4b57ba93198 SHA1 3b63cdebbd26ba2e0da07813258e55b3b10f3033 SHA256 545e96b5005911b1b5451844c8ba309d27c45ab9403f55eb6c7d49ea98f87336 -AUX mlt-0.2.4-gcc-4.3.patch 609 RMD160 db2c9d43ee984d9c9ec2b309b53da24a9b58c862 SHA1 51291b48dea4d7f2078cfa3669afac120e024d72 SHA256 1d193e6623d166ec46cd7b8b041d02a227b7ffc9c0cd766f75defaeaa4ba5c39 -AUX mlt-0.2.4-sox1400.patch 5887 RMD160 e67a5e7c354116d88c9799d4c4f9a17e14e0feba SHA1 f8afa9a8cf5aeb52b91135c89e028c0a9fcc8ef3 SHA256 f6bef87691feee43de2db0ffa1801445da50342bc27295f99b08bdb634fd7c7d -AUX mlt-0.2.4-sox1410.patch 2163 RMD160 fcc7e01f96606f80ebb271915bad348736f7beec SHA1 26b9df720005b836afc0926f63032e787f39a105 SHA256 dfec4d2336cee044f0b80af74b0928f5d7378ec7a5e435066e27a30e4abb5f79 AUX mlt-0.3.0-sox1420.patch 1141 RMD160 c002d0d76644729fff655558d23078334374d7cf SHA1 f854ab5da18487c09108c49e22e84525c2edb8dc SHA256 ba1c33ae73c8d6d4d91dd66c59d14d0449bb17309cd2455e7810927d163265f7 -DIST mlt-0.2.4.tar.gz 644406 RMD160 2822c775b397eb426d9f1aabfa515f76eb98aab2 SHA1 4074dab510037ad9f49401bad75c8b78c1ee06b8 SHA256 9d85c1d8d9f4ef7b40ebff8a4301bf3ef34aec6014e22310cb1e408cb4ec2a45 DIST mlt-0.3.2.tar.gz 706318 RMD160 7e4cbff9fa21032134948f80d8b51f55bd50aa94 SHA1 c196e4b9fc6c153dc88c24ecf3e026cf8629283c SHA256 b04cb4bf34d27a990e41ff2cf7649602c2124a9db1d1155f422f999292591a8a -EBUILD mlt-0.2.4-r2.ebuild 3051 RMD160 9206221fa4b689fc743f34e696e5601e28ff795b SHA1 8eb529622fe7e1d9b0e0003610e108a2da43e9f8 SHA256 ae869d360898e8456cce248968e72b9ab377cadedbbf2ac4c70c4d004b5fe026 EBUILD mlt-0.3.2.ebuild 2712 RMD160 b4cf8612814b0f9fdca52212e0e6a8fb7f23b23e SHA1 f9e9623ee0163562cb6a3af06d7f8582657c50dd SHA256 d2666f6cb944ca5b01dacb3ec74624b2f782f6ad65de4e02471ac8fcfd36e9b2 MISC ChangeLog 5465 RMD160 ec6896a70dce4c3153adf923e1d196cf8a253767 SHA1 66d6231e6f3cf113f4adf2e4a9b8b13617fc82d1 SHA256 0b8da96e01fd2a2614e4f6c29ba1f2a33d8bfa745c870fc50e65b3ed92a8e5c8 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkkpTzsACgkQvFcC4BYPU0ob6wCeIL7W93ommzoQWMVpSHVWKOtc -Gq4AnRZzHgGpxbEONYuZf1s1gtWIqGhd -=bJBr ------END PGP SIGNATURE----- diff --git a/media-libs/mlt/files/mlt-0.2.2-motion-est-amd64.patch b/media-libs/mlt/files/mlt-0.2.2-motion-est-amd64.patch deleted file mode 100644 index 0e81616fceb0..000000000000 --- a/media-libs/mlt/files/mlt-0.2.2-motion-est-amd64.patch +++ /dev/null @@ -1,172 +0,0 @@ ---- src/modules/motion_est/filter_motion_est.c.orig 2006-06-26 00:29:36.000000000 +0200 -+++ src/modules/motion_est/filter_motion_est.c 2006-06-26 00:29:51.000000000 +0200 -@@ -160,7 +160,7 @@ - /** /brief Reference Sum of Absolute Differences comparison function - * - */ --inline static int sad_reference( uint8_t *block1, uint8_t *block2, const int xstride, const int ystride, const int w, const int h ) -+static int sad_reference( uint8_t *block1, uint8_t *block2, const int xstride, const int ystride, const int w, const int h ) - { - int i, j, score = 0; - for ( j = 0; j < h; j++ ){ ---- src/modules/motion_est/sad_sse.h.orig 2006-06-26 00:29:43.000000000 +0200 -+++ src/modules/motion_est/sad_sse.h 2006-06-26 00:29:57.000000000 +0200 -@@ -41,7 +41,7 @@ - SAD_SSE_INIT - #define ROW SAD_SSE_SUM_8(0) SAD_SSE_NEXTROW - asm volatile ( ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -55,7 +55,7 @@ - SAD_SSE_INIT - #define ROW SAD_SSE_SUM_8(0) SAD_SSE_NEXTROW - asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -70,7 +70,7 @@ - #define ROW SAD_SSE_SUM_8(0) SAD_SSE_SUM_8(8) SAD_SSE_NEXTROW - asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW - ROW ROW ROW ROW ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -89,7 +89,7 @@ - ROW ROW ROW ROW ROW ROW ROW ROW - ROW ROW ROW ROW ROW ROW ROW ROW - ROW ROW ROW ROW ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -219,8 +219,8 @@ - static __attribute__((used)) __attribute__((aligned(8))) uint64_t sad_sse_422_mask_chroma = 0x00ff00ff00ff00ffULL; - - #define SAD_SSE_422_LUMA_INIT \ -- asm volatile ( "movq sad_sse_422_mask_chroma,%%mm7\n\t"\ -- "pxor %%mm6,%%mm6\n\t" :: );\ -+ asm volatile ( "movq %0,%%mm7\n\t"\ -+ "pxor %%mm6,%%mm6\n\t" :: "m" (sad_sse_422_mask_chroma) );\ - - // Sum two 4x1 pixel blocks - #define SAD_SSE_422_LUMA_SUM_4(OFFSET) \ -@@ -231,13 +231,13 @@ - "psadbw %%mm1,%%mm0 \n\t"\ - "paddw %%mm0,%%mm6 \n\t"\ - --inline static int sad_sse_422_luma_4x4( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_4x4( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - SAD_SSE_422_LUMA_INIT - #define ROW SAD_SSE_422_LUMA_SUM_4(0) SAD_SSE_NEXTROW - asm volatile ( ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -245,13 +245,13 @@ - - } - --inline static int sad_sse_422_luma_8x8( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_8x8( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - SAD_SSE_422_LUMA_INIT - #define ROW SAD_SSE_422_LUMA_SUM_4(0) SAD_SSE_422_LUMA_SUM_4(8) SAD_SSE_NEXTROW - asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -259,14 +259,14 @@ - - } - --inline static int sad_sse_422_luma_16x16( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_16x16( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - SAD_SSE_422_LUMA_INIT - #define ROW SAD_SSE_422_LUMA_SUM_4(0) SAD_SSE_422_LUMA_SUM_4(8) SAD_SSE_422_LUMA_SUM_4(16) SAD_SSE_422_LUMA_SUM_4(24) SAD_SSE_NEXTROW - asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW - ROW ROW ROW ROW ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -274,7 +274,7 @@ - - } - --inline static int sad_sse_422_luma_32x32( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_32x32( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - SAD_SSE_422_LUMA_INIT -@@ -286,7 +286,7 @@ - ROW ROW ROW ROW ROW ROW ROW ROW - ROW ROW ROW ROW ROW ROW ROW ROW - ROW ROW ROW ROW ROW ROW ROW ROW -- :: "r" (block1), "r" (block2), "r" (ystride)); -+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride))); - - SAD_SSE_FINISH(result) - return result; -@@ -294,7 +294,7 @@ - - } - --inline static int sad_sse_422_luma_4w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_4w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - -@@ -315,7 +315,7 @@ - - } - --inline static int sad_sse_422_luma_8w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_8w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - -@@ -338,7 +338,7 @@ - - } - --inline static int sad_sse_422_luma_16w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_16w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - -@@ -363,7 +363,7 @@ - - } - --inline static int sad_sse_422_luma_32w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_32w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - -@@ -392,7 +392,7 @@ - - } - --inline static int sad_sse_422_luma_64w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) -+static int sad_sse_422_luma_64w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h ) - { - int result; - diff --git a/media-libs/mlt/files/mlt-0.2.4-avdevice.patch b/media-libs/mlt/files/mlt-0.2.4-avdevice.patch deleted file mode 100644 index 82611aac150c..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-avdevice.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mlt-0.2.4/src/modules/avformat/producer_avformat.c -=================================================================== ---- mlt-0.2.4.orig/src/modules/avformat/producer_avformat.c -+++ mlt-0.2.4/src/modules/avformat/producer_avformat.c -@@ -203,7 +203,7 @@ static int producer_open( mlt_producer t - params->width = 640; - params->height = 480; - params->time_base= (AVRational){1,25}; -- params->device = file; -+ //params->device = file; - params->channels = 2; - params->sample_rate = 48000; - } diff --git a/media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch b/media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch deleted file mode 100644 index 9455a89db593..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mlt/src/modules/avformat/factory.c -=================================================================== ---- mlt/src/modules/avformat/factory.c (revision 1034) -+++ mlt/src/modules/avformat/factory.c (revision 1035) -@@ -60,7 +60,7 @@ - void avformat_destroy( void *ignore ) - { - // Clean up -- av_free_static( ); -+ // av_free_static( ); -XXX this is deprecated - - // Destroy the mutex - pthread_mutex_destroy( &avformat_mutex ); diff --git a/media-libs/mlt/files/mlt-0.2.4-bashism.patch b/media-libs/mlt/files/mlt-0.2.4-bashism.patch deleted file mode 100644 index 0f01aab2a139..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-bashism.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/lumas/create_lumas -+++ src/modules/lumas/create_lumas -@@ -10,7 +10,7 @@ - mkdir -p $i - rm -f $i/*.pgm $i/*.png - -- [ "$i" == "PAL" ] && h=576 || h=480 -+ [ "$i" = "PAL" ] && h=576 || h=480 - ./luma -h $h -bpp $bpp > $i/luma01.pgm - ./luma -h $h -bpp $bpp -bands $h > $i/luma02.pgm - ./luma -h $h -bpp $bpp -hmirror 1 > $i/luma03.pgm diff --git a/media-libs/mlt/files/mlt-0.2.4-double-fps.patch b/media-libs/mlt/files/mlt-0.2.4-double-fps.patch deleted file mode 100644 index 01da74de3fea..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-double-fps.patch +++ /dev/null @@ -1,16 +0,0 @@ -This fixes an audio synchronization bug when exporting videos from -kdenlive. See http://www.kdenlive.org/mantis/view.php?id=28. - -Ollie Wild <aloysius.wild@gmail.com> - ---- mlt-0.2.4/src/modules/avformat/consumer_avformat.c.orig 2008-02-24 01:20:25.000000000 -0800 -+++ mlt-0.2.4/src/modules/avformat/consumer_avformat.c 2008-02-24 01:20:38.000000000 -0800 -@@ -623,7 +623,7 @@ - struct timeval ante; - - // Get the frame rate -- int fps = mlt_properties_get_double( properties, "fps" ); -+ double fps = mlt_properties_get_double( properties, "fps" ); - - // Get width and height - int width = mlt_properties_get_int( properties, "width" ); diff --git a/media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch b/media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch deleted file mode 100644 index 6fc641ae4a55..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-ffmpegheaders.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: mlt-0.2.4/src/modules/avformat/configure -=================================================================== ---- mlt-0.2.4.orig/src/modules/avformat/configure -+++ mlt-0.2.4/src/modules/avformat/configure -@@ -130,12 +130,19 @@ else - echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak - echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak - [ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak -+ else if [ -d "$shared_ffmpeg/include/libavformat" -a -d "$shared_ffmpeg/include/libswscale" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ] -+ then -+ echo "CFLAGS+=-I$shared_ffmpeg/include/libavformat " >> config.mak -+ echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak -+ [ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak -+ [ "$swscale" != "" ] && echo "CFLAGS+=-I$shared_ffmpeg/include/libswscale " >> config.mak - else - echo "avformat: No build environment found. " - echo " Try configuring mlt with --avformat-svn." - touch ../disable-avformat - exit 0 - fi -+ fi - fi - - echo "EXTRA_LIBS=$extra_libs" >> config.mak diff --git a/media-libs/mlt/files/mlt-0.2.4-gcc-4.3.patch b/media-libs/mlt/files/mlt-0.2.4-gcc-4.3.patch deleted file mode 100644 index c953d8c46295..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-gcc-4.3.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- src/modules/kino/avi.cc -+++ src/modules/kino/avi.cc -@@ -175,6 +175,7 @@ - // C++ includes - - #include <string> -+#include <cstring> - #include <iostream> - #include <iomanip> - ---- src/modules/kino/filehandler.cc -+++ src/modules/kino/filehandler.cc -@@ -24,6 +24,7 @@ - } - - #include <string> -+#include <cstring> - #include <iostream> - #include <sstream> - #include <iomanip> ---- src/modules/kino/kino_wrapper.cc -+++ src/modules/kino/kino_wrapper.cc -@@ -19,7 +19,8 @@ - */ - - #include "config.h" --#include <strings.h> -+#include <cstring> -+#include <cstdlib> - #include "kino_wrapper.h" - #include "filehandler.h" - diff --git a/media-libs/mlt/files/mlt-0.2.4-sox1400.patch b/media-libs/mlt/files/mlt-0.2.4-sox1400.patch deleted file mode 100644 index d682ea72488e..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-sox1400.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -ur mlt-0.2.4.orig/src/modules/sox/configure mlt-0.2.4/src/modules/sox/configure ---- mlt-0.2.4.orig/src/modules/sox/configure 2005-05-04 22:37:08.000000000 +0300 -+++ mlt-0.2.4/src/modules/sox/configure 2007-11-23 12:18:59.000000000 +0200 -@@ -4,7 +4,36 @@ - then - - which libst-config > /dev/null 2>&1 -- disable_sox=$? -+ if [ $? -eq 0 ] -+ then -+ disable_sox=0 -+ echo "CFLAGS += $(libst-config --cflags) -I../../" > config.mak -+ echo "LDFLAGS += -lst $(libst-config --libs)" >> config.mak -+ else -+ sox --version 2> /dev/null | grep 'v14.' > /dev/null -+ disable_sox=$? -+ if [ $disable_sox -eq 0 ] -+ then -+ LIBDIR=lib -+ #bits=$(uname -m) -+ #case $bits in -+ #x86_64) -+ # export LIBDIR=lib64 -+ # ;; -+ #*) -+ # export LIBDIR=lib -+ # ;; -+ #esac -+ -+ sox=$(which sox) -+ # chop sox -+ soxdir=$(dirname $sox) -+ # chop bin -+ soxdir=$(dirname $soxdir) -+ echo "CFLAGS += -DSOX14 -I$soxdir/include" > config.mak -+ echo "LDFLAGS += -L$soxdir/$LIBDIR -lsox -lsfx -lsamplerate" >> config.mak -+ fi -+ fi - - if [ "$disable_sox" = "0" ] - then -diff -ur mlt-0.2.4.orig/src/modules/sox/filter_sox.c mlt-0.2.4/src/modules/sox/filter_sox.c ---- mlt-0.2.4.orig/src/modules/sox/filter_sox.c 2007-03-31 03:29:56.000000000 +0300 -+++ mlt-0.2.4/src/modules/sox/filter_sox.c 2007-11-23 12:18:57.000000000 +0200 -@@ -28,7 +28,21 @@ - #include <string.h> - #include <math.h> - --#include <st.h> -+#ifdef SOX14 -+# include <sox.h> -+# define ST_EOF SOX_EOF -+# define ST_SUCCESS SOX_SUCCESS -+# define st_sample_t sox_sample_t -+# define eff_t sox_effect_t* -+# define st_size_t sox_size_t -+# define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE -+# define ST_LIB_VERSION SOX_LIB_VERSION -+# define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips) -+# define ST_SSIZE_MIN SOX_SSIZE_MIN -+# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) -+#else -+# include <st.h> -+#endif - - #define BUFFER_LEN 8192 - #define AMPLITUDE_NORM 0.2511886431509580 /* -12dBFS */ -@@ -61,21 +75,37 @@ - static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency ) - { - mlt_tokeniser tokeniser = mlt_tokeniser_init(); -+#ifdef SOX14 -+ eff_t eff = mlt_pool_alloc( sizeof( sox_effect_t ) ); -+#else - eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) ); -+#endif - char id[ 256 ]; - int error = 1; - - // Tokenise the effect specification - mlt_tokeniser_parse_new( tokeniser, value, " " ); -+ if ( tokeniser->count < 1 ) -+ return error; - - // Locate the effect -+#ifdef SOX14 -+ //fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count ); -+ sox_create_effect( eff, sox_find_effect( tokeniser->tokens[0] ) ); -+ int opt_count = tokeniser->count - 1; -+#else - int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens ); -+#endif - - // If valid effect - if ( opt_count != ST_EOF ) - { - // Supply the effect parameters -+#ifdef SOX14 -+ if ( ( * eff->handler.getopts )( eff, opt_count, &tokeniser->tokens[ tokeniser->count > 1 ? 1 : 0 ] ) == ST_SUCCESS ) -+#else - if ( ( * eff->h->getopts )( eff, opt_count, &tokeniser->tokens[ tokeniser->count - opt_count ] ) == ST_SUCCESS ) -+#endif - { - // Set the sox signal parameters - eff->ininfo.rate = frequency; -@@ -84,7 +114,11 @@ - eff->outinfo.channels = 1; - - // Start the effect -+#ifdef SOX14 -+ if ( ( * eff->handler.start )( eff ) == ST_SUCCESS ) -+#else - if ( ( * eff->h->start )( eff ) == ST_SUCCESS ) -+#endif - { - // Construct id - sprintf( id, "_effect_%d_%d", count, channel ); -@@ -123,7 +157,7 @@ - st_sample_t *output_buffer = mlt_properties_get_data( filter_properties, "output_buffer", NULL ); - int channels_avail = *channels; - int i; // channel -- int count = mlt_properties_get_int( filter_properties, "effect_count" ); -+ int count = mlt_properties_get_int( filter_properties, "_effect_count" ); - - // Get the producer's audio - mlt_frame_get_audio( frame, buffer, format, frequency, &channels_avail, samples ); -@@ -211,7 +245,7 @@ - } - - // Save the number of filters -- mlt_properties_set_int( filter_properties, "effect_count", count ); -+ mlt_properties_set_int( filter_properties, "_effect_count", count ); - - } - if ( *samples > 0 && count > 0 ) -@@ -295,7 +329,11 @@ - float saved_gain = 1.0; - - // XXX: hack to apply the normalised gain level to the vol effect -+#ifdef SOX14 -+ if ( normalise && strcmp( e->handler.name, "vol" ) == 0 ) -+#else - if ( normalise && strcmp( e->name, "vol" ) == 0 ) -+#endif - { - float *f = ( float * )( e->priv ); - saved_gain = *f; -@@ -303,7 +341,11 @@ - } - - // Apply the effect -+#ifdef SOX14 -+ if ( ( * e->handler.flow )( e, input_buffer, output_buffer, &isamp, &osamp ) == ST_SUCCESS ) -+#else - if ( ( * e->h->flow )( e, input_buffer, output_buffer, &isamp, &osamp ) == ST_SUCCESS ) -+#endif - { - // Swap input and output buffer pointers for subsequent effects - p = input_buffer; -@@ -312,7 +354,11 @@ - } - - // XXX: hack to restore the original vol gain to prevent accumulation -+#ifdef SOX14 -+ if ( normalise && strcmp( e->handler.name, "vol" ) == 0 ) -+#else - if ( normalise && strcmp( e->name, "vol" ) == 0 ) -+#endif - { - float *f = ( float * )( e->priv ); - *f = saved_gain; -diff -ur mlt-0.2.4.orig/src/modules/sox/Makefile mlt-0.2.4/src/modules/sox/Makefile ---- mlt-0.2.4.orig/src/modules/sox/Makefile 2005-12-05 13:35:55.000000000 +0200 -+++ mlt-0.2.4/src/modules/sox/Makefile 2007-11-23 12:19:00.000000000 +0200 -@@ -1,12 +1,13 @@ - include ../../../config.mak -+include config.mak - - TARGET = ../libmltsox$(LIBSUF) - - OBJS = factory.o \ - filter_sox.o - --CFLAGS += `libst-config --cflags` -I../../ --LDFLAGS += -lst `libst-config --libs` -+CFLAGS += -I../../ -+ - LDFLAGS += -L../../framework -lmlt - - SRCS := $(OBJS:.o=.c) diff --git a/media-libs/mlt/files/mlt-0.2.4-sox1410.patch b/media-libs/mlt/files/mlt-0.2.4-sox1410.patch deleted file mode 100644 index 04de618ec935..000000000000 --- a/media-libs/mlt/files/mlt-0.2.4-sox1410.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: mlt-0.2.4/src/modules/sox/filter_sox.c -=================================================================== ---- mlt-0.2.4.orig/src/modules/sox/filter_sox.c -+++ mlt-0.2.4/src/modules/sox/filter_sox.c -@@ -38,7 +38,11 @@ - # define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE - # define ST_LIB_VERSION SOX_LIB_VERSION - # define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips) -+#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0) - # define ST_SSIZE_MIN SOX_SSIZE_MIN -+#else -+# define ST_SSIZE_MIN (SOX_SIZE_MAX/2) -+#endif - # define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) - #else - # include <st.h> -@@ -91,7 +95,11 @@ static int create_effect( mlt_filter thi - // Locate the effect - #ifdef SOX14 - //fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count ); -+#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0) - sox_create_effect( eff, sox_find_effect( tokeniser->tokens[0] ) ); -+#else -+ eff = sox_create_effect( sox_find_effect( tokeniser->tokens[0] ) ); -+#endif - int opt_count = tokeniser->count - 1; - #else - int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens ); -@@ -108,10 +116,17 @@ static int create_effect( mlt_filter thi - #endif - { - // Set the sox signal parameters -+#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0) - eff->ininfo.rate = frequency; - eff->outinfo.rate = frequency; - eff->ininfo.channels = 1; - eff->outinfo.channels = 1; -+#else -+ eff->in_signal.rate = frequency; -+ eff->out_signal.rate = frequency; -+ eff->in_signal.channels = 1; -+ eff->out_signal.channels = 1; -+#endif - - // Start the effect - #ifdef SOX14 -@@ -214,8 +229,13 @@ static int filter_get_audio( mlt_frame f - eff_t e = mlt_properties_get_data( filter_properties, id, NULL ); - - // Validate the existing effect state -+#if ST_LIB_VERSION_CODE < ST_LIB_VERSION(14,1,0) - if ( e != NULL && ( e->ininfo.rate != *frequency || - e->outinfo.rate != *frequency ) ) -+#else -+ if ( e != NULL && ( e->in_signal.rate != *frequency || -+ e->out_signal.rate != *frequency ) ) -+#endif - e = NULL; - - // (Re)Create the effect state diff --git a/media-libs/mlt/mlt-0.2.4-r2.ebuild b/media-libs/mlt/mlt-0.2.4-r2.ebuild deleted file mode 100644 index b8e6a6514952..000000000000 --- a/media-libs/mlt/mlt-0.2.4-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.2.4-r2.ebuild,v 1.8 2008/11/04 19:07:29 aballier Exp $ - -EAPI=1 - -inherit eutils toolchain-funcs qt3 - -DESCRIPTION="MLT is an open source multimedia framework, designed and developed -for television broadcasting" -HOMEPAGE="http://mlt.sourceforge.net/" -SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg theora -xine ffmpeg libsamplerate qt3" - -DEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r3 - <media-video/ffmpeg-0.4.9_p20081014 ) - dv? ( >=media-libs/libdv-0.104 ) - xml? ( >=dev-libs/libxml2-2.5 ) - ogg? ( >=media-libs/libogg-1.1.3 ) - vorbis? ( >=media-libs/libvorbis-1.1.2 ) - sdl? ( >=media-libs/libsdl-1.2.10 - >=media-libs/sdl-image-1.2.4 ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) - jack? ( media-sound/jack-audio-connection-kit - media-libs/ladspa-sdk - >=dev-libs/libxml2-2.5 ) - gtk? ( >=x11-libs/gtk+-2 - x11-libs/pango ) - sox? ( media-sound/sox ) - quicktime? ( media-libs/libquicktime ) - xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) - lame? ( >=media-sound/lame-3.97_beta2 ) - qt3? ( x11-libs/qt:3 ) - theora? ( >=media-libs/libtheora-1.0_alpha5 )" -RDEPEND=${DEPEND} - -pkg_setup() { - local fail="USE sox needs also USE libsamplerate enabled." - - if use sox && ! use libsamplerate; then - eerror "${fail}" - die "${fail}" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/mlt-0.2.2-motion-est-nonx86.patch - epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch - epatch "${FILESDIR}"/${P}-sox1400.patch - epatch "${FILESDIR}"/${P}-ffmpegheaders.patch - epatch "${FILESDIR}"/${P}-avdevice.patch - epatch "${FILESDIR}"/${P}-bashism.patch - epatch "${FILESDIR}"/${P}-double-fps.patch - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - epatch "${FILESDIR}"/${P}-avfreestatic.patch - epatch "${FILESDIR}"/${P}-sox1410.patch -} - -src_compile() { - tc-export CC - - local myconf=" --enable-gpl --enable-shared - --enable-pp --enable-shared-pp - --enable-motion-est - $(use_enable dv) - $(use_enable mmx) - $(use_enable gtk gtk2) - $(use_enable vorbis) - $(use_enable ogg) - $(use_enable sdl) - $(use_enable jack jackrack) - $(use_enable sox) - $(use_enable theora) - $(use_enable lame mp3lame) - $(use_enable ffmpeg avformat) - $(use_enable libsamplerate resample) - $(use_enable qt3 qimage) - $(use_enable xml westley) - $(use_enable xine)" - - use ffmpeg && has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" && - myconf="${myconf} --avformat-swscale" - - (use quicktime && use dv) || myconf="${myconf} --disable-kino" - - econf ${myconf} || die "econf failed" - sed -i -e s/^OPT/#OPT/ "${S}/config.mak" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc docs/*.txt ChangeLog README docs/TODO - - dodir /usr/share/${PN} - insinto /usr/share/${PN} - doins -r demo -} |