Added amd64 patch, closing bug #68052

4 files changed, 70 insertions, 20 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 4c31df236e41..33f4e37498d2 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.54 2004/10/18 11:12:48 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.55 2004/10/19 20:36:27 zypher Exp $
+
+  19 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
+  Added amd64-patch, closes bug #68052.
 
 *avidemux-2.0.39 (15 Okt 2004)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 40971629e64c..8e3530bdce13 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,25 +1,26 @@
-MD5 36c14cc721785b91b788e8752cdfd4ba ChangeLog 10091
-MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
-MD5 faa3cbad236210cf4b3d130e3ed077fc avidemux-2.0.26.ebuild 2224
-MD5 11648f5ec6649662e9fb3182267612fe avidemux-0.9-r1.ebuild 2021
-MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
+MD5 ba2c59a6ab208d56880460ba57efb707 ChangeLog 10207
 MD5 b26350a505e3bbc5b41e0d8b73379270 avidemux-2.0.28.ebuild 2350
 MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
+MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
 MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
-MD5 62907e2953086130a2d797224502e1c7 avidemux-2.0.30.ebuild 2311
-MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
-MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
-MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
-MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
-MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 faa3cbad236210cf4b3d130e3ed077fc avidemux-2.0.26.ebuild 2224
+MD5 fbbc1615e31de09ce23dfe0c84a05901 avidemux-2.0.30.ebuild 2427
+MD5 11648f5ec6649662e9fb3182267612fe avidemux-0.9-r1.ebuild 2021
+MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
-MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
 MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
-MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
 MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
-MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
-MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539
+MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
+MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
+MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 68b5a84288adbd1306f475f41ac1091d files/digest-avidemux-2.0.30 68
+MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
+MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
+MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
+MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
diff --git a/media-video/avidemux/avidemux-2.0.30.ebuild b/media-video/avidemux/avidemux-2.0.30.ebuild
index 6668310b52a7..543f4d8b16cf 100644
--- a/media-video/avidemux/avidemux-2.0.30.ebuild
+++ b/media-video/avidemux/avidemux-2.0.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.30.ebuild,v 1.1 2004/10/18 11:12:48 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.30.ebuild,v 1.2 2004/10/19 20:36:27 zypher Exp $
 
 inherit eutils flag-o-matic
 
@@ -43,6 +43,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/avidemux-2.0.30_fixes.patch
+	if use amd64 ; then
+	    cd ${S}/adm_lavcodec/i386
+	    epatch ${FILESDIR}/avidemux-2.0.30_amd64_cpuutil.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch b/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch
new file mode 100644
index 000000000000..f204d0104398
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch
@@ -0,0 +1,42 @@
+Index: cputest.c
+===================================================================
+RCS file: adm_lavcodec/i386/cputest.c,v
+retrieving revision 1.4
+diff -u -r1.4 cputest.c
+--- cputest.c	12 Oct 2004 18:28:41 -0000	1.4
++++ cputest.c	19 Oct 2004 17:48:07 -0000
+@@ -27,29 +27,30 @@
+ {
+     int rval;
+     int eax, ebx, ecx, edx;
++    long a,c;
+     
+     __asm__ __volatile__ (
+                           /* See if CPUID instruction is supported ... */
+                           /* ... Get copies of EFLAGS into eax and ecx */
+                           "pushf\n\t"
+                           "pop %0\n\t"
+-                          "movl %0, %1\n\t"
++                          "mov %0, %1\n\t"
+                           
+                           /* ... Toggle the ID bit in one copy and store */
+                           /*     to the EFLAGS reg */
+-                          "xorl $0x200000, %0\n\t"
++                          "xor $0x200000, %0\n\t"
+                           "push %0\n\t"
+                           "popf\n\t"
+                           
+                           /* ... Get the (hopefully modified) EFLAGS */
+                           "pushf\n\t"
+                           "pop %0\n\t"
+-                          : "=a" (eax), "=c" (ecx)
++                          : "=a" (a), "=c" (c)
+                           :
+                           : "cc" 
+                           );
+     
+-    if (eax == ecx)
++    if (a == c)
+         return 0; /* CPUID not supported */
+     
+     cpuid(0, eax, ebx, ecx, edx);