GCC-4.5 patch wrt bug #322217

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 24 insertions, 16 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 9348cec27e8b..67bb182ddafa 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.162 2010/06/03 14:43:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.163 2010/06/03 16:05:46 hwoarang Exp $
+
+  03 Jun 2010; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.2.ebuild,
+  +files/avidemux-gcc-4.5.patch:
+  GCC-4.5 patch thanks to Martin Väth <vaeth@mathematik.uni-wuerzburg.de>.
+  Fixes bug #322217
 
   03 Jun 2010; Joseph Jezak <josejx@gentoo.org> avidemux-2.5.2.ebuild,
   +files/avidemux-2.5.2-altivec-bool.patch:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index d31384337b13..d9e7377044ca 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX avidemux-2.4-cmake264.patch 820 RMD160 e02c32891a257dd6e14e2b6aa464232cea222429 SHA1 387804ad24a816a24a036b57692cee9ff13e728f SHA256 693958df6c16d467e3c4a0b9dc56861c2c1bf8eed051de5cd7422b274d5d68af
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
 AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
@@ -9,6 +6,7 @@ AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe
 AUX avidemux-2.4.4-gcc-4.4.patch 3946 RMD160 1be6fb90f05befb0399ef38ccb6358d082f27b0a SHA1 63de9ce7999af1b9f94c01b14ccd049c2b27f32a SHA256 d8e2392b4eb4a0e5573fe5bac10a9ac57ae0f16207e613543d8e61d7527914af
 AUX avidemux-2.5.1-build-plugins-fix.patch 438 RMD160 4ddd7d69679940efbb783149e5c994e2036e65ea SHA1 5988536e2d74fe3b050026fee6a22ba0a85d037b SHA256 4316a65d59a3eedd482ae845d586d50e67311cb4a7c8680aca3d67c575c53a1f
 AUX avidemux-2.5.2-altivec-bool.patch 330 RMD160 694d756e3ea022b95833cbf988d363950787358d SHA1 437a342b63d66eb817e46a0a67ea3a4e4069aef8 SHA256 4fe3455a9e7441e19160814147385d98106e69ea21e7172f87c429bfca9e5744
+AUX avidemux-gcc-4.5.patch 358 RMD160 f8482b5f948d3d9f21493f3645f8ab73e24e22b5 SHA1 9c0d5bf6f2917566afc4ccf8309c8d52a4e1efec SHA256 1dee7a3433d255bb143c104ebf27accf463c4b973909c10a266f553a88e6e624
 AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
 DIST avidemux-2.5-r5428.tar.bz2 11433656 RMD160 ae72e5d03f2c12b1a9e64ed9cd57a00c84eac841 SHA1 d29d7a2d1054108bc20b4371be9c5ab29816a2e6 SHA256 42e3d596d8ac106120f88a77442a5a916fd34c64b09940f70d3156221cd7e50c
 DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d688e2771bebe SHA1 bdc6aab3f19c1ef71f3e04c23435f22452651fd9 SHA256 bcd472ea7c5f96c8bf8f48c2c93d53804912e94c77120dc8739e2c0ab122d69c
@@ -18,13 +16,6 @@ DIST avidemux_2.5.2.tar.gz 13593297 RMD160 133df6676d6ac608c31d130897b54a47c54c7
 EBUILD avidemux-2.4.4-r2.ebuild 3538 RMD160 e88f8a04653b628a1300b4d73473a320f2a79655 SHA1 55b9f7303d74ecfe14f1a5a2f654e2413f1214a9 SHA256 76527af36b493063cda3442d0ad2713847a02518e767969b6fdc94b381118849
 EBUILD avidemux-2.5.1-r2.ebuild 4955 RMD160 bf3971eec4b58d10c6d5241af9f8725d78c9f101 SHA1 66279aae61f9a66503f628c5358a1776e03e33e0 SHA256 4a1a5ddcef86f2e9e0d9141b8172ad31246a499415fb903ac07faf38c22ca374
 EBUILD avidemux-2.5.1_p5428.ebuild 4853 RMD160 8c52be77d9944539bca654db70718ebded38c08b SHA1 b3bb73ec591e2f7f4ff187826f8db43a07318fa1 SHA256 06ac0328e1e963a17a28682cfb6a791eab190b4793b5ee892e73446ae6cc0261
