media-libs/libjpeg-turbo: Bump to version 1.4.2 (bug #562572).

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index dd91fe8dd671a78ba73e764e4f0e17a1ebf47eee..3b181428d53b32b2e4af8cfe81db5736f143200d 100644 (file)
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,5 +2,6 @@ DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 2657008cfc08aadbaca065bd9f8964b8a
 DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 SHA512 6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081 WHIRLPOOL f978b24d0a4e63a421822c2114c0cfc87cbc1dedd648ddc2e97e24ee19dc5584433b1da7d41a64f0ae37b50799a273165aaec6f1377ed35a7971dbe8a0b6a8d5
 DIST libjpeg-turbo-1.4.0.tar.gz 1524645 SHA256 d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee SHA512 60d038413acee43a23bb81d18309eed16e771d48b839b7aea52f582bbf9f99f04b3cc991e13cafc3d5df1441b726ea0792e7ad593ce4e52c96792c3b1df42c09 WHIRLPOOL 5f6c15bee87d9f9b82013801a8c6cd42c725ba4d65c0d60f990d4d0aec3c0b9334a5be832b34ae71d8606c801fc621de965c17b8b3067f7eef061f0155cbaa19
 DIST libjpeg-turbo-1.4.1.tar.gz 1529614 SHA256 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 SHA512 81197fdac40c55cb9820b832c55dab9dd5aa19427a22feb6027510a4dc9c45aeea6a37203447600481f5162a0a2ca972324997cc89fc7e51b51808260df0598d WHIRLPOOL b1c2a225720216b602dfda04a3ecf52d2251ea775c44d2cd872e9c33f43f4275ca2fbfaccba8d493c12ece4023f0c4e0c3c029837bdaff577bc401ee46a14433
+DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee WHIRLPOOL 4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
 DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
new file mode 100644 (file)
index 0000000..d473c17
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+       !media-libs/jpeg:62
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="${COMMON_DEPEND}
+       java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+       amd64? ( ${ASM_DEPEND} )
+       x86? ( ${ASM_DEPEND} )
+       amd64-fbsd? ( ${ASM_DEPEND} )
+       x86-fbsd? ( ${ASM_DEPEND} )
+       amd64-linux? ( ${ASM_DEPEND} )
+       x86-linux? ( ${ASM_DEPEND} )
+       x64-macos? ( ${ASM_DEPEND} )
+       java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+
+       elibtoolize
+
+       java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+       local myconf=()
+       if multilib_is_native_abi; then
+               myconf+=( $(use_with java) )
+               if use java; then
+                       export JAVACFLAGS="$(java-pkg_javac-args)"
+                       export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+               fi
+       else
+               myconf+=( --without-java )
+       fi
+       [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+       # Force /bin/bash until upstream generates a new version. #533902
+       CONFIG_SHELL=/bin/bash \
+       ECONF_SOURCE=${S} \
+       econf \
+               $(use_enable static-libs static) \
+               --with-mem-srcdst \
+               "${myconf[@]}"
+}
+
+multilib_src_compile() {
+       local _java_makeopts
+       use java && _java_makeopts="-j1"
+       emake ${_java_makeopts}
+
+       if multilib_is_native_abi; then
+               pushd ../debian/extra >/dev/null
+               emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+               popd >/dev/null
+       fi
+}
+
+multilib_src_test() {
+       emake test
+}
+
+multilib_src_install() {
+       emake \
+               DESTDIR="${D}" \
+               docdir="${EPREFIX}"/usr/share/doc/${PF} \
+               exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+               install
+
+       if multilib_is_native_abi; then
+               pushd "${WORKDIR}"/debian/extra >/dev/null
+               emake \
+                       DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+                       INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+                       install
+               popd >/dev/null
+
+               if use java; then
+                       rm -rf "${ED}"/usr/classes
+                       java-pkg_dojar java/turbojpeg.jar
+               fi
+       fi
+}
+
+multilib_src_install_all() {
+       prune_libtool_files
+
+       insinto /usr/share/doc/${PF}/html
+       doins -r "${S}"/doc/html/*
+       newdoc "${WORKDIR}"/debian/changelog changelog.debian
+       if use java; then
+               insinto /usr/share/doc/${PF}/html/java
+               doins -r "${S}"/java/doc/*
+               newdoc "${S}"/java/README README.java
+       fi
+}