gcc-4.1/mmx fix

Package-Manager: portage-2.1_pre5-r4

4 files changed, 51 insertions, 18 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index 984d0c4453e9..74c297dcb2c6 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.48 2006/03/05 20:30:02 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.49 2006/03/06 12:02:54 lu_zero Exp $
+
+  06 Mar 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/libdv-0.103-mmx.patch, libdv-0.104-r1.ebuild:
+  Fix for gcc-4.1 from Fedora, thanks to Hanno Meyer-Thurow <h.mth@web.de> for
+  pointing it
 
   05 Mar 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
   Fix metadata: media-video -> video
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index f32ca8d46752..e679d4ebdae1 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 304d121e8c864dca9fdda9e0d4ebbf1c ChangeLog 6699
-RMD160 eb3924894f6a9677a84450738898ae808feaafb3 ChangeLog 6699
-SHA256 243a09b37d242472069645ad09b01e73de07c3011e0ab964575ec8047932eaa3 ChangeLog 6699
+MD5 58e9ffcd503806a3721319ad14a07577 ChangeLog 6897
+RMD160 8b51026a00e83657db5a6b489bf3ba723cad8f99 ChangeLog 6897
+SHA256 e723de26f2b24aabe30e350cdc6ff151e4db712a5b77e3935ee1080170f962b5 ChangeLog 6897
 MD5 21abc06a6e969b1a6b5b1ca2f1f09474 files/digest-libdv-0.101 63
 RMD160 67d8e0b620064f9fe2ac2591b2204a01655c30ae files/digest-libdv-0.101 63
 SHA256 9732318f48c3713f34c233de2ecb9aa5c890697616176a725d74d0ab08dc4223 files/digest-libdv-0.101 63
@@ -19,6 +16,9 @@ SHA256 c16796e3ac7d6d27aa03b90f90952d3e3e2234ef7132ecc8c0a4711d5f1ad651 files/di
 MD5 3d3bbf2ecd039329fe6b73dc9ada38bf files/digest-libdv-0.99-r1 62
 RMD160 5ff13b02a01518faf9c931d11f3a74619794ee72 files/digest-libdv-0.99-r1 62
 SHA256 8fcd2519bb397f8d1bbd1fb22c9b8c1fbf39c2941c1f576a91ae3f7eb9401e3b files/digest-libdv-0.99-r1 62
+MD5 e63b395666ac73ba05440c5cf6b7158d files/libdv-0.103-mmx.patch 901
+RMD160 18cb7c59722d05e7b479b413bc6bc665cf6d30b2 files/libdv-0.103-mmx.patch 901
+SHA256 0607b4144a2d87cfe735f258a2304e27d68c830858a35d9ca3c76ede9faaa475 files/libdv-0.103-mmx.patch 901
 MD5 17d2e52bc602448ef8b68fc80478152a files/libdv-0.104-amd64reloc.patch 8362
 RMD160 ad08132a3956e41da4d4b9fa7cd7ab00a606e1bf files/libdv-0.104-amd64reloc.patch 8362
 SHA256 02d44df887e461b23e2bffae2d5f024a3cc9af8fd01abc7fc42ff7be2c8b2ba0 files/libdv-0.104-amd64reloc.patch 8362
@@ -40,9 +40,9 @@ SHA256 02e7d004fc639b4db55582b3a395db3ddbe694f2ad087529fd00284dbeace638 libdv-0.
 MD5 c26a71dccb152be11ab822dc61fc4ae8 libdv-0.102.ebuild 1242
 RMD160 14f8761d90e57e3904c3e03d95e1d2b39a51dc5f libdv-0.102.ebuild 1242
 SHA256 4e5a6e28146796ea00e51d80c7bef0171bf5435ea9daf9a4c573e75871b5c853 libdv-0.102.ebuild 1242
-MD5 a318769d1c19f3fec42e7cb56401fb21 libdv-0.104-r1.ebuild 1485
-RMD160 cc2faa6e2c9bb0989f6ea9984b26c28c7d1b1d72 libdv-0.104-r1.ebuild 1485
-SHA256 cb9604503eca64b282935f8d3da28c16ffef5e36f981ca60ac5371b92e4d1e24 libdv-0.104-r1.ebuild 1485
+MD5 d6f8511a53f05ddbc95452fc07d750ca libdv-0.104-r1.ebuild 1549
+RMD160 f7df49bc9270dbd912770cfcc00e3c9657631d15 libdv-0.104-r1.ebuild 1549
+SHA256 16809451b19e856fe3aa4fd361fdb0eaadd5d7d96f10af3ac210fdd957d37ec7 libdv-0.104-r1.ebuild 1549
 MD5 9af0184f9281e6dbf633dec4dd9173ec libdv-0.104.ebuild 1315
 RMD160 2724f17fc8fb46ad9db1455e80f34e007aaca971 libdv-0.104.ebuild 1315
 SHA256 4e9570cbef32f705b7d4f2ae222a55bae9d21870733fb37d6334d1f02b3eb801 libdv-0.104.ebuild 1315
@@ -52,10 +52,3 @@ SHA256 f84918b65f6e0dc4b6baf146cc46d3d33a271874a3876f947fd5079ffc758751 libdv-0.
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEC8BI2+ySkm8kpY0RAoxIAJ9ahB6uJ3pZvgq+aSe+dkp9OkcBUACePAzu
-sHUh6KePm9Duv+arvk85iW8=
-=VBrG
------END PGP SIGNATURE-----
diff --git a/media-libs/libdv/files/libdv-0.103-mmx.patch b/media-libs/libdv/files/libdv-0.103-mmx.patch
new file mode 100644
index 000000000000..09a688d5553a
--- /dev/null
+++ b/media-libs/libdv/files/libdv-0.103-mmx.patch
@@ -0,0 +1,33 @@
+--- libdv-0.103/libdv/mmx.h.mmx	2006-02-13 16:43:45.000000000 -0500
++++ libdv-0.103/libdv/mmx.h	2006-02-13 16:43:57.000000000 -0500
+@@ -353,16 +353,16 @@
+ #define	mmx_i2r(op, imm, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (imm) )
++			      : "i" (imm) )
+ 
+ #define	mmx_m2r(op, mem, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (mem))
++			      : "m" (mem))
+ 
+ #define	mmx_r2m(op, reg, mem) \
+ 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
+-			      : "=X" (mem) \
++			      : "=m" (mem) \
+ 			      : /* nothing */ )
+ 
+ #define	mmx_r2r(op, regs, regd) \
+@@ -372,8 +372,8 @@
+ 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+ 			      #op " %1, %%mm0\n\t" \
+ 			      "movq %%mm0, %0" \
+-			      : "=X" (memd) \
+-			      : "X" (mems))
++			      : "=m" (memd) \
++			      : "m" (mems))
+ 
+ #endif
+ 
diff --git a/media-libs/libdv/libdv-0.104-r1.ebuild b/media-libs/libdv/libdv-0.104-r1.ebuild
index 64fc429994fc..2986fca4dee7 100644
--- a/media-libs/libdv/libdv-0.104-r1.ebuild
+++ b/media-libs/libdv/libdv-0.104-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.6 2006/03/06 04:52:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.7 2006/03/06 12:02:54 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -32,6 +32,8 @@ src_unpack() {
 
 	# tiny gcc4 fixes
 	epatch "${FILESDIR}"/${PN}-0.104-gcc4.patch
+	# fix from fedora
+	epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
 
 	epunt_cxx #74497
 }