diff options
Diffstat (limited to 'media-libs/libjpeg-turbo')
| -rw-r--r-- | media-libs/libjpeg-turbo/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild (renamed from media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild) | 36 |
2 files changed, 24 insertions, 15 deletions
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index e7f82a1c5fcc..d463afac2856 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -3,10 +3,9 @@ AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5 AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9 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.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866 -EBUILD libjpeg-turbo-2.0.6.ebuild 3051 BLAKE2B b85cb9cb4ad088928d5c8e81535c58e47948df44a0c3bcc887303fbe68e053aa2cf5c7a66c1812a4fbb60c6067f98c6b233203c6d7f5ec00ca5df53f708c6d19 SHA512 f072c13c9ad72b532b09ee3ec415a189491bb9eb0dee6f50f2b0a601cd24c952c62f8a947ec3af4e2f669c6a7353dbc8d9a5d6814e9aed45e14088e64e7e6df7 EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3114 BLAKE2B 5da60b00e56b11581e85273e73252842d52833eab960ad6e9240c64d5311908fcaea885dd014f05e48ac7cee525a23b4e3932f5becc26079194c535253991788 SHA512 9766f9cd99a23bdc83e1cc27a04a8eb704a79ac1454dcf67e2ce107469071ab581b275b1d70de18376c95f99e03cb90a189ac1ac50068e1b61a5bdc32666de0c +EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3232 BLAKE2B 789ebf33027f218a795226880ccc4d0c64055a1c8ec6fa0f0556b26affcae2b3db4469090acdf2462cb14f908562af77d3850b001aa6099cc79dcb9cc899f06a SHA512 ff846c4d7a91de095a2af7ef38d66041aaae616776c0b0e46f2a33a924c711424717fbd67ad91be99a4b45452d19a03acdc226d00f621774aba0f116265a2c16 MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild index 321276ccaa99..78714e29ba7e 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild @@ -14,9 +14,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.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" + 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="java static-libs" +IUSE="cpu_flags_arm_neon java static-libs" ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" @@ -34,10 +34,10 @@ BDEPEND=">=dev-util/cmake-3.16.5 x64-cygwin? ( ${ASM_DEPEND} )" DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.5 )" + java? ( >=virtual/jdk-1.8:* )" RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" + java? ( >=virtual/jre-1.8:* )" MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) @@ -65,8 +65,6 @@ install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_ EOF done - #default - cmake_src_prepare java-pkg-opt-2_src_prepare } @@ -84,13 +82,20 @@ multilib_src_configure() { -DWITH_MEM_SRCDST=ON ) - # bug #420239, bug #723800 - [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF ) + # 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 - has_version dev-lang/yasm && ! has_version dev-lang/nasm && \ - mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) ) + 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 } @@ -107,12 +112,17 @@ multilib_src_install() { multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die - docinto html - dodoc -r "${S}"/doc/html/* + 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/* + dodoc -r "${S}"/java/doc/. newdoc "${S}"/java/README README.java fi } |