mlt: merged to gentoo-x86

5 files changed, 0 insertions, 299 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
deleted file mode 100644
index 20b5431..0000000
--- a/media-libs/mlt/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index d3ef5da..0000000
--- a/media-libs/mlt/files/0.2.2-fix-ppc-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/digest-mlt-0.2.2 b/media-libs/mlt/files/digest-mlt-0.2.2
deleted file mode 100644
index 72c8707..0000000
--- a/media-libs/mlt/files/digest-mlt-0.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0e81616..0000000
--- 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/mlt-0.2.2.ebuild b/media-libs/mlt/mlt-0.2.2.ebuild
deleted file mode 100644
index a197767..0000000
--- a/media-libs/mlt/mlt-0.2.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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
-}