1 |
commit: 3090e82542e7c97c9555f9968bc02664d99774a0 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 17:38:42 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 17:39:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3090e825 |
7 |
|
8 |
media-libs/libjpeg-turbo: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/727010 |
11 |
Bug: https://bugs.gentoo.org/727910 |
12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
media-libs/libjpeg-turbo/Manifest | 1 - |
16 |
.../libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild | 100 --------------------- |
17 |
2 files changed, 101 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest |
20 |
index b8a65152bed..7b869b81a33 100644 |
21 |
--- a/media-libs/libjpeg-turbo/Manifest |
22 |
+++ b/media-libs/libjpeg-turbo/Manifest |
23 |
@@ -1,5 +1,4 @@ |
24 |
DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202 |
25 |
-DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 |
26 |
DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 |
27 |
DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 |
28 |
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 |
29 |
|
30 |
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild |
31 |
deleted file mode 100644 |
32 |
index 3ae6b4ab219..00000000000 |
33 |
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,100 +0,0 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-CMAKE_ECLASS=cmake |
42 |
-inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs |
43 |
- |
44 |
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" |
45 |
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/" |
46 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz |
47 |
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz" |
48 |
- |
49 |
-LICENSE="BSD IJG ZLIB" |
50 |
-SLOT="0" |
51 |
-[[ "$(ver_cut 3)" -ge 90 ]] || \ |
52 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
53 |
-IUSE="java static-libs" |
54 |
- |
55 |
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" |
56 |
-COMMON_DEPEND="!media-libs/jpeg:0 |
57 |
- !media-libs/jpeg:62" |
58 |
-RDEPEND="${COMMON_DEPEND} |
59 |
- java? ( >=virtual/jre-1.5 )" |
60 |
-DEPEND="${COMMON_DEPEND} |
61 |
- amd64? ( ${ASM_DEPEND} ) |
62 |
- x86? ( ${ASM_DEPEND} ) |
63 |
- amd64-fbsd? ( ${ASM_DEPEND} ) |
64 |
- x86-fbsd? ( ${ASM_DEPEND} ) |
65 |
- amd64-linux? ( ${ASM_DEPEND} ) |
66 |
- x86-linux? ( ${ASM_DEPEND} ) |
67 |
- x64-macos? ( ${ASM_DEPEND} ) |
68 |
- x64-cygwin? ( ${ASM_DEPEND} ) |
69 |
- java? ( >=virtual/jdk-1.5 )" |
70 |
- |
71 |
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) |
72 |
- |
73 |
-src_prepare() { |
74 |
- default |
75 |
- |
76 |
- cmake_src_prepare |
77 |
- java-pkg-opt-2_src_prepare |
78 |
-} |
79 |
- |
80 |
-multilib_src_configure() { |
81 |
- if multilib_is_native_abi && use java ; then |
82 |
- export JAVACFLAGS="$(java-pkg_javac-args)" |
83 |
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" |
84 |
- fi |
85 |
- |
86 |
- local mycmakeargs=( |
87 |
- -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" |
88 |
- -DENABLE_STATIC="$(usex static-libs)" |
89 |
- -DWITH_JAVA="$(multilib_native_usex java)" |
90 |
- -DWITH_MEM_SRCDST=ON |
91 |
- ) |
92 |
- [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239 |
93 |
- cmake_src_configure |
94 |
-} |
95 |
- |
96 |
-multilib_src_compile() { |
97 |
- cmake_src_compile |
98 |
- |
99 |
- if multilib_is_native_abi ; then |
100 |
- pushd "${WORKDIR}/debian/extra" &>/dev/null || die |
101 |
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" |
102 |
- popd &>/dev/null || die |
103 |
- fi |
104 |
-} |
105 |
- |
106 |
-multilib_src_install() { |
107 |
- cmake_src_install |
108 |
- |
109 |
- if multilib_is_native_abi ; then |
110 |
- pushd "${WORKDIR}/debian/extra" &>/dev/null || die |
111 |
- emake \ |
112 |
- DESTDIR="${D}" prefix="${EPREFIX}"/usr \ |
113 |
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \ |
114 |
- install |
115 |
- |
116 |
- popd || die |
117 |
- if use java ; then |
118 |
- rm -rf "${ED}"/usr/classes || die |
119 |
- java-pkg_dojar java/turbojpeg.jar |
120 |
- fi |
121 |
- fi |
122 |
-} |
123 |
- |
124 |
-multilib_src_install_all() { |
125 |
- find "${ED}" -type f -name '*.la' -delete || die |
126 |
- |
127 |
- docinto html |
128 |
- dodoc -r "${S}"/doc/html/* |
129 |
- newdoc "${WORKDIR}"/debian/changelog changelog.debian |
130 |
- if use java; then |
131 |
- docinto html/java |
132 |
- dodoc -r "${S}"/java/doc/* |
133 |
- newdoc "${S}"/java/README README.java |
134 |
- fi |
135 |
-} |