Disable simd code for x32 ABIs so the package at least works (passes tests) #420239 by Xavier Miller.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 25 insertions, 19 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 05e824cefa73..bbfff0700aa7 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libjpeg-turbo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.46 2012/06/09 07:43:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.47 2012/06/14 15:44:29 vapier Exp $
+
+  14 Jun 2012; Mike Frysinger <vapier@gentoo.org> libjpeg-turbo-1.2.0-r2.ebuild:
+  Disable simd code for x32 ABIs so the package at least works (passes tests)
+  #420239 by Xavier Miller.
 
   09 Jun 2012; Mike Frysinger <vapier@gentoo.org>
   +files/libjpeg-turbo-1.2.0-x32.patch, libjpeg-turbo-1.2.0-r2.ebuild:
@@ -216,4 +220,3 @@
   23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   +libjpeg-turbo-1.0.0.ebuild:
   Initial commit wrt #327487 by Siarhei Siamashka.
-
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 109e132f42a7..59f2ad624500 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -6,23 +6,23 @@ AUX libjpeg-turbo-1.2.0-x32.patch 1240 RMD160 36661dae335cf1809b99ad0a1b94722fba
 DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
 DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
 EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2685 RMD160 e12b395b5b09531070c6e3bd1e898e5a78459975 SHA1 a08b692270dbc3c415af35ad70318f2a0e1a97d6 SHA256 01facfbf8e95e2d2c31e278c139183f445814ced72fae27445085e9f4c37b03f
-EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2833 RMD160 2318e26a51031442834deb9b5f33e6a90731adcb SHA1 0560e61b049f350b0ea98a88a33d4dfaf422c89f SHA256 1d790a510fe304742aa61c8265f2002c82f39546ef4a7c70cf56f2045dcfa0e9
-MISC ChangeLog 7100 RMD160 849b2eefcb6a872847d32e66097fc81d019145ea SHA1 f94ca085743c27cb92368e72b9fd0ef96fecd332 SHA256 02938b76398141e7073be9ace769dae9ee62055c82b0a544db0fac8d6f099a13
+EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2930 RMD160 e2d29c153a6011e25b0cbe301007a09b9d6f776b SHA1 7d82d2bf1fc85e6812bb5225abce66c67ee785b2 SHA256 350623f3bb6d3ff5d044675f7b7290c8fb462662144312c53d3011534af95d04
+MISC ChangeLog 7287 RMD160 41e8f34058da83a5679bc1ac0e66978760c83188 SHA1 ce3686ceffb6dd1547454c060598375e71244f97 SHA256 57865cb8c28cf8f42acb9970eb7f57a127a07e80964ecf766e9ad8cd76309801
 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP0v6qAAoJELEHsLL7fEFW2NwP/jriaeet6GuqB4wTL2EpPNjx
-0xvxDqAoX84E7dTgfihupenofYfVtnRrz0r78zWQZJNIzkv1hHTmLrDkdRMU8tFT
-JwaGvKbnWPX/b0nvJQxddPgdsZkVoxjleiKJ9rL56s6l+ifSKbBpVWwxPTrA4q/J
-vTkARVBr7Gc/VqfJZJzK0IhJ0SI5Hyuunpf5zkTpNUFPAjM1c7AVqPwFUET9SZwX
-ozq0A+eTmHNIqdhOj64ojSFbR+zi7OblqIP7hfkzuFmHoE61A1+EAQBlsVuPJ0Yl
-Ba4W+B/YA0h7vmRWAlIyZyVBhlvZaeBGy6oNnDq+RpoBh9AQhd+4cfE1tE61kh3M
-ceDV4L6inaCgLYuu1kFmK+UuszNcWm691LBbJ01I4dGKqrvyUDd3d6zUgmTtHL+O
-qOBD6Jb4ILxcAv/19uq5Q47g8/+exVOtPteUqvl8C2TbMCL9NVndhz4q5R71EdPS
-W7iZeWHekQls4FOo+aT82MLwaWlmUs9/GA8gL2/ioK+3ZuKhcZz6lA7SHzgSY+FA
-FrPupQaNGTdmJGkcgSD5w0pojHcBX6ESdUq0k5xxX8wB9IClHs6u5REC8rbYx4i1
-yod2LludAPu10pumPbunbIiqvXQ5gEkfqtQEqpRK0LURZONxkMrP1eDI0UMWbyRV
-PXKslCv0mZCogcREv8lI
-=osGo
+iQIcBAEBAgAGBQJP2gbmAAoJELEHsLL7fEFWlgYQALAHl0fzugY4IKYYrNSQ3der
+OiBr4o++Y4Tdaex7YaqGtnnSUCZyIKGnHactAwdWeTR5RbMhi5Q2JwAJbyLfze68
+l3NlpbH96Sg1ba8HcA/vGnrLPYCmw1jNG2y3epAktxmrQCF42UHUoKIGJi4sop3p
+VYDJEo1Emsn1rCQbG8F1taSJ+3N5kWAf72SlAHOE22gxCswZ4oNOeYvonl0OKM8B
+T2EvR804n6Tt7HQnGwpNn+1b9fMSEB/e1PxD8DEmN+1nHgzNydH9uiqKBM1c6lrI
+uNbmENyhAzhZ7233ZuIfqm8OC3HeYUNx8bMEdMyjsUO2VeVr/quCMfA42HPmuW8L
+vdA9UpEbiiQAd1m5daTILG68/TrpmUilGlUTuGX5w7vLhi5bME1ukGy3Ru5TTLN3
+1FOEk10nBQtjD2PlmSzeQyUkx6H+BvOmhGTvNOa+j13P9AOPNoF6JGLc9uyoTVIe
+hwxVZkvmtxwhmXZaHBMtgmn4WApfl+h/2kJ9OapKlfh3uvREOvQhbOtH1HIJT+JJ
+UTkYIOrKKoLnv1s66x11tJsPBfEelDYz07kH87SGLigigONOLClFpHFBo8nF9+mg
+b1Q+cvK5KLhxLPAQXSWb11QKL6nlCQBaOWUgx9BCBcqWzrY5MhNzCVVRqi7z4cP2
+TXjoMDhnLNlR0NT41Bj5
+=7NLC
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
index f155fe01107e..2057588c1f07 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.4 2012/06/09 07:43:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.5 2012/06/14 15:44:29 vapier Exp $
 
 EAPI=4
 
@@ -56,11 +56,14 @@ src_configure() {
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
 	fi
+	local myconf=()
+	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
 
 	econf \
 		$(use_enable static-libs static) \
 		--with-jpeg${JPEG_ABI} \
-		$(use_with java)
+		$(use_with java) \
+		"${myconf[@]}"
 }
 
 src_compile() {