summaryrefslogtreecommitdiff
path: root/media-libs/libjpeg-turbo
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libjpeg-turbo')
-rw-r--r--media-libs/libjpeg-turbo/Manifest4
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild12
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild100
3 files changed, 109 insertions, 7 deletions
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 9bf11fd26437..2c935ce69d25 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -3,7 +3,9 @@ AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca889205
AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
+DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2977 BLAKE2B 1cf872b7308510e14eb9c55cf60287cf297f71275d0d0aababbae34c260d903ec9d6337b9e6b63bf18ca25458a9f5ad46fd773d82a99b70d26552f6fbdf0296d SHA512 fe0954fb131f32a783501e58c094329429c34580a649a911f01030ef1d99af0fe1fbbd1d5f2fadc2db34be6e16097d3ffa9d66184f0dcbecb3a3bbe5e71eb00e
-EBUILD libjpeg-turbo-2.0.3.ebuild 2642 BLAKE2B 75b6372e195cb6c5811b65e435a4abd7526006fe620fce09145d220bba14d16926b4f968d3591883f19d6995594a76dfde67eb37d10ad7bffec7cc056be71ec3 SHA512 4b363cdfb82f34db2d2c91612db559ce9c98163a9f8b634ce62395e6f31d9b33baf5245bf582aeae1810b86a89e438f4e138e229fae9949014ea8f246fbf1024
+EBUILD libjpeg-turbo-2.0.3.ebuild 2598 BLAKE2B f51b872454a841900fb8b5394d2af88d49ff10c1d7ef02eb7ddaab205ccf209001efa3381264023c96765ef54b7557d73d908bfe70c5a31689a854407738dd03 SHA512 fae957ade281da09a4deb6895de4a645c47e414e6e3f3dfcbdba5100dd7922c9ee188cb41cee27846cdd9a7685cffc77558ff31d8d60cb83ba3dc8a57e0d363d
+EBUILD libjpeg-turbo-2.0.4.ebuild 2608 BLAKE2B cdb6cba8a012b52a2e3b7b1e32d3d46013515351185e1128457c5e6ddc3efa101260348d3dd336880ff5766bfee41118256ade7f9b309480870a6110fc0d72b5 SHA512 8e7f5147002f5104b49ad8a4526fb3bc78e2ea80b9690b7c8a000ceed0aeade277241641d41edee97fad5e5c3b0b726bd8fb78236bdd1624406f15aa66545412
MISC metadata.xml 425 BLAKE2B 675a25f38cc91c2d60d54acf1b07e58c682415b14f2a4fc61f363b743b8d00c8c7f0f8c763f8c6d3199afd2980a834b6a2acf587f6a6f94a6afeeae0d1d3ac25 SHA512 36f6245075da1d9925e7816a0014244e18c4cf5e2e634e7dedeb1aeba6f944449017a98bfa37f0724e1a04d30173533c81f770eca7a332191df7af8afab80959
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 57630393fa94..e15a580435fd 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -80,7 +80,7 @@ multilib_src_install() {
popd || die
if use java ; then
- rm -rf "${ED%/}"/usr/classes || die
+ rm -rf "${ED}"/usr/classes || die
java-pkg_dojar java/turbojpeg.jar
fi
fi
@@ -89,12 +89,12 @@ multilib_src_install() {
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
- insinto /usr/share/doc/${PF}/html
- doins -r "${S}"/doc/html/*
+ docinto html
+ dodoc -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/*
+ 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.0.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
new file mode 100644
index 000000000000..0a16a62f0f58
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 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 libtool toolchain-funcs
+
+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"
+SLOT="0"
+[[ "$(ver_cut 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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} )
+ x64-cygwin? ( ${ASM_DEPEND} )
+ java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+ default
+
+ 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
+ )
+ [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ cmake_src_compile
+
+ if multilib_is_native_abi ; then
+ pushd "${WORKDIR}/debian/extra" &>/dev/null || die
+ emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+ popd &>/dev/null || die
+ fi
+}
+
+multilib_src_install() {
+ cmake_src_install
+
+ if multilib_is_native_abi ; then
+ pushd "${WORKDIR}/debian/extra" &>/dev/null || die
+ emake \
+ DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+ INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+ install
+
+ popd || die
+ if use java ; then
+ rm -rf "${ED}"/usr/classes || die
+ 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
+}