From 12d3189bd340784fe09717ab8ccc5acf9744f21a Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 14 Jun 2016 12:05:55 +0200 Subject: media-libs/libjpeg-turbo: Security bump (bug #585782). Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler --- media-libs/libjpeg-turbo/Manifest | 1 + .../files/libjpeg-turbo-1.2.0-x32.patch | 8 +- .../libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild | 119 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild (limited to 'media-libs') diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index c5ef8ccdc7ea..9137c0d77f61 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,2 +1,3 @@ DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee WHIRLPOOL 4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b +DIST libjpeg-turbo-1.5.0.tar.gz 1654276 SHA256 9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f SHA512 3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22 WHIRLPOOL 5aee1cda739fb70fe15efd0cdb2cdecd7d99e4bea3d0b05d757420dd781749bc9c4a91ba4f5c1ad68584113323acc0d2784ac18c9daed678d4057a410a289610 DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939 diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch index d85a4d7908f3..523eed7557d5 100644 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch +++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch @@ -2,8 +2,8 @@ https://bugs.gentoo.org/420239 https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -33,7 +33,11 @@ case "$host_os" in linux*) case "$host_cpu" in @@ -25,8 +25,8 @@ https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=12 ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; RDF) NAFLAGS='-frdf -DRDF';; Mach-O) NAFLAGS='-fmacho -DMACHO';; ---- simd/nasm_lt.sh -+++ simd/nasm_lt.sh +--- a/simd/nasm_lt.sh ++++ b/simd/nasm_lt.sh @@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do pic=yes fi diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild new file mode 100644 index 000000000000..633def79e790 --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +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" +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 ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 +) + +src_prepare() { + default + + 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 +} -- cgit v1.2.3-65-gdbad