-EBUILD avidemux-2.5.2.ebuild 5016 RMD160 712f3e5394dee6e89aa5d7b418589734bc4bee2c SHA1 f2f5ab2ba9910b738648a96c8cd8b896e8a2066f SHA256 3ef83753c1a946d2927a9ea810e17b5f83c6501a5cb8b3cea806ebabe1b4423f
-MISC ChangeLog 28824 RMD160 4dc3edcbc57714584cfef6948d1f4908a47892cb SHA1 f8438257f05397e1466ef0612aa04a9df27e7f88 SHA256 b3ec522c654edea09f969a06db38817c97be0d7841b4556125705b2ad6f8c9b3
+EBUILD avidemux-2.5.2.ebuild 5052 RMD160 b67fa3f157486611b8640268e9e6133e8c5f6863 SHA1 84e1fe5273be09eb9478b8a09ee521a8a526d816 SHA256 970fb2c56fad5636be75f54b4e7fd3e2ca34b509feb4ffb3f4cfcddde4918a97
+MISC ChangeLog 29032 RMD160 7fa772df4e8148466af2fb80ca9d185ba1479a6e SHA1 44a644eb98f1456487eb092d034ac8d3d5467d15 SHA256 f75aeacf87d74ebf0bf1d9c70948c060fc615324d959338acb9a4577f8c25130
 MISC metadata.xml 465 RMD160 cbd50d211f2ad02fa9eb5da75509396f8464b6cc SHA1 e22f8fba25f6138d4a29c93079afbddf96832c33 SHA256 06d094aee75706e06b7f50e739616add134f188aef4a110d5912bdf2fd25e501
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwHvz8ACgkQcsIHjyDViGR3bwCfc1tPPXKAAMjRU5Xih3QvAFTh
-AwAAnj0PWSm5AfgVeXdQiO0VGDe+HZ7i
-=Ow/4
------END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.2.ebuild b/media-video/avidemux/avidemux-2.5.2.ebuild
index aa20ef224930..d26bbd86b06c 100644
--- a/media-video/avidemux/avidemux-2.5.2.ebuild
+++ b/media-video/avidemux/avidemux-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.2 2010/06/03 14:43:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.3 2010/06/03 16:05:46 hwoarang Exp $
 
 EAPI="2"
 
@@ -55,8 +55,9 @@ done
 
 PATCHES=( "${WORKDIR}/patches/2.5.1-i18n.patch"
 	"${WORKDIR}/patches/2.5.1-coreImage-parallel-build.patch"
-	"${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch" 
-	"${FILESDIR}/avidemux-2.5.2-altivec-bool.patch" )
+	"${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch"
+	"${FILESDIR}/avidemux-2.5.2-altivec-bool.patch"
+	"${FILESDIR}/${PN}-gcc-4.5.patch" )
 
 src_prepare() {
 	base_src_prepare
diff --git a/media-video/avidemux/files/avidemux-gcc-4.5.patch b/media-video/avidemux/files/avidemux-gcc-4.5.patch
new file mode 100644
index 000000000000..56ea088e909b
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-gcc-4.5.patch
@@ -0,0 +1,11 @@
+--- avidemux/ADM_coreImage/include/ADM_mmxMacros.h
++++ avidemux/ADM_coreImage/include/ADM_mmxMacros.h
+@@ -353,7 +353,7 @@
+ #define	mmx_m2r(op, mem, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (mem))
++			      : "ym" (mem))
+ 
+ #define	mmx_r2m(op, reg, mem) \
+ 	__asm__ __volatile__ (#op " %%" #reg ", %0" \