* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2016-06-14 10:06 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2016-06-14 10:06 UTC (permalink / raw
To: gentoo-commits
commit: 12d3189bd340784fe09717ab8ccc5acf9744f21a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 10:05:55 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 10:06:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d3189b
media-libs/libjpeg-turbo: Security bump (bug #585782).
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
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(-)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index c5ef8cc..9137c0d 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 d85a4d7..523eed7 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 0000000..633def7
--- /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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2018-06-21 13:45 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-06-21 13:45 UTC (permalink / raw
To: gentoo-commits
commit: a6fd7dd5d9d605685ff7f62bebf6f56fd4dbb8b9
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 13:40:08 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 13:45:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fd7dd5
media-libs/libjpeg-turbo: Revbump to fix division by zero.
Bug: https://bugs.gentoo.org/658624
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/libjpeg-turbo-1.5.3-divzero_fix.patch | 18 ++++++
.../files/libjpeg-turbo-1.5.90-divzero_fix.patch | 41 ++++++++++++
...1.5.90.ebuild => libjpeg-turbo-1.5.3-r1.ebuild} | 73 ++++++++++++++--------
....5.90.ebuild => libjpeg-turbo-1.5.90-r1.ebuild} | 8 ++-
4 files changed, 113 insertions(+), 27 deletions(-)
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
new file mode 100644
index 00000000000..c7e6d105676
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
@@ -0,0 +1,18 @@
+Backported from
+https://github.com/libjpeg-turbo/libjpeg-turbo/commit/43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6
+
+--- libjpeg-turbo-1.5.3/rdbmp.c
++++ libjpeg-turbo-1.5.3/rdbmp.c
+@@ -434,6 +434,12 @@
+ progress->total_extra_passes++; /* count file input as separate pass */
+ }
+
++ /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
++ value of the JDIMENSION type. This is only a danger with BMP files, since
++ their width and height fields are 32-bit integers. */
++ if ((unsigned long long)biWidth *
++ (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
++ ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+ /* Allocate one-row buffer for returned data */
+ source->pub.buffer = (*cinfo->mem->alloc_sarray)
+ ((j_common_ptr) cinfo, JPOOL_IMAGE,
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch
new file mode 100644
index 00000000000..d505499a082
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch
@@ -0,0 +1,41 @@
+From 43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6 Mon Sep 17 00:00:00 2001
+From: DRC <information@libjpeg-turbo.org>
+Date: Tue, 12 Jun 2018 20:27:00 -0500
+Subject: [PATCH] tjLoadImage(): Fix FPE triggered by malformed BMP
+
+In rdbmp.c, it is necessary to guard against 32-bit overflow/wraparound
+when allocating the row buffer, because since BMP files have 32-bit
+width and height fields, the value of biWidth can be up to 4294967295.
+Specifically, if biWidth is 1073741824 and cinfo->input_components = 4,
+then the samplesperrow argument in alloc_sarray() would wrap around to
+0, and a division by zero error would occur at line 458 in jmemmgr.c.
+
+If biWidth is set to a higher value, then samplesperrow would wrap
+around to a small number, which would likely cause a buffer overflow
+(this has not been tested or verified.)
+diff --git a/rdbmp.c b/rdbmp.c
+index fcabbb13e..a02cfd909 100644
+--- a/rdbmp.c
++++ b/rdbmp.c
+@@ -6,7 +6,7 @@
+ * Modified 2009-2010 by Guido Vollbeding.
+ * libjpeg-turbo Modifications:
+ * Modified 2011 by Siarhei Siamashka.
+- * Copyright (C) 2015, 2017, D. R. Commander.
++ * Copyright (C) 2015, 2017-2018, D. R. Commander.
+ * For conditions of distribution and use, see the accompanying README.ijg
+ * file.
+ *
+@@ -623,6 +623,12 @@ start_input_bmp(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
+ }
+ }
+
++ /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
++ value of the JDIMENSION type. This is only a danger with BMP files, since
++ their width and height fields are 32-bit integers. */
++ if ((unsigned long long)biWidth *
++ (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
++ ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+ /* Allocate one-row buffer for returned data */
+ source->pub.buffer = (*cinfo->mem->alloc_sarray)
+ ((j_common_ptr)cinfo, JPOOL_IMAGE,
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r1.ebuild
similarity index 59%
copy from media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90.ebuild
copy to media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r1.ebuild
index f015b6b0116..a18bcc5812b 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs versionator
+inherit autotools libtool ltprune java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
-[[ "$(get_version_component_range 3)" -ge 90 ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
@@ -34,57 +33,81 @@ DEPEND="${COMMON_DEPEND}
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+ "${FILESDIR}"/${P}-divzero_fix.patch #658624
+)
+
src_prepare() {
default
+ eautoreconf
+
java-pkg-opt-2_src_prepare
}
multilib_src_configure() {
- if multilib_is_native_abi && use java ; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+ 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
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DEFAULT_DOCDIR="/usr/share/doc/${PF}"
- -DENABLE_STATIC="$(usex static-libs)"
- -DWITH_JAVA="$(multilib_native_usex java)"
- -DWITH_MEM_SRCDST=ON
- )
- [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
- cmake-utils_src_configure
+ [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+ # Force /bin/bash until upstream generates a new version. #533902
+ CONFIG_SHELL="${EPREFIX}"/bin/bash \
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ --with-mem-srcdst \
+ "${myconf[@]}"
}
multilib_src_compile() {
- cmake-utils_src_compile
+ local _java_makeopts
+ use java && _java_makeopts="-j1"
+ emake ${_java_makeopts}
- if multilib_is_native_abi ; then
- pushd "${WORKDIR}/debian/extra" &>/dev/null || die
+ if multilib_is_native_abi; then
+ pushd ../debian/extra >/dev/null
emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
- popd &>/dev/null || die
+ popd >/dev/null
fi
}
-multilib_src_install() {
- cmake-utils_src_install
+multilib_src_test() {
+ emake test
+}
- if multilib_is_native_abi ; then
- pushd "${WORKDIR}/debian/extra" &>/dev/null || die
+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
+ if use java; then
+ rm -rf "${ED}"/usr/classes
java-pkg_dojar java/turbojpeg.jar
fi
fi
}
multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
+ prune_libtool_files
insinto /usr/share/doc/${PF}/html
doins -r "${S}"/doc/html/*
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
similarity index 93%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
index f015b6b0116..0cc09fb72cb 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs versionator
+inherit cmake-multilib eapi7-ver java-pkg-opt-2 libtool toolchain-funcs
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
-[[ "$(get_version_component_range 3)" -ge 90 ]] || \
+[[ "$(ver_cut 3)" -ge 90 ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
@@ -34,6 +34,10 @@ DEPEND="${COMMON_DEPEND}
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+PATCHES=(
+ "${FILESDIR}"/${P}-divzero_fix.patch #658624
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2018-08-01 7:57 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-08-01 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 8492c4dc39731d78f748997e51371244e9a7a03f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 1 07:45:49 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 1 07:57:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8492c4dc
media-libs/libjpeg-turbo: Bump to version 2.0.0. Removed old.
Package-Manager: Portage-2.3.44, Repoman-2.3.10
media-libs/libjpeg-turbo/Manifest | 2 +-
.../files/libjpeg-turbo-1.5.90-divzero_fix.patch | 41 ----------------------
...1.5.90-r1.ebuild => libjpeg-turbo-2.0.0.ebuild} | 4 ---
3 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 834f2379e8b..986b30cb310 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,5 +2,5 @@ DIST libjpeg-turbo-1.5.0.tar.gz 1654276 BLAKE2B b3f1ad4c6bbe5b75ef8daa38e0ccf616
DIST libjpeg-turbo-1.5.1.tar.gz 1650647 BLAKE2B 5e9eb7889c430a735a8b8ac22fbf66fc98102acf372d08aa2dbd86ac55d43c5700438a77925f894c473e81289e4d3d2e6fe3da435d2799db21782da9bd5dfe41 SHA512 a03823cf4b3d1aada24e502fea0a979b1f656c01e55ffddc06013b9c79509c2da1e3bcf0b85282289451d77d4cb5f56dd8cbf6e492744836ddda1f7136534852
DIST libjpeg-turbo-1.5.2.tar.gz 1657235 BLAKE2B 8d26af1cf6219e02f13f8729b688175590b01a4ce538ae861e72e6344a319475f8114ad05aefe2f8ffd6b5481c7915bd18097466408729d80212a2db7f99ad5c SHA512 c7fe5cc77e38fad33af3f10e6db961c8edf033a86c09541121f49bfa20547179760924e6d3e397f0add7030459ff3babadd3457ab2da4a40a2147dc1574aa444
DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-1.5.90.tar.gz 2158825 BLAKE2B 51f1e2c3d4a3ef8d764b87cc3646170eed1df4ff4f9834f156a0d18fbb863625e75f73640518991b5df4b9a66517df76537c203f4d16e4673b15e51fbab78789 SHA512 6322f1013ace231fa51aa2cd2799fa526da14074cde08349c7c6f1719954aa4862d4e9b3975c0041aa93f7efce679dc782abdc5e60f92adfdf7d0c8aa2158e30
+DIST libjpeg-turbo-2.0.0.tar.gz 2158457 BLAKE2B fd4974f0500d23e72d0d0cfd31e7c4eba485779932d5c9515645eff4f7dccf97a2aff61b42be0f539905e6dcd6db2acec48cb7bb5ae61cae7152cd06902c36fe SHA512 220e5248e780d3c40c7842ba52937b9b0860e89164bca16ec6e2afaf99dd5d0bc706dd9320f4d2aef67ac11d4876453ef688b1efeaf93ceb42e8c25e83da2487
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch
deleted file mode 100644
index d505499a082..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 12 Jun 2018 20:27:00 -0500
-Subject: [PATCH] tjLoadImage(): Fix FPE triggered by malformed BMP
-
-In rdbmp.c, it is necessary to guard against 32-bit overflow/wraparound
-when allocating the row buffer, because since BMP files have 32-bit
-width and height fields, the value of biWidth can be up to 4294967295.
-Specifically, if biWidth is 1073741824 and cinfo->input_components = 4,
-then the samplesperrow argument in alloc_sarray() would wrap around to
-0, and a division by zero error would occur at line 458 in jmemmgr.c.
-
-If biWidth is set to a higher value, then samplesperrow would wrap
-around to a small number, which would likely cause a buffer overflow
-(this has not been tested or verified.)
-diff --git a/rdbmp.c b/rdbmp.c
-index fcabbb13e..a02cfd909 100644
---- a/rdbmp.c
-+++ b/rdbmp.c
-@@ -6,7 +6,7 @@
- * Modified 2009-2010 by Guido Vollbeding.
- * libjpeg-turbo Modifications:
- * Modified 2011 by Siarhei Siamashka.
-- * Copyright (C) 2015, 2017, D. R. Commander.
-+ * Copyright (C) 2015, 2017-2018, D. R. Commander.
- * For conditions of distribution and use, see the accompanying README.ijg
- * file.
- *
-@@ -623,6 +623,12 @@ start_input_bmp(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
- }
- }
-
-+ /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
-+ value of the JDIMENSION type. This is only a danger with BMP files, since
-+ their width and height fields are 32-bit integers. */
-+ if ((unsigned long long)biWidth *
-+ (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
-+ ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
- /* Allocate one-row buffer for returned data */
- source->pub.buffer = (*cinfo->mem->alloc_sarray)
- ((j_common_ptr)cinfo, JPOOL_IMAGE,
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
similarity index 97%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
index 0cc09fb72cb..9bacfe12a0f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
@@ -34,10 +34,6 @@ DEPEND="${COMMON_DEPEND}
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-PATCHES=(
- "${FILESDIR}"/${P}-divzero_fix.patch #658624
-)
-
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2021-10-17 20:39 John Helmert III
0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2021-10-17 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 64cfcaa52778c853abeb26d16803346a4023f181
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 21:59:28 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 20:36:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cfcaa5
media-libs/libjpeg-turbo: drop 1.5.3-r4, 2.1.0-r2
Bug: https://bugs.gentoo.org/797424
Bug: https://bugs.gentoo.org/814206
Closes: https://bugs.gentoo.org/787422
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22581
media-libs/libjpeg-turbo/Manifest | 2 -
.../files/libjpeg-turbo-1.2.0-x32.patch | 38 ------
.../files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch | 43 -------
.../files/libjpeg-turbo-1.5.3-cve-2018-11813.patch | 45 --------
.../files/libjpeg-turbo-1.5.3-divzero_fix.patch | 18 ---
.../libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild | 126 --------------------
.../libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild | 128 ---------------------
7 files changed, 400 deletions(-)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index cfac31e30b1..5ba827745c7 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,2 @@
-DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
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
deleted file mode 100644
index 523eed7557d..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/420239
-
-https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
-
---- a/configure
-+++ b/configure
-@@ -33,7 +33,11 @@ case "$host_os" in
- linux*)
- case "$host_cpu" in
- x86_64)
-- objfmt='ELF64'
-+ if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then
-+ objfmt='ELF64'
-+ else
-+ objfmt='ELFX32'
-+ fi
- ;;
- *)
- objfmt='ELF'
-@@ -94,6 +98,7 @@ case "$objfmt" in
- a.out) NAFLAGS='-faout -DAOUT';;
- BSD-a.out) NAFLAGS='-faoutb -DAOUT';;
- ELF) NAFLAGS='-felf -DELF';;
-+ ELFX32) NAFLAGS='-felfx32 -DELF -D__x86_64__';;
- ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';;
- RDF) NAFLAGS='-frdf -DRDF';;
- Mach-O) NAFLAGS='-fmacho -DMACHO';;
---- a/simd/nasm_lt.sh
-+++ b/simd/nasm_lt.sh
-@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
- pic=yes
- fi
- ;;
-- -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \
-+ -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \
- -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64)
- # it's a file format specifier for nasm.
- command="$command $1"
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
deleted file mode 100644
index 8a9fcbd7972..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1bfb0b5247f4fc8f6677639781ce468543490216 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 2 Jun 2020 14:15:37 -0500
-Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
-
-This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
-include binary PPM files with maximum values < 255, thus preventing a
-malformed binary PPM input file with those specifications from
-triggering an overrun of the rescale array and potentially crashing
-cjpeg, TJBench, or any program that uses the tjLoadImage() function.
-
-Fixes #433
-diff --git a/rdppm.c b/rdppm.c
-index c0c096218..899436eec 100644
---- a/rdppm.c
-+++ b/rdppm.c
-@@ -5,7 +5,7 @@
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 2009 by Bill Allombert, Guido Vollbeding.
- * libjpeg-turbo Modifications:
-- * Copyright (C) 2015, 2016, D. R. Commander.
-+ * Copyright (C) 2015, 2016, 2020, D. R. Commander.
- * For conditions of distribution and use, see the accompanying README.ijg
- * file.
- *
-@@ -22,6 +22,7 @@
- * the file is indeed PPM format).
- */
-
-+#define JPEG_INTERNALS
- #include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */
-
- #ifdef PPM_SUPPORTED
-@@ -425,7 +426,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
- /* On 16-bit-int machines we have to be careful of maxval = 65535 */
- source->rescale = (JSAMPLE *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-- (size_t) (((long) maxval + 1L) *
-+ (size_t) (((long) MAX(maxval, 255) + 1L) *
- sizeof(JSAMPLE)));
- half_maxval = maxval / 2;
- for (val = 0; val <= (long) maxval; val++) {
-
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
deleted file mode 100644
index f99a1ab27f9..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 12 Jun 2018 16:08:26 -0500
-Subject: [PATCH] Fix CVE-2018-11813
-
-Refer to change log for details.
-
-Fixes #242
----
- ChangeLog.md | 14 ++++++++++++++
- rdtarga.c | 6 ++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
---- libjpeg-turbo-1.5.3/rdtarga.c
-+++ libjpeg-turbo-1.5.3/rdtarga.c
-@@ -125,11 +125,10 @@
- read_non_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file; no RLE expansion */
- {
-- register FILE *infile = sinfo->pub.input_file;
- register int i;
-
- for (i = 0; i < sinfo->pixel_size; i++) {
-- sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+ sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
- }
- }
-
-@@ -138,7 +137,6 @@
- read_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file, expanding RLE data as needed */
- {
-- register FILE *infile = sinfo->pub.input_file;
- register int i;
-
- /* Duplicate previously read pixel? */
-@@ -160,7 +158,7 @@
-
- /* Read next pixel */
- for (i = 0; i < sinfo->pixel_size; i++) {
-- sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+ sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
- }
- }
-
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
deleted file mode 100644
index c7e6d105676..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Backported from
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6
-
---- libjpeg-turbo-1.5.3/rdbmp.c
-+++ libjpeg-turbo-1.5.3/rdbmp.c
-@@ -434,6 +434,12 @@
- progress->total_extra_passes++; /* count file input as separate pass */
- }
-
-+ /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
-+ value of the JDIMENSION type. This is only a danger with BMP files, since
-+ their width and height fields are 32-bit integers. */
-+ if ((unsigned long long)biWidth *
-+ (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
-+ ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
- /* Allocate one-row buffer for returned data */
- source->pub.buffer = (*cinfo->mem->alloc_sarray)
- ((j_common_ptr) cinfo, JPOOL_IMAGE,
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
deleted file mode 100644
index 0df02e0f65e..00000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
- !media-libs/jpeg:62"
-
-BDEPEND="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} )
- x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
- "${FILESDIR}"/${P}-divzero_fix.patch #658624
- "${FILESDIR}"/${P}-cve-2018-11813.patch
- "${FILESDIR}"/${P}-CVE-2020-13790.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-
- 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="${EPREFIX}"/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() {
- find "${ED}" -type f -name '*.la' -delete || die
-
- docinto html
- dodoc -r "${S}"/doc/html/*
- newdoc "${WORKDIR}"/debian/changelog changelog.debian
- if use java; then
- docinto html/java
- dodoc -r "${S}"/java/doc/*
- newdoc "${S}"/java/README README.java
- fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
deleted file mode 100644
index c9b38904748..00000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ "$(ver_cut 3)" -lt 90 ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
- !media-libs/jpeg:62"
-
-BDEPEND=">=dev-util/cmake-3.16.5
- 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} )
- x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.8:* )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
- local FILE
- ln -snf ../debian/extra/*.c . || die
-
- for FILE in ../debian/extra/*.c; do
- FILE=${FILE##*/}
- cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
- done
-
- for FILE in ../debian/extra/exifautotran; do
- cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
-EOF
- done
-
- for FILE in ../debian/extra/*.[0-9]*; do
- cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
-EOF
- done
-
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi && use java ; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_STATIC="$(usex static-libs)"
- -DWITH_JAVA="$(multilib_native_usex java)"
- -DWITH_MEM_SRCDST=ON
- )
-
- # Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
- if use arm; then
- mycmakeargs+=(
- -DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
- )
- fi
-
- # mostly for Prefix, ensure that we use our yasm if installed and
- # not pick up host-provided nasm
- if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
- mycmakeargs+=(
- -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
- )
- fi
-
- cmake_src_configure
-}
-
-multilib_src_install() {
- cmake_src_install
-
- if multilib_is_native_abi && use java ; then
- rm -rf "${ED}"/usr/classes || die
- java-pkg_dojar java/turbojpeg.jar
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-
- local -a DOCS=( README.md ChangeLog.md )
- einstalldocs
-
- newdoc "${WORKDIR}"/debian/changelog changelog.debian
-
- docinto html
- dodoc -r "${S}"/doc/html/.
-
- if use java; then
- docinto html/java
- dodoc -r "${S}"/java/doc/.
- newdoc "${S}"/java/README README.java
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2023-02-09 1:59 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-02-09 1:59 UTC (permalink / raw
To: gentoo-commits
commit: 4fd20b57bf481919243b099f0d3179ea38ce23ce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 01:47:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 01:47:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd20b57
media-libs/libjpeg-turbo: add 2.1.5.1, drop 2.1.5-r1
Closes: https://bugs.gentoo.org/893552
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libjpeg-turbo/Manifest | 2 +-
...-initialize-simd_support-before-every-use.patch | 437 ---------------------
....1.5-r1.ebuild => libjpeg-turbo-2.1.5.1.ebuild} | 4 -
3 files changed, 1 insertion(+), 442 deletions(-)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 152fb21c687d..04caa7c7ede8 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,4 @@
DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
-DIST libjpeg-turbo-2.1.5.tar.gz 2264471 BLAKE2B c65de2717ddc33447064412738b2db94a92693faad18f29f14c5c368d9eb4c617fe447a6f9428d9a101458dec0c65abc527e20632571eaa727d98cd5435241d4 SHA512 ceab6d1c3c46d2816b06402e3b912e950d887fc8a6fb32fa6876f4aaa663b4769d8f4c50e1b967addf6704d0760ca14ed723d55e0312d7ca69e7f2a91484c0dc
+DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch b/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch
deleted file mode 100644
index 8533427938d0..000000000000
--- a/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-https://bugs.gentoo.org/893552
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/4e028ecd63aaa13c8a14937f9f1e9a272ed4b543
-https://github.com/libjpeg-turbo/libjpeg-turbo/issues/649
-
-From 4e028ecd63aaa13c8a14937f9f1e9a272ed4b543 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Thu, 2 Feb 2023 08:55:37 -0600
-Subject: [PATCH] SIMD/x86: Initialize simd_support before every use
-
-As long as a libjpeg instance is only used by one thread at a time, a
-program is technically within its rights to call jpeg_start_*compress()
-in one thread and jpeg_(read|write)_*(), with the same libjpeg instance,
-in a second thread. However, because the various jsimd_can*() functions
-are called within the body of jpeg_start_*compress() and simd_support is
-now thread-local (due to f579cc11b33e5bfeb9931e37cc74b4a33c95d2e6), that
-led to a situation in which simd_support was initialized in the first
-thread but not the second. The uninitialized value of simd_support is
-0xFFFFFFFF, which the second thread interpreted to mean that it could
-use any instruction set, and when it attempted to use AVX2 instructions
-on a CPU that didn't support them, an illegal instruction error
-occurred.
-
-This issue was known to affect libvips.
-
-This commit modifies the i386 and x86-64 SIMD dispatchers so that the
-various jsimd_*() functions always call init_simd(), if simd_support is
-uninitialized, prior to dispatching based on the value of simd_support.
-Note that the other SIMD dispatchers don't need this, because only the
-x86 SIMD extensions currently support multiple instruction sets.
-
-This patch has been verified to be performance-neutral to within
-+/- 0.4% with 32-bit and 64-bit code running on a 2.8 GHz Intel Xeon
-W3530 and a 3.6 GHz Intel Xeon W2123.
-
-Fixes #649
---- a/simd/i386/jsimd.c
-+++ b/simd/i386/jsimd.c
-@@ -2,7 +2,7 @@
- * jsimd_i386.c
- *
- * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-- * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022, D. R. Commander.
-+ * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022-2023, D. R. Commander.
- * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois.
- *
- * Based on the x86 SIMD extension for IJG JPEG library,
-@@ -158,6 +158,9 @@ jsimd_rgb_ycc_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
- void (*sse2fct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
- void (*mmxfct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->in_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_extrgb_ycc_convert_avx2;
-@@ -217,6 +220,9 @@ jsimd_rgb_gray_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
- void (*sse2fct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
- void (*mmxfct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->in_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_extrgb_gray_convert_avx2;
-@@ -276,6 +282,9 @@ jsimd_ycc_rgb_convert(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
- void (*sse2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY, int);
- void (*mmxfct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY, int);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->out_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_ycc_extrgb_convert_avx2;
-@@ -379,6 +388,9 @@ GLOBAL(void)
- jsimd_h2v2_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY output_data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v2_downsample_avx2(cinfo->image_width, cinfo->max_v_samp_factor,
- compptr->v_samp_factor,
-@@ -399,6 +411,9 @@ GLOBAL(void)
- jsimd_h2v1_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY output_data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v1_downsample_avx2(cinfo->image_width, cinfo->max_v_samp_factor,
- compptr->v_samp_factor,
-@@ -461,6 +476,9 @@ GLOBAL(void)
- jsimd_h2v2_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v2_upsample_avx2(cinfo->max_v_samp_factor, cinfo->output_width,
- input_data, output_data_ptr);
-@@ -476,6 +494,9 @@ GLOBAL(void)
- jsimd_h2v1_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v1_upsample_avx2(cinfo->max_v_samp_factor, cinfo->output_width,
- input_data, output_data_ptr);
-@@ -537,6 +558,9 @@ GLOBAL(void)
- jsimd_h2v2_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v2_fancy_upsample_avx2(cinfo->max_v_samp_factor,
- compptr->downsampled_width, input_data,
-@@ -555,6 +579,9 @@ GLOBAL(void)
- jsimd_h2v1_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v1_fancy_upsample_avx2(cinfo->max_v_samp_factor,
- compptr->downsampled_width, input_data,
-@@ -623,6 +650,9 @@ jsimd_h2v2_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
- void (*sse2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
- void (*mmxfct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->out_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_h2v2_extrgb_merged_upsample_avx2;
-@@ -681,6 +711,9 @@ jsimd_h2v1_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
- void (*sse2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
- void (*mmxfct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->out_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_h2v1_extrgb_merged_upsample_avx2;
-@@ -785,6 +818,9 @@ GLOBAL(void)
- jsimd_convsamp(JSAMPARRAY sample_data, JDIMENSION start_col,
- DCTELEM *workspace)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_convsamp_avx2(sample_data, start_col, workspace);
- else if (simd_support & JSIMD_SSE2)
-@@ -797,6 +833,9 @@ GLOBAL(void)
- jsimd_convsamp_float(JSAMPARRAY sample_data, JDIMENSION start_col,
- FAST_FLOAT *workspace)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_SSE2)
- jsimd_convsamp_float_sse2(sample_data, start_col, workspace);
- else if (simd_support & JSIMD_SSE)
-@@ -867,6 +906,9 @@ jsimd_can_fdct_float(void)
- GLOBAL(void)
- jsimd_fdct_islow(DCTELEM *data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_fdct_islow_avx2(data);
- else if (simd_support & JSIMD_SSE2)
-@@ -878,6 +920,9 @@ jsimd_fdct_islow(DCTELEM *data)
- GLOBAL(void)
- jsimd_fdct_ifast(DCTELEM *data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if ((simd_support & JSIMD_SSE2) && IS_ALIGNED_SSE(jconst_fdct_islow_sse2))
- jsimd_fdct_ifast_sse2(data);
- else
-@@ -887,6 +932,9 @@ jsimd_fdct_ifast(DCTELEM *data)
- GLOBAL(void)
- jsimd_fdct_float(FAST_FLOAT *data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if ((simd_support & JSIMD_SSE) && IS_ALIGNED_SSE(jconst_fdct_float_sse))
- jsimd_fdct_float_sse(data);
- else if (simd_support & JSIMD_3DNOW)
-@@ -942,6 +990,9 @@ jsimd_can_quantize_float(void)
- GLOBAL(void)
- jsimd_quantize(JCOEFPTR coef_block, DCTELEM *divisors, DCTELEM *workspace)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_quantize_avx2(coef_block, divisors, workspace);
- else if (simd_support & JSIMD_SSE2)
-@@ -954,6 +1005,9 @@ GLOBAL(void)
- jsimd_quantize_float(JCOEFPTR coef_block, FAST_FLOAT *divisors,
- FAST_FLOAT *workspace)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_SSE2)
- jsimd_quantize_float_sse2(coef_block, divisors, workspace);
- else if (simd_support & JSIMD_SSE)
-@@ -1017,6 +1071,9 @@ jsimd_idct_2x2(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JCOEFPTR coef_block, JSAMPARRAY output_buf,
- JDIMENSION output_col)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if ((simd_support & JSIMD_SSE2) && IS_ALIGNED_SSE(jconst_idct_red_sse2))
- jsimd_idct_2x2_sse2(compptr->dct_table, coef_block, output_buf,
- output_col);
-@@ -1029,6 +1086,9 @@ jsimd_idct_4x4(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JCOEFPTR coef_block, JSAMPARRAY output_buf,
- JDIMENSION output_col)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if ((simd_support & JSIMD_SSE2) && IS_ALIGNED_SSE(jconst_idct_red_sse2))
- jsimd_idct_4x4_sse2(compptr->dct_table, coef_block, output_buf,
- output_col);
-@@ -1123,6 +1183,9 @@ jsimd_idct_islow(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JCOEFPTR coef_block, JSAMPARRAY output_buf,
- JDIMENSION output_col)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_idct_islow_avx2(compptr->dct_table, coef_block, output_buf,
- output_col);
-@@ -1139,6 +1202,9 @@ jsimd_idct_ifast(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JCOEFPTR coef_block, JSAMPARRAY output_buf,
- JDIMENSION output_col)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if ((simd_support & JSIMD_SSE2) && IS_ALIGNED_SSE(jconst_idct_ifast_sse2))
- jsimd_idct_ifast_sse2(compptr->dct_table, coef_block, output_buf,
- output_col);
-@@ -1152,6 +1218,9 @@ jsimd_idct_float(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JCOEFPTR coef_block, JSAMPARRAY output_buf,
- JDIMENSION output_col)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if ((simd_support & JSIMD_SSE2) && IS_ALIGNED_SSE(jconst_idct_float_sse2))
- jsimd_idct_float_sse2(compptr->dct_table, coef_block, output_buf,
- output_col);
---- a/simd/x86_64/jsimd.c
-+++ b/simd/x86_64/jsimd.c
-@@ -2,7 +2,7 @@
- * jsimd_x86_64.c
- *
- * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-- * Copyright (C) 2009-2011, 2014, 2016, 2018, 2022, D. R. Commander.
-+ * Copyright (C) 2009-2011, 2014, 2016, 2018, 2022-2023, D. R. Commander.
- * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois.
- *
- * Based on the x86 SIMD extension for IJG JPEG library,
-@@ -145,6 +145,9 @@ jsimd_rgb_ycc_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
- void (*avx2fct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
- void (*sse2fct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->in_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_extrgb_ycc_convert_avx2;
-@@ -194,6 +197,9 @@ jsimd_rgb_gray_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
- void (*avx2fct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
- void (*sse2fct) (JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->in_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_extrgb_gray_convert_avx2;
-@@ -243,6 +249,9 @@ jsimd_ycc_rgb_convert(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
- void (*avx2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY, int);
- void (*sse2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY, int);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->out_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_ycc_extrgb_convert_avx2;
-@@ -333,6 +342,9 @@ GLOBAL(void)
- jsimd_h2v2_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY output_data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v2_downsample_avx2(cinfo->image_width, cinfo->max_v_samp_factor,
- compptr->v_samp_factor,
-@@ -349,6 +361,9 @@ GLOBAL(void)
- jsimd_h2v1_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY output_data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v1_downsample_avx2(cinfo->image_width, cinfo->max_v_samp_factor,
- compptr->v_samp_factor,
-@@ -403,6 +418,9 @@ GLOBAL(void)
- jsimd_h2v2_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v2_upsample_avx2(cinfo->max_v_samp_factor, cinfo->output_width,
- input_data, output_data_ptr);
-@@ -415,6 +433,9 @@ GLOBAL(void)
- jsimd_h2v1_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v1_upsample_avx2(cinfo->max_v_samp_factor, cinfo->output_width,
- input_data, output_data_ptr);
-@@ -469,6 +490,9 @@ GLOBAL(void)
- jsimd_h2v2_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v2_fancy_upsample_avx2(cinfo->max_v_samp_factor,
- compptr->downsampled_width, input_data,
-@@ -483,6 +507,9 @@ GLOBAL(void)
- jsimd_h2v1_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_h2v1_fancy_upsample_avx2(cinfo->max_v_samp_factor,
- compptr->downsampled_width, input_data,
-@@ -542,6 +569,9 @@ jsimd_h2v2_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
- void (*avx2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
- void (*sse2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->out_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_h2v2_extrgb_merged_upsample_avx2;
-@@ -590,6 +620,9 @@ jsimd_h2v1_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
- void (*avx2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
- void (*sse2fct) (JDIMENSION, JSAMPIMAGE, JDIMENSION, JSAMPARRAY);
-
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- switch (cinfo->out_color_space) {
- case JCS_EXT_RGB:
- avx2fct = jsimd_h2v1_extrgb_merged_upsample_avx2;
-@@ -679,6 +712,9 @@ GLOBAL(void)
- jsimd_convsamp(JSAMPARRAY sample_data, JDIMENSION start_col,
- DCTELEM *workspace)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_convsamp_avx2(sample_data, start_col, workspace);
- else
-@@ -748,6 +784,9 @@ jsimd_can_fdct_float(void)
- GLOBAL(void)
- jsimd_fdct_islow(DCTELEM *data)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_fdct_islow_avx2(data);
- else
-@@ -809,6 +848,9 @@ jsimd_can_quantize_float(void)
- GLOBAL(void)
- jsimd_quantize(JCOEFPTR coef_block, DCTELEM *divisors, DCTELEM *workspace)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_quantize_avx2(coef_block, divisors, workspace);
- else
-@@ -963,6 +1005,9 @@ jsimd_idct_islow(j_decompress_ptr cinfo, jpeg_component_info *compptr,
- JCOEFPTR coef_block, JSAMPARRAY output_buf,
- JDIMENSION output_col)
- {
-+ if (simd_support == ~0U)
-+ init_simd();
-+
- if (simd_support & JSIMD_AVX2)
- jsimd_idct_islow_avx2(compptr->dct_table, coef_block, output_buf,
- output_col);
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.5-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.5.1.ebuild
similarity index 97%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.1.5-r1.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.1.5.1.ebuild
index e38d1e2aa16e..713c9e844e83 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.5-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.5.1.ebuild
@@ -41,10 +41,6 @@ BDEPEND="
x64-cygwin? ( ${ASM_DEPEND} )
"
-PATCHES=(
- "${FILESDIR}/2.1.5-initialize-simd_support-before-every-use.patch"
-)
-
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2023-07-07 2:10 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-07 2:10 UTC (permalink / raw
To: gentoo-commits
commit: f1262eb805ad6edd39cdff9fa0a84c9874c342e5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 7 02:10:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 7 02:10:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1262eb8
media-libs/libjpeg-turbo: keyword 3.0.0 (w/ fixed tests)
No revbump for test fix as it's purely for tests (no runtime fixes).
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libjpeg-turbo-3.0.0-tests.patch | 97 ++++++++++++++++++++++
.../libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild | 10 ++-
2 files changed, 104 insertions(+), 3 deletions(-)
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch
new file mode 100644
index 000000000000..303223fdd6b3
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch
@@ -0,0 +1,97 @@
+https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705
+https://github.com/libjpeg-turbo/libjpeg-turbo/commit/035ea386d1b6a99a8a1e2ab57cc1fc903569136c
+
+From 035ea386d1b6a99a8a1e2ab57cc1fc903569136c Mon Sep 17 00:00:00 2001
+From: DRC <information@libjpeg-turbo.org>
+Date: Thu, 6 Jul 2023 12:04:22 -0400
+Subject: [PATCH] Build: Fix regression test concurrency issues
+
+- The example-*bit-*-decompress test must run after the
+ example-*bit-*-compress test, since the latter generates
+ testout*-example.jpg.
+
+- Add -static to the filenames of all output files generated by the
+ "static" regression tests, to avoid conflicts with the "shared"
+ regression tests.
+
+- Add the PID to the filenames of all files generated by the tjunittest
+ packed-pixel image I/O tests.
+
+- Check the return value of MD5File() in tjunittest to avoid a segfault
+ if the file doesn't exist. (Prior to the fix described above, that
+ could occur if two instances of tjunittest ran concurrently from the
+ same directory with the same -bmp and -precision arguments.)
+
+Fixes #705
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1004,7 +1004,7 @@ foreach(libtype ${TEST_LIBTYPES})
+
+ if(sample_bits EQUAL 12)
+ set(tjbench tjbench12)
+- set(testout testout12)
++ set(testout testout12${suffix})
+
+ set(MD5_PPM_GRAY_TILE 2f799249148b1a9d0e61fa4408f6c397)
+ set(MD5_PPM_420_8x8_TILE b25684e1af37be504ee3fd137757353f)
+@@ -1024,7 +1024,7 @@ foreach(libtype ${TEST_LIBTYPES})
+ set(MD5_PPM_444_TILE 2f571a032e4dbc8ef40f75219d336b0b)
+ else()
+ set(tjbench tjbench)
+- set(testout testout)
++ set(testout testout${suffix})
+
+ set(MD5_PPM_GRAY_TILE 2c3b567086e6ca0c5e6d34ad8d6f6fe8)
+ set(MD5_PPM_420_8x8_TILE efca1bdf0226df01777137778cf986ec)
+@@ -1160,7 +1160,7 @@ foreach(libtype ${TEST_LIBTYPES})
+ set(cjpeg cjpeg12)
+ set(djpeg djpeg12)
+ set(jpegtran jpegtran12)
+- set(testout testout12)
++ set(testout testout12${suffix})
+
+ set(TESTORIG testorig12.jpg)
+ set(MD5_JPEG_RGB_ISLOW 9d7369207c520d37f2c1cbfcb82b2964)
+@@ -1222,7 +1222,7 @@ foreach(libtype ${TEST_LIBTYPES})
+ set(cjpeg cjpeg)
+ set(djpeg djpeg)
+ set(jpegtran jpegtran)
+- set(testout testout)
++ set(testout testout${suffix})
+
+ set(TESTORIG testorig.jpg)
+ set(MD5_JPEG_RGB_ISLOW 1d44a406f61da743b5fd31c0a9abdca3)
+@@ -1632,6 +1632,8 @@ foreach(libtype ${TEST_LIBTYPES})
+ add_test(example-${sample_bits}bit-${libtype}-decompress
+ ${CMAKE_CROSSCOMPILING_EMULATOR} example${suffix} decompress
+ ${EXAMPLE_12BIT_ARG} ${testout}-example.jpg ${testout}-example.ppm)
++ set_tests_properties(example-${sample_bits}bit-${libtype}-decompress
++ PROPERTIES DEPENDS example-${sample_bits}bit-${libtype}-compress)
+ add_test(example-${sample_bits}bit-${libtype}-decompress-cmp
+ ${CMAKE_CROSSCOMPILING_EMULATOR} ${MD5CMP} ${MD5_PPM_EXAMPLE_DECOMPRESS}
+ ${testout}-example.ppm)
+--- a/tjunittest.c
++++ b/tjunittest.c
+@@ -977,8 +977,8 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf,
+ THROW("Could not allocate memory");
+ initBitmap(buf, width, pitch, height, pf, bottomUp);
+
+- SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s.%s", precision, pixFormatStr[pf],
+- align, bottomUp ? "bu" : "td", ext);
++ SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s_%d.%s", precision, pixFormatStr[pf],
++ align, bottomUp ? "bu" : "td", getpid(), ext);
+ if (precision == 8) {
+ TRY_TJ(handle, tj3SaveImage8(handle, filename, (unsigned char *)buf, width,
+ pitch, height, pf));
+@@ -990,6 +990,10 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf,
+ width, pitch, height, pf));
+ }
+ md5sum = MD5File(filename, md5buf);
++ if (!md5sum) {
++ printf("\n Could not determine MD5 sum of %s\n", filename);
++ retval = -1; goto bailout;
++ }
+ if (strcasecmp(md5sum, md5ref))
+ THROW_MD5(filename, md5sum, md5ref);
+
+
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild
index 73e3b4200ffa..c8b5b6c08fce 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild
@@ -15,9 +15,9 @@ SRC_URI="
LICENSE="BSD IJG ZLIB"
SLOT="0/0.2"
# Unkeyworded for test failures: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705
-#if [[ $(ver_cut 3) -lt 90 ]] ; then
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
-#fi
+if [[ $(ver_cut 3) -lt 90 ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+fi
IUSE="cpu_flags_arm_neon java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -43,6 +43,10 @@ BDEPEND="
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+PATCHES=(
+ "${FILESDIR}"/${P}-tests.patch
+)
+
src_prepare() {
local FILE
ln -snf ../debian/extra/*.c . || die
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/
@ 2024-10-04 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 17:37 UTC (permalink / raw
To: gentoo-commits
commit: bbc113ccb3f235f2e55b2a77a61021157ee2710f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 12:02:52 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 17:36:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc113cc
media-libs/libjpeg-turbo: drop 3.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/libjpeg-turbo/Manifest | 1 -
.../files/libjpeg-turbo-3.0.0-tests.patch | 97 ---------------
.../libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild | 132 ---------------------
3 files changed, 230 deletions(-)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index d17c810ba46b..f99eebaf36b3 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,3 @@
DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6
-DIST libjpeg-turbo-3.0.0.tar.gz 2799663 BLAKE2B 9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285 SHA512 2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4
DIST libjpeg-turbo-3.0.3.tar.gz 2832827 BLAKE2B 9d141dadd0dce970bf857b51352c57a8e15180438abd7d6d66f9dfd24e23889add8c6c89120b84026e40ab61611516b0567984bd1db37e9c45b41917cf32e9a6 SHA512 7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch
deleted file mode 100644
index 303223fdd6b3..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/035ea386d1b6a99a8a1e2ab57cc1fc903569136c
-
-From 035ea386d1b6a99a8a1e2ab57cc1fc903569136c Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Thu, 6 Jul 2023 12:04:22 -0400
-Subject: [PATCH] Build: Fix regression test concurrency issues
-
-- The example-*bit-*-decompress test must run after the
- example-*bit-*-compress test, since the latter generates
- testout*-example.jpg.
-
-- Add -static to the filenames of all output files generated by the
- "static" regression tests, to avoid conflicts with the "shared"
- regression tests.
-
-- Add the PID to the filenames of all files generated by the tjunittest
- packed-pixel image I/O tests.
-
-- Check the return value of MD5File() in tjunittest to avoid a segfault
- if the file doesn't exist. (Prior to the fix described above, that
- could occur if two instances of tjunittest ran concurrently from the
- same directory with the same -bmp and -precision arguments.)
-
-Fixes #705
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1004,7 +1004,7 @@ foreach(libtype ${TEST_LIBTYPES})
-
- if(sample_bits EQUAL 12)
- set(tjbench tjbench12)
-- set(testout testout12)
-+ set(testout testout12${suffix})
-
- set(MD5_PPM_GRAY_TILE 2f799249148b1a9d0e61fa4408f6c397)
- set(MD5_PPM_420_8x8_TILE b25684e1af37be504ee3fd137757353f)
-@@ -1024,7 +1024,7 @@ foreach(libtype ${TEST_LIBTYPES})
- set(MD5_PPM_444_TILE 2f571a032e4dbc8ef40f75219d336b0b)
- else()
- set(tjbench tjbench)
-- set(testout testout)
-+ set(testout testout${suffix})
-
- set(MD5_PPM_GRAY_TILE 2c3b567086e6ca0c5e6d34ad8d6f6fe8)
- set(MD5_PPM_420_8x8_TILE efca1bdf0226df01777137778cf986ec)
-@@ -1160,7 +1160,7 @@ foreach(libtype ${TEST_LIBTYPES})
- set(cjpeg cjpeg12)
- set(djpeg djpeg12)
- set(jpegtran jpegtran12)
-- set(testout testout12)
-+ set(testout testout12${suffix})
-
- set(TESTORIG testorig12.jpg)
- set(MD5_JPEG_RGB_ISLOW 9d7369207c520d37f2c1cbfcb82b2964)
-@@ -1222,7 +1222,7 @@ foreach(libtype ${TEST_LIBTYPES})
- set(cjpeg cjpeg)
- set(djpeg djpeg)
- set(jpegtran jpegtran)
-- set(testout testout)
-+ set(testout testout${suffix})
-
- set(TESTORIG testorig.jpg)
- set(MD5_JPEG_RGB_ISLOW 1d44a406f61da743b5fd31c0a9abdca3)
-@@ -1632,6 +1632,8 @@ foreach(libtype ${TEST_LIBTYPES})
- add_test(example-${sample_bits}bit-${libtype}-decompress
- ${CMAKE_CROSSCOMPILING_EMULATOR} example${suffix} decompress
- ${EXAMPLE_12BIT_ARG} ${testout}-example.jpg ${testout}-example.ppm)
-+ set_tests_properties(example-${sample_bits}bit-${libtype}-decompress
-+ PROPERTIES DEPENDS example-${sample_bits}bit-${libtype}-compress)
- add_test(example-${sample_bits}bit-${libtype}-decompress-cmp
- ${CMAKE_CROSSCOMPILING_EMULATOR} ${MD5CMP} ${MD5_PPM_EXAMPLE_DECOMPRESS}
- ${testout}-example.ppm)
---- a/tjunittest.c
-+++ b/tjunittest.c
-@@ -977,8 +977,8 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf,
- THROW("Could not allocate memory");
- initBitmap(buf, width, pitch, height, pf, bottomUp);
-
-- SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s.%s", precision, pixFormatStr[pf],
-- align, bottomUp ? "bu" : "td", ext);
-+ SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s_%d.%s", precision, pixFormatStr[pf],
-+ align, bottomUp ? "bu" : "td", getpid(), ext);
- if (precision == 8) {
- TRY_TJ(handle, tj3SaveImage8(handle, filename, (unsigned char *)buf, width,
- pitch, height, pf));
-@@ -990,6 +990,10 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf,
- width, pitch, height, pf));
- }
- md5sum = MD5File(filename, md5buf);
-+ if (!md5sum) {
-+ printf("\n Could not determine MD5 sum of %s\n", filename);
-+ retval = -1; goto bailout;
-+ }
- if (strcasecmp(md5sum, md5ref))
- THROW_MD5(filename, md5sum, md5ref);
-
-
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild
deleted file mode 100644
index c1b081629167..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="
- https://downloads.sourceforge.net/${PN}/${P}.tar.gz
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ $(ver_cut 3) -lt 90 ]] ; then
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="
- !media-libs/jpeg:0
- !media-libs/jpeg:62
-"
-DEPEND="
- ${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
- amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} )
- amd64-linux? ( ${ASM_DEPEND} )
- x86-linux? ( ${ASM_DEPEND} )
- x64-macos? ( ${ASM_DEPEND} )
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-PATCHES=(
- "${FILESDIR}"/${P}-tests.patch
-)
-
-src_prepare() {
- local FILE
- ln -snf ../debian/extra/*.c . || die
-
- for FILE in ../debian/extra/*.c; do
- FILE=${FILE##*/}
- cat >> CMakeLists.txt <<-EOF || die
- add_executable(${FILE%.c} ${FILE})
- install(TARGETS ${FILE%.c})
- EOF
- done
-
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi && use java ; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_STATIC="$(usex static-libs)"
- -DWITH_JAVA="$(multilib_native_usex java)"
- )
-
- # Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #792810
- if use arm || use arm64; then
- mycmakeargs+=(
- -DWITH_SIMD=$(usex cpu_flags_arm_neon)
- -DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
- )
- fi
-
- # We should tell the test suite which floating-point flavor we are
- # expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
- # For now, mark loong as fp-contract.
- if use loong; then
- mycmakeargs+=(
- -DFLOATTEST=fp-contract
- )
- fi
-
- # Mostly for Prefix, ensure that we use our yasm if installed and
- # not pick up host-provided nasm
- if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
- mycmakeargs+=(
- -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
- )
- fi
-
- cmake_src_configure
-}
-
-multilib_src_install() {
- cmake_src_install
-
- if multilib_is_native_abi && use java ; then
- rm -rf "${ED}"/usr/classes || die
- java-pkg_dojar java/turbojpeg.jar
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-
- local -a DOCS=( README.md ChangeLog.md )
- einstalldocs
-
- newdoc "${WORKDIR}"/debian/changelog changelog.debian
- dobin "${WORKDIR}"/debian/extra/exifautotran
- doman "${WORKDIR}"/debian/extra/*.[0-9]*
-
- docinto html
- dodoc -r "${S}"/doc/html/.
-
- if use java; then
- docinto html/java
- dodoc -r "${S}"/java/doc/.
- newdoc "${S}"/java/README README.java
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-04 17:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-07 2:10 [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-04 17:37 Andreas Sturmlechner
2023-02-09 1:59 Sam James
2021-10-17 20:39 John Helmert III
2018-08-01 7:57 Lars Wendler
2018-06-21 13:45 Lars Wendler
2016-06-14 10:06 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox