summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2006-03-06 12:02:54 +0000
committerLuca Barbato <lu_zero@gentoo.org>2006-03-06 12:02:54 +0000
commit7b84e88e7a455aab0507f6471b6339504224cba0 (patch)
tree7720a4db87b69b01b28188bd0986b75f114b62ae /media-libs/libdv
parentAdd patch to build with GCC 4.1. Closes bug #123719. (diff)
downloadgentoo-2-7b84e88e7a455aab0507f6471b6339504224cba0.tar.gz
gentoo-2-7b84e88e7a455aab0507f6471b6339504224cba0.tar.bz2
gentoo-2-7b84e88e7a455aab0507f6471b6339504224cba0.zip
gcc-4.1/mmx fix
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'media-libs/libdv')
-rw-r--r--media-libs/libdv/ChangeLog7
-rw-r--r--media-libs/libdv/files/libdv-0.103-mmx.patch33
-rw-r--r--media-libs/libdv/libdv-0.104-r1.ebuild4
3 files changed, 42 insertions, 2 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/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
}