From 146120220e830d8902860e18cdb15b23c5b575b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Jul 2023 22:30:49 +0100 Subject: gentoo auto-resync : 11:07:2023 - 22:30:49 --- media-libs/openjpeg/Manifest | 2 +- media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild | 101 -------------------------- media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild | 103 +++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 102 deletions(-) delete mode 100644 media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild create mode 100644 media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild (limited to 'media-libs/openjpeg') diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index b839ab632fc1..2ef4c0c443f9 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -1,5 +1,5 @@ AUX openjpeg-2.5.0-gnuinstalldirs.patch 11415 BLAKE2B 9916b82721b9e75dd175d8cf6b85aa9f3b0bbba4d72b5d9c21db853ccf7a40d970db051eff159040fa7b4eb478a5106879044b103e0fb30078704f51c4cb3eef SHA512 d559e1e101b88ea9f391d984e7fe2a28ed5572692f3fbf8c7e79e17105ce83d17ca2a378688c595a8da4f60925de5bf57569424de51a627e629d39479e04c682 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306 SHA512 08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624 SHA512 4444225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae -EBUILD openjpeg-2.5.0-r4.ebuild 3002 BLAKE2B 1fc7abfae69c21c4f9dc7634c1a29d8a6f861d6b131afd014eabf7b33f5c4b1b384c2bb8aa8de1d3551666278cd03dc5c70439a9a62de4342cbb96f39d518cdb SHA512 71122894229a069f85345bbe66d281751087be8abf4fdf535e5ec0c6f2681b3737cc69f9a5704a2302424334333477c87cc43d6042e355321b152e453316d27f +EBUILD openjpeg-2.5.0-r5.ebuild 3021 BLAKE2B ffaf9295fe43545c114b550a78250a8e5f52b96e2b6a258fbf5f01c2015791daef6a21fac59418528749a782ebd471046ec6108831a71532da1c9ae6480ba312 SHA512 453d8de65142576caa49867b68f6b331f68b1c14195b7823a255ef40832724204673a95429c7ea00253b417c8bf05218b6496f65aeb33f2d575fce9ad1abb7f4 MISC metadata.xml 551 BLAKE2B 39647e4fca09d2f613785e350aed813dedb0fb109d718a2ab9b08f7d30d55eaeab4abcf3c58b1434ad239548c966aefac7ebcc3a13d50220ad4a2e59054a75d6 SHA512 a2d0283f5b3d97b6d942d865fa3433f007127dbc63e9479bdf06b8e33c8885dfe6c642cb1b1a8595164fa7fe9961ed44a8c8e70086d7b4dea2f75c1816bbf793 diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild b/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild deleted file mode 100644 index 8c7cbf99b42f..000000000000 --- a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -# Make sure that test data are not newer than release; -# otherwise we will see "Found-But-No-Test" test failures! -# -# To update: Go to https://github.com/uclouvain/openjpeg-data and grab the hash -# of the latest possible commit whose commit date is older than the release -# date. -MY_TESTDATA_COMMIT="1f3d093030f9a0b43353ec6b48500f65786ff57a" - -DESCRIPTION="Open-source JPEG 2000 library" -HOMEPAGE="https://www.openjpeg.org" -SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20210926.tar.gz )" - -LICENSE="BSD-2" -SLOT="2/7" # based on SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/tiff:= - sys-libs/zlib:= -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.5.0-gnuinstalldirs.patch" # bug #667150 -) - -src_prepare() { - if use test; then - mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || - die "Failed to rename test data" - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DBUILD_TESTING="$(multilib_native_usex test)" - -DBUILD_DOC=$(multilib_native_usex doc ON OFF) - -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) - -DBUILD_STATIC_LIBS=OFF - ) - - # Cheat a little bit and force disabling fixed point magic - # The test suite is extremely fragile to small changes - # bug #715130, bug #715422 - # https://github.com/uclouvain/openjpeg/issues/1017 - if multilib_is_native_abi && use test ; then - append-cflags "-ffp-contract=off" - fi - - cmake_src_configure -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - elog "Cannot run tests for non-multilib abi." - return 0 - fi - - pushd "${BUILD_DIR}" > /dev/null || die - [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - - elog "Note: Upstream maintains a list of known test failures." - elog "We collect all the known failures and skip them." - elog - - local toskip=( "${S}"/tools/travis-ci/knownfailures-all.txt ) - if use amd64 ; then - toskip+=( "${S}"/tools/travis-ci/knownfailures-*x86_64*.txt ) - elif use x86 || use arm || use arm64; then - toskip+=( "${S}"/tools/travis-ci/knownfailures-*i386*.txt ) - fi - - local exp=$(sort "${toskip[@]}" | uniq | tr '\n' '|'; assert) - popd > /dev/null || die - - local myctestargs=() - if [[ -n ${TEST_VERBOSE} ]]; then - myctestargs+=( --extra-verbose --output-on-failure ) - fi - myctestargs+=( -E "(${exp::-1})" ) - - cmake_src_test -} diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild b/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild new file mode 100644 index 000000000000..859d250dd7f8 --- /dev/null +++ b/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +# Make sure that test data are not newer than release; +# otherwise we will see "Found-But-No-Test" test failures! +# +# To update: Go to https://github.com/uclouvain/openjpeg-data and grab the hash +# of the latest possible commit whose commit date is older than the release +# date. +MY_TESTDATA_COMMIT="1f3d093030f9a0b43353ec6b48500f65786ff57a" + +DESCRIPTION="Open-source JPEG 2000 library" +HOMEPAGE="https://www.openjpeg.org" +SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20210926.tar.gz )" + +LICENSE="BSD-2" +SLOT="2/7" # based on SONAME +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/lcms:2 + media-libs/libpng:0= + media-libs/tiff:= + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" + +DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) + +PATCHES=( + "${FILESDIR}/${PN}-2.5.0-gnuinstalldirs.patch" # bug #667150 +) + +src_prepare() { + if use test; then + mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || + die "Failed to rename test data" + fi + + cmake_src_prepare +} + +multilib_src_configure() { + append-lfs-flags + + local mycmakeargs=( + -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 + -DBUILD_TESTING="$(multilib_native_usex test)" + -DBUILD_DOC=$(multilib_native_usex doc ON OFF) + -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) + -DBUILD_STATIC_LIBS=OFF + ) + + # Cheat a little bit and force disabling fixed point magic + # The test suite is extremely fragile to small changes + # bug #715130, bug #715422 + # https://github.com/uclouvain/openjpeg/issues/1017 + if multilib_is_native_abi && use test ; then + append-cflags "-ffp-contract=off" + fi + + cmake_src_configure +} + +multilib_src_test() { + if ! multilib_is_native_abi ; then + elog "Cannot run tests for non-multilib abi." + return 0 + fi + + pushd "${BUILD_DIR}" > /dev/null || die + [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" + + elog "Note: Upstream maintains a list of known test failures." + elog "We collect all the known failures and skip them." + elog + + local toskip=( "${S}"/tools/travis-ci/knownfailures-all.txt ) + if use amd64 ; then + toskip+=( "${S}"/tools/travis-ci/knownfailures-*x86_64*.txt ) + elif use x86 || use arm || use arm64; then + toskip+=( "${S}"/tools/travis-ci/knownfailures-*i386*.txt ) + fi + + local exp=$(sort "${toskip[@]}" | uniq | tr '\n' '|'; assert) + popd > /dev/null || die + + local myctestargs=() + if [[ -n ${TEST_VERBOSE} ]]; then + myctestargs+=( --extra-verbose --output-on-failure ) + fi + myctestargs+=( -E "(${exp::-1})" ) + + cmake_src_test +} -- cgit v1.2.3