summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/libjpeg-turbo/ChangeLog7
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild7
2 files changed, 10 insertions, 4 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/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() {