Fix broken cpp check, bug #431066. Fix amd64 detection. Fix broken threads AC_ARG_ENABLE.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 73 insertions, 7 deletions

diff --git a/media-libs/libvisual/ChangeLog b/media-libs/libvisual/ChangeLog
index 7a605a97c579..b14db816fc2f 100644
--- a/media-libs/libvisual/ChangeLog
+++ b/media-libs/libvisual/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libvisual
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisual/ChangeLog,v 1.49 2013/08/10 20:36:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisual/ChangeLog,v 1.50 2013/08/11 03:11:49 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org> libvisual-0.4.0-r3.ebuild,
+  +files/libvisual-0.4.0-cond.patch, +files/libvisual-0.4.0-conditions.patch,
+  +files/libvisual-0.4.0-detect_amd64.patch:
+  Fix broken cpp check, bug #431066. Fix amd64 detection. Fix broken threads
+  AC_ARG_ENABLE.
 
 *libvisual-0.4.0-r3 (10 Aug 2013)
 
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index faf6c1a311f3..fd726f14c210 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA256
 
 AUX libvisual-0.4.0-better-altivec-detection.patch 1551 SHA256 a6c3a6eed2fbb79f6f8ad7c36ad9845eb3e0c7c18db05a51f2561f02da1ecc92 SHA512 c78b136adf384d22ed6e918e30f6f42a97a087a4c1bb88799a9b299eb50c41ea7a98dd405ddb0360e9cf0ace83998744a9428a4e18954dade7ca75bbc54b4b16 WHIRLPOOL e08b38c51320fc995d09f2d00257c62884b1e9fd5aae637caf52697c03c6459e30c0e8937f6eefbbbf123a4977a3c4868992868e67ee0df7f2e5effa2a694ef6
+AUX libvisual-0.4.0-cond.patch 549 SHA256 c21eea2c44f1d70e790dd06070db4ad64b830083bbb96378364631c4f8b655c5 SHA512 57989250f0cfdd12ebcd0eb89cabca71091a0ad378369d654870a103c633a01bd1a1bbbb7d48d9995c2dfe80fe34b1c44a0a151be4a86c5e5455806a1b14ed94 WHIRLPOOL 04b694814c4648205dcf069565258b266148a407b9a4ce52aa172f52b984396d1f7b6b7b231f0d767d33e8ea6e056c703b5f92125b613987843709a33f7d3ff2
+AUX libvisual-0.4.0-conditions.patch 889 SHA256 18435e075c1392d08692f6ebdb36c370e3805ea6799934949fcc9a14eefcdb47 SHA512 e1cf6fb10a912e3117bf866a92d0b4c8de61fe1e35946a21f00f005efe2a48c3596ff087d9dc16807b9049a542410e24efadc9343208512b2e14974e0b01f018 WHIRLPOOL dfd088fb26b2ba591336f06dd3ef785b970bd98ca7c1ad823644a5bc43d83ed6432268fe4f243d8be41dc7f6e96ec23be41733515260d760981544f015b7dae9
+AUX libvisual-0.4.0-detect_amd64.patch 431 SHA256 34dd11f1cd5dee01fcf860b444683a57a733b8645fce4bb34f3154ef20dcc108 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3 WHIRLPOOL 564a37bd162a12e26c7c2a75c4887ae541cd8b5b6f2ad1bbd3c8feb6c81bff594775dfbadcd75a9a3e6797f48f458cd9b97d0071695e8a35504871bb65d8a37a
 AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 SHA256 910697188457832d39d8cf73a91009439a5dcc27b373f9c3bb2e1938f4ab85c3 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7 WHIRLPOOL f418f18363a3543f9f1947b7fac1186d7316576e2c609e9b9a0d33421bc15eb8c37d32f528a2155b108fd8a05bf6a8e5c415069233e61cd7378fbf3d7076eb8f
 DIST libvisual-0.4.0.tar.gz 583386 SHA256 0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95 WHIRLPOOL fe47914f3d252292b6ae08ecb176c6f09b0709f9bfaf61806bb7bb0e5f06b78d0705c0616c66b74bcf24e12846d6d44033187b1a5482bb9a9d5d5f20ba60212c
 EBUILD libvisual-0.4.0-r1.ebuild 931 SHA256 2412c5e2470079d3e57f52ebbdb9ba882c916e5e4a68465d54b170f6b87f40ed SHA512 bdad523c6a1fb6477566ccbdee84cd0a63ba27f12d1662b3cceacf08e8d6850452df58db879f6489dda64f9da547f4a3c97d366527bdcfae9a363252a72eb0af WHIRLPOOL eefe594bbdcaa89f36bdf9f70e48e7c39518c7520ed669fa99443eb6e8e2687f7af893eca8874d9003dff7194f9465c90f40efd6dd6f4e790990fce7deadca48
 EBUILD libvisual-0.4.0-r2.ebuild 1208 SHA256 62fb343db043661d2022cae5cfdb9cfea9e591481c350cfe9044e04b9b81539d SHA512 b755e9e2a5fccbd27dbbcdc45710eb82bbb12fb16b650f6359e0a64a4e27a23638fcea306024bde670510e9451a1bcf823635120c0f8d4e46efdd8910e718bd2 WHIRLPOOL fa7fe4c88a0fa825719b7ac591a8475781278b6fa1b7bd47b22f197e023b1ebbf2ef989c8e49a03cc17431f8202f7b6dba00879f90f4e9ed30a01602457f3a48
