diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2006-08-21 17:18:22 -0700 |
---|---|---|
committer | Donnie Berkholz <donnie@comet.(none)> | 2006-08-21 17:18:22 -0700 |
commit | 249eaa5535de0f6cdf58f54a9038708eb59edcbc (patch) | |
tree | 1a0d58743d519fad4b75c4f7fb312be5206783da /media-libs | |
parent | Add ntp that works with avahi (diff) | |
download | dberkholz-249eaa5535de0f6cdf58f54a9038708eb59edcbc.tar.gz dberkholz-249eaa5535de0f6cdf58f54a9038708eb59edcbc.tar.bz2 dberkholz-249eaa5535de0f6cdf58f54a9038708eb59edcbc.zip |
Add media-libs/mlt that compiles on ppc (my patch from #144702)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/mlt/CVS/Entries | 6 | ||||
-rw-r--r-- | media-libs/mlt/CVS/Repository | 1 | ||||
-rw-r--r-- | media-libs/mlt/CVS/Root | 1 | ||||
-rw-r--r-- | media-libs/mlt/Manifest | 16 | ||||
-rw-r--r-- | media-libs/mlt/files/0.2.2-fix-ppc-build.patch | 33 | ||||
-rw-r--r-- | media-libs/mlt/files/CVS/Entries | 4 | ||||
-rw-r--r-- | media-libs/mlt/files/CVS/Repository | 1 | ||||
-rw-r--r-- | media-libs/mlt/files/CVS/Root | 1 | ||||
-rw-r--r-- | media-libs/mlt/files/digest-mlt-0.2.2 | 3 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-0.2.2-motion-est-amd64.patch | 172 | ||||
-rw-r--r-- | media-libs/mlt/mlt-0.2.2.ebuild | 75 |
11 files changed, 313 insertions, 0 deletions
diff --git a/media-libs/mlt/CVS/Entries b/media-libs/mlt/CVS/Entries new file mode 100644 index 0000000..dba663d --- /dev/null +++ b/media-libs/mlt/CVS/Entries @@ -0,0 +1,6 @@ +/metadata.xml/1.1/Sat Dec 10 02:15:23 2005// +D/files//// +/ChangeLog/1.7/Tue Jul 18 22:05:25 2006// +/Manifest/1.8/Tue Jul 18 22:05:25 2006// +/mlt-0.2.2.ebuild/1.2/Mon Jul 17 14:41:15 2006// +/mlt-20051209.ebuild/1.6/Tue Jul 18 22:05:25 2006// diff --git a/media-libs/mlt/CVS/Repository b/media-libs/mlt/CVS/Repository new file mode 100644 index 0000000..1f61968 --- /dev/null +++ b/media-libs/mlt/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/media-libs/mlt diff --git a/media-libs/mlt/CVS/Root b/media-libs/mlt/CVS/Root new file mode 100644 index 0000000..3295473 --- /dev/null +++ b/media-libs/mlt/CVS/Root @@ -0,0 +1 @@ +dberkholz@cvs.gentoo.org:/var/cvsroot diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest new file mode 100644 index 0000000..20b5431 --- /dev/null +++ b/media-libs/mlt/Manifest @@ -0,0 +1,16 @@ +AUX 0.2.2-fix-ppc-build.patch 857 RMD160 b514a0ed16dd2aadea973fefef240371989d30ea SHA1 88c51763bc0d5f5fd45a3d4b9b72065e7798322b SHA256 f6cda8e54c82b6956e6a98b27f7b1b34faea7b63332396e4bc39826b4bda9334 +MD5 114e22b597f32a4d43d2d5357bf5081f files/0.2.2-fix-ppc-build.patch 857 +RMD160 b514a0ed16dd2aadea973fefef240371989d30ea files/0.2.2-fix-ppc-build.patch 857 +SHA256 f6cda8e54c82b6956e6a98b27f7b1b34faea7b63332396e4bc39826b4bda9334 files/0.2.2-fix-ppc-build.patch 857 +AUX mlt-0.2.2-motion-est-amd64.patch 6161 RMD160 3302e660ba2f9723d1881e49ca9f783d5cc31b08 SHA1 43ac8ffe2af0fcfc10b0430fd287a73ebcdaf716 SHA256 0387e9cbc5de63758852d3182af79020cf500338370672359110b6b6154f4dba +MD5 9235136e496887e8803a68655f9b8664 files/mlt-0.2.2-motion-est-amd64.patch 6161 +RMD160 3302e660ba2f9723d1881e49ca9f783d5cc31b08 files/mlt-0.2.2-motion-est-amd64.patch 6161 +SHA256 0387e9cbc5de63758852d3182af79020cf500338370672359110b6b6154f4dba files/mlt-0.2.2-motion-est-amd64.patch 6161 +DIST mlt-0.2.2.tar.gz 581746 RMD160 29ae2f0800f31fd82c6809efbfe5c85b1a72a0c9 SHA1 9d4db5162e810f118dd69544a4e475c59bcceff1 SHA256 9be0ed8756825b83f0747d6d926172db08fd4406a869ccd4995ed56bf1fe6a22 +EBUILD mlt-0.2.2.ebuild 2113 RMD160 bc6b711d525945cc5371225778a026279ca74061 SHA1 654f3c3ecbb60012c14a0f897508a564aea29589 SHA256 48a20c587abb24112e6b6f8f78258f1b363b6ce1dc9e67584f698ffa44da817b +MD5 bc863279cbde112a5eff7d3c63a1fe73 mlt-0.2.2.ebuild 2113 +RMD160 bc6b711d525945cc5371225778a026279ca74061 mlt-0.2.2.ebuild 2113 +SHA256 48a20c587abb24112e6b6f8f78258f1b363b6ce1dc9e67584f698ffa44da817b mlt-0.2.2.ebuild 2113 +MD5 8db39ac21f417030a69e8f240e0da97b files/digest-mlt-0.2.2 229 +RMD160 fa4ce7ded87e395cf890212b6bb31ee2831a18e7 files/digest-mlt-0.2.2 229 +SHA256 7baa432f40b95f64dfd4b0056ae79a9b623defa3325f40c24bfead0670ba58fa files/digest-mlt-0.2.2 229 diff --git a/media-libs/mlt/files/0.2.2-fix-ppc-build.patch b/media-libs/mlt/files/0.2.2-fix-ppc-build.patch new file mode 100644 index 0000000..d3ef5da --- /dev/null +++ b/media-libs/mlt/files/0.2.2-fix-ppc-build.patch @@ -0,0 +1,33 @@ +SSE isn't available on any PPC platform, not just Darwin. + +Donnie Berkholz <dberkholz@gentoo.org> + +--- mlt-0.2.2.orig/src/modules/motion_est/filter_motion_est.c 2006-08-21 16:55:50.000000000 -0700 ++++ mlt-0.2.2/src/modules/motion_est/filter_motion_est.c 2006-08-21 16:55:26.000000000 -0700 +@@ -34,7 +34,7 @@ + #include <sys/time.h> + #include <unistd.h> + +-#ifndef __DARWIN__ ++#ifndef __PPC__ + #include "sad_sse.h" + #endif + +@@ -612,7 +612,7 @@ + } /* End column loop */ + } /* End row loop */ + +-#ifndef __DARWIN__ ++#ifndef __PPC__ + asm volatile ( "emms" ); + #endif + +@@ -656,7 +656,7 @@ + static void init_optimizations( struct motion_est_context_s *c ) + { + switch(c->mb_w){ +-#ifndef __DARWIN__ ++#ifndef __PPC__ + case 4: if(c->mb_h == 4) c->compare_optimized = sad_sse_422_luma_4x4; + else c->compare_optimized = sad_sse_422_luma_4w; + break; diff --git a/media-libs/mlt/files/CVS/Entries b/media-libs/mlt/files/CVS/Entries new file mode 100644 index 0000000..8bea7cf --- /dev/null +++ b/media-libs/mlt/files/CVS/Entries @@ -0,0 +1,4 @@ +/digest-mlt-20051209/1.1/Sat Dec 10 02:15:23 2005// +/digest-mlt-0.2.2/1.1/Mon Jul 17 07:14:37 2006// +/mlt-0.2.2-motion-est-amd64.patch/1.1/Mon Jul 17 07:14:37 2006// +D diff --git a/media-libs/mlt/files/CVS/Repository b/media-libs/mlt/files/CVS/Repository new file mode 100644 index 0000000..da36956 --- /dev/null +++ b/media-libs/mlt/files/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/media-libs/mlt/files diff --git a/media-libs/mlt/files/CVS/Root b/media-libs/mlt/files/CVS/Root new file mode 100644 index 0000000..3295473 --- /dev/null +++ b/media-libs/mlt/files/CVS/Root @@ -0,0 +1 @@ +dberkholz@cvs.gentoo.org:/var/cvsroot diff --git a/media-libs/mlt/files/digest-mlt-0.2.2 b/media-libs/mlt/files/digest-mlt-0.2.2 new file mode 100644 index 0000000..72c8707 --- /dev/null +++ b/media-libs/mlt/files/digest-mlt-0.2.2 @@ -0,0 +1,3 @@ +MD5 9d4a3d308b1314a117f692766fb15e90 mlt-0.2.2.tar.gz 581746 +RMD160 29ae2f0800f31fd82c6809efbfe5c85b1a72a0c9 mlt-0.2.2.tar.gz 581746 +SHA256 9be0ed8756825b83f0747d6d926172db08fd4406a869ccd4995ed56bf1fe6a22 mlt-0.2.2.tar.gz 581746 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 new file mode 100644 index 0000000..0e81616 --- /dev/null +++ b/media-libs/mlt/files/mlt-0.2.2-motion-est-amd64.patch @@ -0,0 +1,172 @@ +--- 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/mlt-0.2.2.ebuild b/media-libs/mlt/mlt-0.2.2.ebuild new file mode 100644 index 0000000..a197767 --- /dev/null +++ b/media-libs/mlt/mlt-0.2.2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.2.2.ebuild,v 1.2 2006/07/17 14:41:15 zypher Exp $ + +inherit eutils + +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 ~x86" +IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg theora xine" + +DEPEND="media-video/ffmpeg + 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 ) + >=media-libs/libsamplerate-0.1.2 + jack? ( media-sound/jack-audio-connection-kit + >=dev-libs/libxml2-2.5 ) + gtk? ( >=x11-libs/gtk+-2.0 + 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 ) + theora? ( >=media-libs/libtheora-1.0_alpha5 )" +RDEPEND=${DEPEND} + +src_unpack() { + unpack ${A} + cd "${S}" + use amd64 && epatch "${FILESDIR}/mlt-0.2.2-motion-est-amd64.patch" + use ppc && epatch "${FILESDIR}"/${PV}-fix-ppc-build.patch +} + +src_compile() { + + 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 xine)" + + (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 +} |