Version bump. Masking older version.

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 272 insertions, 15 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 35505827ca2e..95f11a6ff18f 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.5 2006/06/24 23:47:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.6 2006/07/17 07:14:37 zypher Exp $
+
+  17 Jul 2006; Marc Hildebrand <zypher@gentoo.org> mlt-0.2.2.ebuild
+  Version bump. Thanks to Danny (kugelfang@gentoo.org) for the amd64-fix.
 
   24 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> mlt-20051209.ebuild:
   Change xml2 useflag to xml.
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 9de0b5cf93fb..64b5e0b9080b 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,26 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+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
 DIST mlt-20051209.tar.bz2 450549
+EBUILD mlt-0.2.2.ebuild 2032 RMD160 5a2f294c2c547e1850d97aa3ab07df9d98962fb7 SHA1 e523a7f3db4346aa674f43e720cbdbaba3038b05 SHA256 8d43259fd2d1a224366cda4f3bbe231fe0424eb65cd756df4676a839420ed2bd
+MD5 1dd9cfd064fb16652ff41189c70c6a0e mlt-0.2.2.ebuild 2032
+RMD160 5a2f294c2c547e1850d97aa3ab07df9d98962fb7 mlt-0.2.2.ebuild 2032
+SHA256 8d43259fd2d1a224366cda4f3bbe231fe0424eb65cd756df4676a839420ed2bd mlt-0.2.2.ebuild 2032
 EBUILD mlt-20051209.ebuild 1800 RMD160 21a14a454cd3aacd971f0f55a54d2b48c8b58316 SHA1 c1d1976f4bd1b7bf9da083410991dd4cac84c0ff SHA256 eb1c33e40b9ca850f271c3809d2a74a2e09145e49a683231c47f3ee7676ff338
 MD5 72af73f1ec0daade610f0e38be866e32 mlt-20051209.ebuild 1800
 RMD160 21a14a454cd3aacd971f0f55a54d2b48c8b58316 mlt-20051209.ebuild 1800
 SHA256 eb1c33e40b9ca850f271c3809d2a74a2e09145e49a683231c47f3ee7676ff338 mlt-20051209.ebuild 1800
-MISC ChangeLog 816 RMD160 4c99eb7d4d72b3c858c3b71412ba36b5b216d7a3 SHA1 2760e9ff624c56359184e0893d2b60e341f6adb0 SHA256 4d46831387e3e17a94e95473b1f4b58fef1578aa3ae52d6b920304a2d3c467cb
-MD5 d8bd2702bdd3afbdc10910f5d5df5f17 ChangeLog 816
-RMD160 4c99eb7d4d72b3c858c3b71412ba36b5b216d7a3 ChangeLog 816
-SHA256 4d46831387e3e17a94e95473b1f4b58fef1578aa3ae52d6b920304a2d3c467cb ChangeLog 816
+MISC ChangeLog 956 RMD160 d1f204e4870daa174fe7a3186ea32e5989c4a95f SHA1 67e5c91c78cd55afd80a4e411a1b2a94440e05ff SHA256 7390e35966a4a6c899d1bec965ef8dd3cdbe99fdc70282446f91aa2aecfbc404
+MD5 e09acd11eddc1808beba0d93bfaa9395 ChangeLog 956
+RMD160 d1f204e4870daa174fe7a3186ea32e5989c4a95f ChangeLog 956
+SHA256 7390e35966a4a6c899d1bec965ef8dd3cdbe99fdc70282446f91aa2aecfbc404 ChangeLog 956
 MISC metadata.xml 159 RMD160 b9decd768167ec0ed480f59c688f5134a3f49224 SHA1 379b6baddb33ec462e76cea084aa990b2fa9c4b8 SHA256 9e151e582f202c4f1a8cccb57f5078ac593e663a20f3b7cd454d3831e8fe09c4
 MD5 25473b6655fde2985f9e373862873020 metadata.xml 159
 RMD160 b9decd768167ec0ed480f59c688f5134a3f49224 metadata.xml 159
 SHA256 9e151e582f202c4f1a8cccb57f5078ac593e663a20f3b7cd454d3831e8fe09c4 metadata.xml 159
+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
 MD5 2bb6e136747d6368fe7205920e5f1846 files/digest-mlt-20051209 65
 RMD160 7f02a64fcc9131ca2721a97a0fff335e17b1c7be files/digest-mlt-20051209 65
 SHA256 e6607a4948059827d4bbbff769fe8a74088f5138732d54040ccfe61e54c1c4eb files/digest-mlt-20051209 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnc8JAiZjviIA2XgRAq+AAJ96LowhtWL35I4kpP94l4ln/cn0wgCff00c
-Jr1+ciYcdiTwf6Jebb0SLc4=
-=l79f
------END PGP SIGNATURE-----
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 000000000000..72c87076dd55
--- /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 000000000000..0e81616fceb0
--- /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 000000000000..bed7a8b12c7c
--- /dev/null
+++ b/media-libs/mlt/mlt-0.2.2.ebuild
@@ -0,0 +1,77 @@
+# 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.1 2006/07/17 07:14:37 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 doc 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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	( use amd64 ) && epatch ${FILESDIR}/mlt-0.2.2-motion-est-amd64.patch
+}
+
+src_compile() {
+
+	local myconf="	--enable-gpl --enable-shared
+			--enable-pp --enable-shared-pp
+			--enable-motion-est
+			$(use_enable dv)
+			$(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
+	sed -e s/^OPT/#OPT/ -i ${S}/config.mak
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+	use doc && dodoc docs/*.txt
+
+	dodoc ChangeLog COPYING README docs/TODO
+
+	dodir /usr/share/mlt
+	insinto /usr/share/mlt
+	doins -r demo
+}
+