-EBUILD libvisual-0.4.0-r3.ebuild 1420 SHA256 7e8032bdb2efba90a0b12368669eb545ebf0ba680365ad050e9fd71e2367ff2d SHA512 b3e4bfd50c0112b3a025de083bc85e08ff92f4f627d3bcdc0d1a3cadfacdfec9da9fe11a67f5c1fd7caa33370fc9941c9f399b50e292770351b39e10a573a035 WHIRLPOOL d843041ee99af3f85c04ec9db39d4c9bb6fec898bad19833aab16b3c3d6eb71e56a23d36f8769dd5bfb9e63be23353faeeb35f6342a95d78750d5d4c1a8dd0cd
-MISC ChangeLog 6836 SHA256 4fca49ffc69409d92d0d8404fc0c8b92f86d2f1af3c37a6a898ecfe583ec75a7 SHA512 aa556354d364c0d73228176e08493dbc12bb836dba6ad615dc6984da408ad77e078c4ddb5bd2821f621ceb50b027808ee88f5e61963ac8a8d779b241886ffa5d WHIRLPOOL 30bf1605b4e8af7f8ec0d61e8fa87f40261bb793405495bf7e48565fa4d5bfddb0943df3b91fc8eff23935295dff0afd447bf0f3d0949b7c4d99ca36898ae5ce
+EBUILD libvisual-0.4.0-r3.ebuild 1550 SHA256 d223f32821da2e27dedec520a24690cf8befe367f3ca93f09de529610646f8a7 SHA512 8eef9b17f9b7f47694794615fdca76c7bd5ed039130f3539fc840028559a773f0c1ec7df8b1159d420784f415e91cfef74ab4e35ed4d61a5e7db9a19c49b5eb7 WHIRLPOOL 2e1f0f97bbca9d5911ecce09d1afa6cddb0626e42f6814a2fcadcdbc12daa757b95f7c38b3a980618d852327904f008bdfa80108ca4d48fd91b6170c5d61e186
+MISC ChangeLog 7133 SHA256 a9c17ff20d243c262d975705bc76c6fd818da0db37c47dbdb68a63dac2bb96d2 SHA512 460405e98fb0d81af5ecbe35beb551cc293167bac12835d71b5df3462a6eb5306e563276357efd63a2b8564a3544537e3bb42cd629fbf827073b9eac988e9d4e WHIRLPOOL 1372702b9cf27dd072b9e6fbb688532432457d791cd46f7bda6d4427e67211f46eafc5bf693f655bc76aba84af4aceec704f0daedcf31fa145208e3a64676998
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIGpFkACgkQvFcC4BYPU0p7pACePpaTZHs0hXMYB1l7hQIyjX/Z
-zR0AnjRfxRuE1KTBZTY+jG9rgJYYBrzy
-=qsru
+iEUEAREIAAYFAlIHAPcACgkQvFcC4BYPU0rlPwCghBxbezkkSqIhY6CBB5HWhPPz
+/NIAmOPtnOOPn5bS11AYd1T+ACHv91M=
+=TRVO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-cond.patch b/media-libs/libvisual/files/libvisual-0.4.0-cond.patch
new file mode 100644
index 000000000000..e1a3efd47418
--- /dev/null
+++ b/media-libs/libvisual/files/libvisual-0.4.0-cond.patch
@@ -0,0 +1,15 @@
+Broken --enable/disable condition.
+
+Index: libvisual-0.4.0/configure.ac
+===================================================================
+--- libvisual-0.4.0.orig/configure.ac
++++ libvisual-0.4.0/configure.ac
+@@ -191,7 +191,7 @@ AIX_COMPILE_INFO="AIX's C compiler needs
+ 		with the right compiler. Ususally just '_r' is appended 
+ 		to the compiler name."
+ 
+-AC_ARG_ENABLE([enable_threads],
++AC_ARG_ENABLE([threads],
+   AC_HELP_STRING([--enable-threads],
+ 		[Turn on basic thread support @<:@default=enabled@:>@]),
+ 		[enable_threads=$enableval],
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-conditions.patch b/media-libs/libvisual/files/libvisual-0.4.0-conditions.patch
new file mode 100644
index 000000000000..1520db2eac5e
--- /dev/null
+++ b/media-libs/libvisual/files/libvisual-0.4.0-conditions.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=431066
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456856
+
+diff -u libvisual-0.4.0/libvisual/lv_cpu.c libvisual-0.4.0/libvisual/lv_cpu.c
+--- libvisual-0.4.0/libvisual/lv_cpu.c
++++ libvisual-0.4.0/libvisual/lv_cpu.c
+@@ -76,7 +76,7 @@
+ 
+ /* The sigill handlers */
+ #if defined(VISUAL_ARCH_X86) //x86 (linux katmai handler check thing)
+-#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
++#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE)
+ static void sigill_handler_sse( int signal, struct sigcontext sc )
+ {
+ 	/* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1"
+@@ -109,7 +109,7 @@
+ 	}
+ }
+ #endif
+-#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE && X86_FXSR_MAGIC */
++#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE */
+ 
+ #if defined(VISUAL_OS_WIN32)
+ LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep)
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-detect_amd64.patch b/media-libs/libvisual/files/libvisual-0.4.0-detect_amd64.patch
new file mode 100644
index 000000000000..a796acce3b07
--- /dev/null
+++ b/media-libs/libvisual/files/libvisual-0.4.0-detect_amd64.patch
@@ -0,0 +1,14 @@
+Needed so that lvconfig.h gets the correct define for amd64.
+
+Index: libvisual-0.4.0/configure.ac
+===================================================================
+--- libvisual-0.4.0.orig/configure.ac
++++ libvisual-0.4.0/configure.ac
+@@ -780,6 +780,7 @@ echo >>$outfile
+    lv_alpha=$lv_alpha
+    lv_sparc=$lv_sparc
+    lv_ix86=$lv_ix86
++   lv_x86_64=$lv_x86_64
+    lv_powerpc=$lv_powerpc
+    lv_arch_unknown=$lv_arch_unknown
+ 
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index 051e0fbd4ac9..283fc34603a7 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisual/libvisual-0.4.0-r3.ebuild,v 1.1 2013/08/10 20:36:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisual/libvisual-0.4.0-r3.ebuild,v 1.2 2013/08/11 03:11:49 aballier Exp $
 
 EAPI=5
 
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-multilib
 
@@ -28,6 +29,9 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 PATCHES=(
 	"${FILESDIR}"/${P}-better-altivec-detection.patch
 	"${FILESDIR}"/${P}-inlinedefineconflict.patch
+	"${FILESDIR}"/${P}-conditions.patch
+	"${FILESDIR}"/${P}-detect_amd64.patch
+	"${FILESDIR}"/${P}-cond.patch
 	)
 
 MULTILIB_WRAPPED_HEADERS=(