subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/openjpeg\/"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-10-08 Thread Sam James

commit: b82b3023e8120afb56b24b97b83f46690c70056b
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  8 11:06:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  8 11:06:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82b3023

media-libs/openjpeg: Stabilize 2.5.2 hppa, #930395

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index c71da8a16783..cdd476b7fcc7 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-09-24 Thread Arthur Zamarin

commit: 253c18aa1c557d9ccad79bdb9ab5f4b02ea38511
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Sep 24 15:02:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Sep 24 15:02:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253c18aa

media-libs/openjpeg: Stabilize 2.5.2 sparc, #930395

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index 2f8124bdca40..c71da8a16783 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-09-23 Thread Arthur Zamarin

commit: 9b2eee80e10a54cfbe7d4e410323f8533055c835
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Sep 23 08:17:52 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Sep 23 08:17:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2eee80

media-libs/openjpeg: Stabilize 2.5.2 amd64, #930395

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index 1be0f578b192..2f8124bdca40 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-09-23 Thread Arthur Zamarin

commit: 18e66a9c9a08d9065ca7af686bf2c29e65787da0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Sep 23 07:13:02 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Sep 23 07:13:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e66a9c

media-libs/openjpeg: Stabilize 2.5.2 arm, #930395

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index cc4df37b216c..1be0f578b192 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-09-22 Thread Sam James

commit: 02a269f7d5463843be46ed98259d8862e8a33a5c
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 23 00:31:12 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 23 00:31:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a269f7

media-libs/openjpeg: Stabilize 2.5.2 ppc64, #930395

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index 65e0b670b719..8c9dde5d7de8 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-09-22 Thread Sam James

commit: 15cdb2105bf488c4f79da9b9e8e6e4d16c6a4bf6
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 23 00:31:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 23 00:31:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15cdb210

media-libs/openjpeg: Stabilize 2.5.2 ppc, #930395

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index 8c9dde5d7de8..9a35c2e3aa5f 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-03-13 Thread Sam James

commit: 41c4e8dc17835661912a76e9d221656673c2781e
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Thu Mar 14 04:41:12 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 14 04:58:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c4e8dc

media-libs/openjpeg: fix misspelled date

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/35739
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/Manifest  | 2 +-
 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 2ba8289613e5..b35ac21ae8ba 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,4 +1,4 @@
 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 
472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306
 SHA512 
08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
 DIST openjpeg-2.5.2.tar.gz 1871948 BLAKE2B 
4c23eecd603c620d3555fa02055104d292cdf4bbb88ab3d8d8a8f62e3c21b52d3c6d9211d8dd6f11d76fb1ca6f2333a7305ae07b5883a62eb7fc28ec9dfafc0f
 SHA512 
24c058b3e0710e689ba7fd6bce8a88353ce64e825b2e5bbf6b00ca3f2a2ec1e9c70a72e0252a5c89d10c537cf84d55af54bf2f16c58ca01db98c2018cf132e1a
 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 
34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624
 SHA512 
225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae
-DIST openjpeg-data_202130923.tar.gz 498600318 BLAKE2B 
cf595b9f8690ad0b9616f080c3bfdaf553802912cd41015f86766085c0bd021cead294372bd9925c2a569fabbd9a0f1684bcf6eb1b5ecdc14d64231a76401a3b
 SHA512 
3e1e3bb489eac6047671395fbf92bbfb2ad7c7c0206c1a233c215ba3d5b5263a6ce65d523f98fdaa4949e28eaa179716264f89eebf73b44c71373a9c86313cc1
+DIST openjpeg-data_20230923.tar.gz 498600318 BLAKE2B 
cf595b9f8690ad0b9616f080c3bfdaf553802912cd41015f86766085c0bd021cead294372bd9925c2a569fabbd9a0f1684bcf6eb1b5ecdc14d64231a76401a3b
 SHA512 
3e1e3bb489eac6047671395fbf92bbfb2ad7c7c0206c1a233c215ba3d5b5263a6ce65d523f98fdaa4949e28eaa179716264f89eebf73b44c71373a9c86313cc1

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index 417e98aa4f27..2e2d6ccc3eff 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -16,7 +16,7 @@ MY_TESTDATA_COMMIT="f9991d5fa9a4a08fc9c29bae6405d6c67cf2b8eb"
 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_202130923.tar.gz )"
+   test? ( 
https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz 
-> ${PN}-data_20230923.tar.gz )"
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-03-10 Thread Sam James

commit: 545201510bdbccd2bec266c14569e90b9c7deb42
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 10 14:46:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 10 14:47:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54520151

media-libs/openjpeg: drop stale CMake arg for pkgconfig files

They are now always installed (see 
https://github.com/uclouvain/openjpeg/pull/1507).

Closes: https://bugs.gentoo.org/926598
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
index 0e5579c13039..417e98aa4f27 100644
--- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -48,7 +48,6 @@ 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)

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2024-03-09 Thread Yixun Lan

commit: 82b7796fb25854b8fe6795796a0e4a580540d11a
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Sat Mar  2 06:57:14 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Mar  9 11:52:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b7796f

media-libs/openjpeg: add 2.5.2

Closes: https://github.com/gentoo/gentoo/pull/35595
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Signed-off-by: Yixun Lan  gentoo.org>

 media-libs/openjpeg/Manifest  |  2 +
 media-libs/openjpeg/openjpeg-2.5.2.ebuild | 99 +++
 2 files changed, 101 insertions(+)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 30b5bc36a99f..2ba8289613e5 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,2 +1,4 @@
 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 
472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306
 SHA512 
08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
+DIST openjpeg-2.5.2.tar.gz 1871948 BLAKE2B 
4c23eecd603c620d3555fa02055104d292cdf4bbb88ab3d8d8a8f62e3c21b52d3c6d9211d8dd6f11d76fb1ca6f2333a7305ae07b5883a62eb7fc28ec9dfafc0f
 SHA512 
24c058b3e0710e689ba7fd6bce8a88353ce64e825b2e5bbf6b00ca3f2a2ec1e9c70a72e0252a5c89d10c537cf84d55af54bf2f16c58ca01db98c2018cf132e1a
 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 
34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624
 SHA512 
225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae
+DIST openjpeg-data_202130923.tar.gz 498600318 BLAKE2B 
cf595b9f8690ad0b9616f080c3bfdaf553802912cd41015f86766085c0bd021cead294372bd9925c2a569fabbd9a0f1684bcf6eb1b5ecdc14d64231a76401a3b
 SHA512 
3e1e3bb489eac6047671395fbf92bbfb2ad7c7c0206c1a233c215ba3d5b5263a6ce65d523f98fdaa4949e28eaa179716264f89eebf73b44c71373a9c86313cc1

diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
new file mode 100644
index ..0e5579c13039
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 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="f9991d5fa9a4a08fc9c29bae6405d6c67cf2b8eb"
+
+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_202130923.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-text/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+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 av

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-23 Thread Arthur Zamarin

commit: da6c8dcbe5f5a6796e046b70b2fd41f09fccc6f6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 23 20:00:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 23 20:00:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6c8dcb

media-libs/openjpeg: Stabilize 2.5.0-r6 hppa, #920219

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index cdfcf7b8ea25..9df3862969bf 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-19 Thread Arthur Zamarin

commit: 6a7d081d7600770be45325285afb544b8cab64da
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 19 17:00:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 19 17:00:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7d081d

media-libs/openjpeg: Stabilize 2.5.0-r6 ppc, #920219

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index 5180d0b2a1f2..cdfcf7b8ea25 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-17 Thread Joonas Niilola

commit: 49350e54f1b88d40b95487e2a8c7ccc7978021cc
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Dec 18 07:10:08 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec 18 07:10:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49350e54

media-libs/openjpeg: Stabilize 2.5.0-r6 x86, #920219

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index 414aeabbad8c..5180d0b2a1f2 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-17 Thread Sam James

commit: 689f8359b191df02005af6271adc9acc0cceee3d
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 18 04:51:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 18 04:51:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689f8359

media-libs/openjpeg: Stabilize 2.5.0-r6 amd64, #920219

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index 808bc6ca2411..414aeabbad8c 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-17 Thread Sam James

commit: 3eb46138dfeb14195f0b64dfd1d41b0acfe525fb
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 18 00:11:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 18 00:11:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb46138

media-libs/openjpeg: Stabilize 2.5.0-r6 arm64, #920219

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index a589dafa8085..e1d121216ff7 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-17 Thread Sam James

commit: a31ba5509cd6e18fce663a313fa07999ce1a6f18
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 18 00:11:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 18 00:11:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31ba550

media-libs/openjpeg: Stabilize 2.5.0-r6 sparc, #920219

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index 151b0af0e8bc..a589dafa8085 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-17 Thread Sam James

commit: 5d1764ecc7a3836e96ff4ae347dd8d8709cb0db4
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 18 00:11:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 18 00:11:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1764ec

media-libs/openjpeg: Stabilize 2.5.0-r6 ppc64, #920219

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index 2979530c455c..151b0af0e8bc 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-12-17 Thread Sam James

commit: 1d57d38ab8a8c0a9c821066b65ce980f82a1d448
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 18 00:11:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 18 00:11:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d57d38a

media-libs/openjpeg: Stabilize 2.5.0-r6 arm, #920219

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
index e1d121216ff7..808bc6ca2411 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2023-07-14 Thread Matt Turner

commit: 55b28b4d2dbd4aa82f517c0dd39349f8bf82f6f3
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jul 14 16:52:47 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jul 14 17:05:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b28b4d

media-libs/openjpeg: Fix cross-compiling support

Without these upstream patches, e.g. poppler fails to cross-compile
against openjpeg.

Signed-off-by: Matt Turner  gentoo.org>

 .../files/openjpeg-2.5.0-gnuinstalldirs-r2.patch   | 500 +
 media-libs/openjpeg/openjpeg-2.5.0-r6.ebuild   | 103 +
 2 files changed, 603 insertions(+)

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs-r2.patch 
b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs-r2.patch
new file mode 100644
index ..89b63af5d827
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs-r2.patch
@@ -0,0 +1,500 @@
+From c7bccf0515892617af984328e96cff5b4a6cd6d3 Mon Sep 17 00:00:00 2001
+From: Thomas Bracht Laumann Jespersen 
+Date: Sun, 7 Aug 2022 16:42:01 +0200
+Subject: [PATCH] CMake: switch to GNUInstallDirs  (#1424)
+
+* Add GNUInstallDirs for standard installation directories
+
+Distributions are given standard variables for already existing hooks.
+Multiarch libdirs is taken care of automagically.
+Raises minimum cmake version by a little.
+
+* Handle CMAKE_INSTALL_xxx being absolute paths for .pc file generation
+
+In some cases the CMAKE_INSTAL_{BIN,MAN,DOC,LIB,INCLUDE}DIR variables
+may turn out to be absolute paths in which case prepending ${prefix} in
+the pkg-config .pc files will result in incorrect values.
+
+For .pc file generation, figure out if these variables are absolute and
+omit the prefix in the configured file when so.
+
+See: 
https://github.com/OSGeo/PROJ/commit/ab25e4b7ed9544e668282dcd293cfaaa2e56dbdf
+---
+ CMakeLists.txt   | 77 
+ cmake/OpenJPEGConfig.cmake.in|  8 +--
+ doc/CMakeLists.txt   |  2 +-
+ src/bin/jp2/CMakeLists.txt   |  4 +-
+ src/bin/jpip/CMakeLists.txt  | 10 +--
+ src/lib/openjp2/CMakeLists.txt   | 12 ++--
+ src/lib/openjp2/libopenjp2.pc.cmake.in   | 10 +--
+ src/lib/openjpip/CMakeLists.txt  |  8 +--
+ src/lib/openjpip/libopenjpip.pc.cmake.in | 10 +--
+ wrapping/java/openjp2/CMakeLists.txt |  2 +-
+ 10 files changed, 56 insertions(+), 87 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f89df72..fcf4709d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -105,55 +105,24 @@ endif()
+ 
+ # --
+ # Install directories
++string(TOLOWER ${PROJECT_NAME} PROJECT_NAME)
++include(GNUInstallDirs)
++
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
+ 
+-string(TOLOWER ${PROJECT_NAME} projectname)
+-set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+-
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR 
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
++set(OPENJPEG_INSTALL_SUBDIR 
"${PROJECT_NAME}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
+   endif()
+ endif()
+ 
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  # We could install *.cmake files in share/ however those files contains
+-  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+-  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR 
"${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_IN

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-07-11 Thread Matt Turner

commit: 22e7da25f9146a3c56ec064375e891298952b91c
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jul 11 18:35:01 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jul 11 18:36:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e7da25

media-libs/openjpeg: Use append-lfs-flags

Signed-off-by: Matt Turner  gentoo.org>

 .../openjpeg/{openjpeg-2.5.0-r4.ebuild => openjpeg-2.5.0-r5.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild
similarity index 99%
rename from media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild
rename to media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild
index 8c7cbf99b42f..859d250dd7f8 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r5.ebuild
@@ -49,6 +49,8 @@ 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)"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2023-04-13 Thread David Seifert

commit: 81714737d4bfa7e9db0df5f60770d9a87a7d49d4
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 13 10:52:07 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 13 10:52:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81714737

media-libs/openjpeg: remove USE=static-libs

Signed-off-by: David Seifert  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild
index 0fe8707e6d52..7a987ae1663d 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -54,7 +54,7 @@ multilib_src_configure() {
-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=$(usex static-libs)
+   -DBUILD_STATIC_LIBS=OFF
)
 
# Cheat a little bit and force disabling fixed point magic

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2022-08-15 Thread Andreas Sturmlechner

commit: 8908e6d2b56ccc9970895883a7f8b1c821ae9965
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 14 21:27:42 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 15 14:09:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8908e6d2

media-libs/openjpeg: drop 2.4.0, 2.4.0-r1, 2.4.0-r2, 2.4.0-r3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/openjpeg/Manifest   |   2 -
 .../files/openjpeg-2.4.0-gnuinstalldirs.patch  | 435 -
 .../files/openjpeg-2.4.0-r1-gnuinstalldirs.patch   | 435 -
 .../files/openjpeg-2.4.0-r2-fix-segfault.patch |  17 -
 .../openjpeg-2.4.0-r3-avoid-mult-overflow.patch|  52 ---
 .../openjpeg-2.4.0-r3-fix-integer-overflow.patch   |  57 ---
 media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild   | 139 ---
 media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild   | 140 ---
 media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild   | 142 ---
 media-libs/openjpeg/openjpeg-2.4.0.ebuild  | 139 ---
 10 files changed, 1558 deletions(-)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 67696cbe7745..30b5bc36a99f 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,4 +1,2 @@
-DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B 
ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf
 SHA512 
55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 
472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306
 SHA512 
08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
-DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 
35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b
 SHA512 
4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 
34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624
 SHA512 
225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae

diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
deleted file mode 100644
index 82ad4075a942..
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Thu, 11 Apr 2019 13:10:57 +0200
-Subject: [PATCH] Use GNUInstallDirs for standard installation directories
-
-Raises minimum cmake version by a little.
-(Later rebased by s...@gentoo.org for 2.4.0)
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
- # e.g.:
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
--cmake_minimum_required(VERSION 2.8.2)
-+cmake_minimum_required(VERSION 2.8.5)
- 
- if(COMMAND CMAKE_POLICY)
-   cmake_policy(SET CMP0003 NEW)
-@@ -105,58 +105,27 @@ endif()
- # --
- # Install directories
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-+include(GNUInstallDirs)
-+
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
- 
- string(TOLOWER ${PROJECT_NAME} projectname)
- set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
- 
--if(NOT OPENJPEG_INSTALL_BIN_DIR)
--  set(OPENJPEG_INSTALL_BIN_DIR "bin")
--endif()
--
--if(NOT OPENJPEG_INSTALL_LIB_DIR)
--  set(OPENJPEG_INSTALL_LIB_DIR "lib")
--endif()
--
--if(NOT OPENJPEG_INSTALL_SHARE_DIR)
--  set(OPENJPEG_INSTALL_SHARE_DIR "share")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DATA_DIR)
--  set(OPENJPEG_INSTALL_DATA_DIR 
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(BUILD_DOC)
--if(NOT OPENJPEG_INSTALL_MAN_DIR)
--  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DOC_DIR)
--  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--endif()
--
- if(NOT OPENJPEG_INSTALL_JNI_DIR)
-   if(WIN32)
--set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
-+set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
-   else()
--set(O

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-11 Thread Sam James

commit: 6a37ee83a847c9e108e140c1445dc261d5e3253a
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Thu Jul  7 08:27:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 12 06:56:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a37ee83

media-libs/openjpeg: rework testing phase

Instead of running all the test, and filtering for failures, collect the
names of all known failures and skip them.

Closes: https://bugs.gentoo.org/856505
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/26256
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 63 ++--
 1 file changed, 12 insertions(+), 51 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index b7f5f6918adf..d4f51290425f 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -74,67 +74,28 @@ multilib_src_test() {
return 0
fi
 
-   local myctestargs=
-
pushd "${BUILD_DIR}" > /dev/null || die
[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check 
source!"
 
-   if [[ -n ${TEST_VERBOSE} ]]; then
-   myctestargs+=( --extra-verbose --output-on-failure )
-   fi
-
-   echo ctest "${myctestargs[@]}"
-   if ctest "${myctestargs[@]}" ; then
-   popd > /dev/null || die
-   einfo "Tests succeeded."
-   return 0
-   fi
-
-   local 
FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-
-   # Should never happen
-   [[ -f "${FAILEDTEST_LOG}" ]] || die "Cannot analyze test failures: 
LastTestsFailed.log is missing!"
-
-   elog
elog "Note: Upstream maintains a list of known test failures."
-   elog "We will now compare our test results against this list and remove 
any known failures."
+   elog "We collect all the known failures and skip them."
elog
 
-   local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
-   cp "${S}/tools/travis-ci/knownfailures-all.txt" 
"${KNOWN_FAILURES_LIST}" || die
-
-   local ARCH_SPECIFIC_FAILURES=
+   local toskip=( "${S}"/tools/travis-ci/knownfailures-all.txt )
if use amd64 ; then
-   ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 
'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+   toskip+=( "${S}"/tools/travis-ci/knownfailures-*x86_64*.txt )
elif use x86 || use arm || use arm64; then
-   ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 
'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-   fi
-
-   if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]]; then
-   elog "Adding architecture specific failures 
(${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
-   elog
-   <"${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
+   toskip+=( "${S}"/tools/travis-ci/knownfailures-*i386*.txt )
fi
 
-   # Logic copied from $S/tools/travis-ci/run.sh
-   local FAILEDTEST=
-   local HAS_UNKNOWN_TEST_FAILURES=0
-
-   while read FAILEDTEST; do
-   # is this failure known?
-   if grep -xq "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" ; then
-   elog "Test '${FAILEDTEST}' is known to fail, ignoring 
..."
-   else
-   eerror "New/unknown test failure found: '${FAILEDTEST}'"
-   HAS_UNKNOWN_TEST_FAILURES=1
-   fi
-   done < <(awk -F: '{ print $2 }' "${FAILEDTEST_LOG}")
-
-   [[ ${HAS_UNKNOWN_TEST_FAILURES} -eq 0 ]] || die "Test suite failed. 
New/unknown test failure(s) found!"
+   local exp=$(sort "${toskip[@]}" | uniq | tr '\n' '|'; assert)
+   popd > /dev/null || die
 
-   elog
-   elog "Test suite passed. No new/unknown test failure(s) found!"
+   local myctestargs=()
+   if [[ -n ${TEST_VERBOSE} ]]; then
+   myctestargs+=( --extra-verbose --output-on-failure )
+   fi
+   myctestargs+=( -E "(${exp::-1})" )
 
-   popd > /dev/null || die
-   return 0
+   cmake_src_test
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-05 Thread Arthur Zamarin

commit: 2fefde51ec2d2e11c5788675a3178b07ab731b6d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jul  6 06:57:58 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jul  6 06:57:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fefde51

media-libs/openjpeg: Stabilize 2.5.0-r2 hppa, #856304

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 8ce57b6e9469..b7f5f6918adf 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-05 Thread Sam James

commit: cd1cd3f34139899f4de84cabcf94036bf623d395
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Tue Jul  5 07:38:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 08:05:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1cd3f3

media-libs/openjpeg: die properly when tests fail

Bug: https://bugs.gentoo.org/856505
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/26228
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 706ab40270e3..8ce57b6e9469 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -120,7 +120,7 @@ multilib_src_test() {
local FAILEDTEST=
local HAS_UNKNOWN_TEST_FAILURES=0
 
-   awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" | while read FAILEDTEST; do
+   while read FAILEDTEST; do
# is this failure known?
if grep -xq "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" ; then
elog "Test '${FAILEDTEST}' is known to fail, ignoring 
..."
@@ -128,7 +128,7 @@ multilib_src_test() {
eerror "New/unknown test failure found: '${FAILEDTEST}'"
HAS_UNKNOWN_TEST_FAILURES=1
fi
-   done
+   done < <(awk -F: '{ print $2 }' "${FAILEDTEST_LOG}")
 
[[ ${HAS_UNKNOWN_TEST_FAILURES} -eq 0 ]] || die "Test suite failed. 
New/unknown test failure(s) found!"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-05 Thread Joonas Niilola

commit: 7fd81e3690daf94a1d8d9c72f8ecbb5827b68ab5
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jul  5 07:00:09 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jul  5 07:00:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fd81e36

media-libs/openjpeg: Stabilize 2.5.0-r2 x86, #856304

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 4addcf11d20e..706ab40270e3 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Agostino Sarubbo

commit: 359eafa5c120a84ebe4cf04d55f6ea342e208a0c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  5 06:04:31 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  5 06:04:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359eafa5

media-libs/openjpeg: sparc stable wrt bug #856304

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 4badb264db87..4addcf11d20e 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Agostino Sarubbo

commit: 03d73535b72654107db9b66468a1cc1327df62c2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  5 06:03:45 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  5 06:03:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d73535

media-libs/openjpeg: ppc64 stable wrt bug #856304

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 900b09c1754a..4badb264db87 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Agostino Sarubbo

commit: caafff555230e87e1f7a627d52244dff16d55913
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  5 06:02:33 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  5 06:02:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caafff55

media-libs/openjpeg: arm64 stable wrt bug #856304

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index c671b28ec40f..900b09c1754a 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Sam James

commit: 57a51585a7f26f9a123662344c6ca57a107b2a10
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  5 00:00:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  5 00:00:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a51585

media-libs/openjpeg: Stabilize 2.5.0-r2 arm, #856304

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 9dcc96b4ff23..c671b28ec40f 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Joonas Niilola

commit: 238f64f90cbd1da45a1e392dbf628b480a18cde8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul  4 11:38:25 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul  4 11:38:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238f64f9

media-libs/openjpeg: Stabilize 2.5.0-r2 amd64, #856304

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index e078d8b3be28..9dcc96b4ff23 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-07-04 Thread Agostino Sarubbo

commit: 921204b49ab1d0b3155b1ab7f98ab4c5abe7ec62
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul  4 11:20:28 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul  4 11:20:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921204b4

media-libs/openjpeg: ppc stable wrt bug #856304

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 70cd86a4a35c..e078d8b3be28 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/

2022-05-23 Thread Sam James

commit: f0941fb5417e182ffce947e0242caa0b61fee71c
Author: Sam James  gentoo  org>
AuthorDate: Mon May 23 20:45:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 23 20:45:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0941fb5

media-libs/openjpeg: cleanup patch

Bug: https://bugs.gentoo.org/847013
Signed-off-by: Sam James  gentoo.org>

 .../openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch| 15 ---
 1 file changed, 15 deletions(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index 9e0eebbfdfb7..1e5617cc3e3a 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -120,21 +120,6 @@ Raises minimum cmake version by a little.
endif()
  endif()
  
-@@ -385,3 +346,14 @@ endif()
- 
- # build our version of astyle
- SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should 
reindent with scripts/prepare-commit.sh (using 'our' astyle)")
-+
-+message(STATUS "<<< Gentoo configuration >>>
-+Build type  ${CMAKE_BUILD_TYPE}
-+Install path${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C   ${CMAKE_C_FLAGS}
-+C++ ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable  ${CMAKE_EXE_LINKER_FLAGS}
-+Module  ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared  ${CMAKE_SHARED_LINKER_FLAGS}\n")
 --- a/cmake/OpenJPEGConfig.cmake.in
 +++ b/cmake/OpenJPEGConfig.cmake.in
 @@ -27,12 +27,8 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/, media-libs/openjpeg/

2022-05-23 Thread Sam James

commit: de20312c7cc3c05ec8183595808198048699fed2
Author: Sam James  gentoo  org>
AuthorDate: Mon May 23 20:43:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 23 20:44:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de20312c

media-libs/openjpeg: fix GNUInstallDirs patch

- Fix install dir for CMake*Config (needs to be in a subdir)
- Fix include path within those

Closes: https://bugs.gentoo.org/847013
Signed-off-by: Sam James  gentoo.org>

 .../files/openjpeg-2.5.0-gnuinstalldirs.patch  | 33 +-
 ...eg-2.5.0-r1.ebuild => openjpeg-2.5.0-r2.ebuild} |  0
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index f47f062b8939..9e0eebbfdfb7 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -75,7 +75,7 @@ Raises minimum cmake version by a little.
 -  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
 -  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
 -  set(OPENJPEG_INSTALL_PACKAGE_DIR 
"${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  set(OPENJPEG_INSTALL_PACKAGE_DIR 
"${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR 
"${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
  endif()
  
  if (APPLE)
@@ -120,19 +120,38 @@ Raises minimum cmake version by a little.
endif()
  endif()
  
+@@ -385,3 +346,14 @@ endif()
+ 
+ # build our version of astyle
+ SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should 
reindent with scripts/prepare-commit.sh (using 'our' astyle)")
++
++message(STATUS "<<< Gentoo configuration >>>
++Build type  ${CMAKE_BUILD_TYPE}
++Install path${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C   ${CMAKE_C_FLAGS}
++C++ ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable  ${CMAKE_EXE_LINKER_FLAGS}
++Module  ${CMAKE_MODULE_LINKER_FLAGS}
++Shared  ${CMAKE_SHARED_LINKER_FLAGS}\n")
 --- a/cmake/OpenJPEGConfig.cmake.in
 +++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -28,8 +28,8 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+@@ -27,12 +27,8 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   # This is an install tree
include(${SELF_DIR}/OpenJPEGTargets.cmake)
  
-   # We find a relative path from the PKG directory to header files.
+-  # We find a relative path from the PKG directory to header files.
 -  set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
 -  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  set(PKG_DIR 
"@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
-+  set(INC_DIR 
"@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+-  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+-
+-  get_filename_component(OPENJPEG_INCLUDE_DIRS 
"${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
++  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
++  get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
  
-   get_filename_component(OPENJPEG_INCLUDE_DIRS 
"${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
+ else()
+   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
 --- a/doc/CMakeLists.txt
 +++ b/doc/CMakeLists.txt
 @@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
similarity index 100%
rename from media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild
rename to media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2022-05-23 Thread Sam James

commit: bf92bccd8ffd7dc4ff4b32b465fa5e34ca04a564
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Mon May 23 11:33:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 23 17:26:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf92bccd

media-libs/openjpeg: add 2.5.0-r1, fix includedir

Bug: https://bugs.gentoo.org/694776
Closes: https://bugs.gentoo.org/847058
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/25607
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch | 4 ++--
 .../openjpeg/{openjpeg-2.5.0.ebuild => openjpeg-2.5.0-r1.ebuild}  | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index f82b64485979..f47f062b8939 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -243,7 +243,7 @@ Raises minimum cmake version by a little.
 +mandir=@CMAKE_INSTALL_MANDIR@
 +docdir=@CMAKE_INSTALL_DOCDIR@
 +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
  
  Name: openjp2
  Description: JPEG2000 library (Part 1 and 2)
@@ -283,7 +283,7 @@ Raises minimum cmake version by a little.
 +mandir=@CMAKE_INSTALL_MANDIR@
 +docdir=@CMAKE_INSTALL_DOCDIR@
 +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
  
  Name: openjpip
  Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild
similarity index 100%
rename from media-libs/openjpeg/openjpeg-2.5.0.ebuild
rename to media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/

2022-05-22 Thread Sam James

commit: 2272d501ef511b7ebc4e687129cb924c33cfc77e
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 21:08:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 21:08:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2272d501

media-libs/openjpeg: add link to upstream PR for patch

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index 1b0a424e3e38..f82b64485979 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -1,3 +1,5 @@
+https://github.com/uclouvain/openjpeg/pull/1165
+
 From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Thu, 11 Apr 2019 13:10:57 +0200
@@ -294,6 +296,3 @@ Raises minimum cmake version by a little.
 -  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
 +  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
  )
--- 
-2.35.1
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2022-05-22 Thread Sam James

commit: f0a1ba2eaccd64377fa90dd289886faaae126df3
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Mon May 16 08:07:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 20:35:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a1ba2e

media-libs/openjpeg: add 2.5.0

Also update to EAPI 8, and bump the test data to the latest commit
possible. Drop all security patches from v2.4.0 as they are part of the
upstream release.

Closes: https://bugs.gentoo.org/844064
Bug: https://bugs.gentoo.org/783513
Bug: https://bugs.gentoo.org/484802
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/25523
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/Manifest   |   2 +
 .../files/openjpeg-2.5.0-gnuinstalldirs.patch  | 299 +
 media-libs/openjpeg/openjpeg-2.5.0.ebuild  | 140 ++
 3 files changed, 441 insertions(+)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 2971ec0815a5..67696cbe7745 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,2 +1,4 @@
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B 
ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf
 SHA512 
55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
+DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 
472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306
 SHA512 
08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 
35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b
 SHA512 
4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
+DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 
34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624
 SHA512 
225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
new file mode 100644
index ..1b0a424e3e38
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -0,0 +1,299 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+(Later rebased by s...@gentoo.org for 2.4.0)
+(Again rebased by t...@laumann.xyz for 2.5.0)
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -106,54 +106,23 @@ endif()
+ # --
+ # Install directories
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
++include(GNUInstallDirs)
++
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR 
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++set(OPENJPEG_INST

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-05-13 Thread WANG Xuerui

commit: 038cec0298a0dd9d0ac461cc181b94bb77bf0197
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri May 13 06:50:39 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri May 13 12:18:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038cec02

media-libs/openjpeg: keyword 2.4.0-r3 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
index 7405a4c46f4e..d2b85a157420 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2022-04-24 Thread Joonas Niilola

commit: 3c5508bd5ecf31191a9f63b6f8db66d1c9880b03
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Thu Apr 21 12:07:59 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Apr 24 07:24:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5508bd

media-libs/openjpeg: backport upstream fix for CVE-2021-29338

The fix is split across two commits upstream, considered merging them
but decided against it.

Bug: https://bugs.gentoo.org/783513
Fixes: CVE-2021-29338
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/25142
Signed-off-by: Joonas Niilola  gentoo.org>

 .../openjpeg-2.4.0-r3-avoid-mult-overflow.patch|  52 
 .../openjpeg-2.4.0-r3-fix-integer-overflow.patch   |  57 +
 media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild   | 142 +
 3 files changed, 251 insertions(+)

diff --git 
a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch
new file mode 100644
index ..3733a1b94545
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch
@@ -0,0 +1,52 @@
+Upstream: 
https://github.com/uclouvain/openjpeg/commit/1daaa0b909aebdf71be36238d16dfbec83c494ed
+Bug: https://bugs.gentoo.org/783513
+CVE-2021-29338
+--- a/src/bin/jp2/opj_compress.c
 b/src/bin/jp2/opj_compress.c
+@@ -1967,7 +1967,7 @@ int main(int argc, char **argv)
+ goto fin;
+ }
+ for (i = 0; i < num_images; i++) {
+-dirptr->filename[i] = dirptr->filename_buf + i * OPJ_PATH_LEN;
++dirptr->filename[i] = dirptr->filename_buf + (size_t)i * 
OPJ_PATH_LEN;
+ }
+ }
+ if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+--- a/src/bin/jp2/opj_decompress.c
 b/src/bin/jp2/opj_decompress.c
+@@ -1367,7 +1367,6 @@ int main(int argc, char **argv)
+ if (img_fol.set_imgdir == 1) {
+ int it_image;
+ num_images = get_num_images(img_fol.imgdirpath);
+-
+ dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
+ if (!dirptr) {
+ destroy_parameters(¶meters);
+@@ -1387,7 +1386,8 @@ int main(int argc, char **argv)
+ goto fin;
+ }
+ for (it_image = 0; it_image < num_images; it_image++) {
+-dirptr->filename[it_image] = dirptr->filename_buf + it_image * 
OPJ_PATH_LEN;
++dirptr->filename[it_image] = dirptr->filename_buf + 
(size_t)it_image *
++ OPJ_PATH_LEN;
+ }
+ 
+ if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+--- a/src/bin/jp2/opj_dump.c
 b/src/bin/jp2/opj_dump.c
+@@ -529,13 +529,13 @@ int main(int argc, char *argv[])
+ }
+ 
+ for (it_image = 0; it_image < num_images; it_image++) {
+-dirptr->filename[it_image] = dirptr->filename_buf + it_image * 
OPJ_PATH_LEN;
++dirptr->filename[it_image] = dirptr->filename_buf + 
(size_t)it_image *
++ OPJ_PATH_LEN;
+ }
+ 
+ if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+ goto fails;
+ }
+-
+ if (num_images == 0) {
+ fprintf(stdout, "Folder is empty\n");
+ goto fails;

diff --git 
a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch
new file mode 100644
index ..6ceb5be8f6d1
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch
@@ -0,0 +1,57 @@
+opj_compress/opj_uncompress: fix integer overflow in num_images
+CVE-2021-29338
+Bug 783513
+Upstream: 
https://github.com/uclouvain/openjpeg/commit/79c7d7af598b778c3cdcb455df23d50efc95eb3c
+--- a/src/bin/jp2/opj_compress.c
 b/src/bin/jp2/opj_compress.c
+@@ -1959,9 +1959,9 @@ int main(int argc, char **argv)
+ num_images = get_num_images(img_fol.imgdirpath);
+ dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
+ if (dirptr) {
+-dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * 
sizeof(
++dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * 
sizeof(
+ char)); /* Stores at max 10 image file names*/
+-dirptr->filename = (char**) malloc(num_images * sizeof(char*));
++dirptr->filename = (char**) calloc(num_images, sizeof(char*));
+ if (!dirptr->filename_buf) {
+ ret = 0;
+ goto fin;
+--- a/src/bin/jp2/opj_decompress.c
 b/src/bin/jp2/opj_decompress.c
+@@ -1374,14 +1374,13 @@ int main(int argc, char **argv)
+ return EXIT_FAILURE;
+ }
+ /* Stores at max 10 image file names */
+-dirptr->filename_buf = (char*)malloc(sizeof(char) *
+-

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-04-18 Thread Sam James

commit: a3fcca85027b2fe115976cb8c598526617030a19
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Mon Apr 18 20:51:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 18 21:00:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3fcca85

media-libs/openjpeg: add myself as a maintainer

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/25097
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 7fa8ba2aacfa..de80c41403bb 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   t...@laumann.xyz
+   Thomas Bracht Laumann Jespersen
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

openjpeg.mirror
uclouvain/openjpeg

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2022-04-06 Thread Sam James

commit: bba8c25087f16491a37d44493c914113ac82c5a9
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  7 03:37:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  7 03:37:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba8c250

media-libs/openjpeg: fix patch filename

Reported-by: Kangie
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
index 90e97e2e3bce..cecc59d76a7f 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
@@ -34,7 +34,7 @@ DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
 
 PATCHES=(
"${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150
-   "${FILESDIR}/${PN}-2.4.0-fix-r2-segfault.patch" # bug 832007
+   "${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2022-04-06 Thread Sam James

commit: 65217c376e5339336f01073b3312fed51654cdaf
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Wed Mar 30 20:48:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  7 02:21:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65217c37

media-libs/openjpeg: Fix segfault, security bug 832007

See: 
https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d
Bug: https://bugs.gentoo.org/832007
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/24822
Signed-off-by: Sam James  gentoo.org>

 .../files/openjpeg-2.4.0-r2-fix-segfault.patch |  17 +++
 media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild   | 140 +
 2 files changed, 157 insertions(+)

diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch
new file mode 100644
index ..86e1c1fe39cc
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch
@@ -0,0 +1,17 @@
+Upstream: 
https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d
+From: xiaoxiaoafeifei 
+Date: Wed, 14 Jul 2021 09:35:13 +0800
+Subject: [PATCH] Fix segfault in src/bin/jp2/opj_decompress.c due to
+ uninitialized pointer (fixes #1368) (#1369)
+
+--- a/src/bin/jp2/opj_decompress.c
 b/src/bin/jp2/opj_decompress.c
+@@ -1356,7 +1356,7 @@ int main(int argc, char **argv)
+ int it_image;
+ num_images = get_num_images(img_fol.imgdirpath);
+ 
+-dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
++dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
+ if (!dirptr) {
+ destroy_parameters(¶meters);
+ return EXIT_FAILURE;

diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
new file mode 100644
index ..90e97e2e3bce
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+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!
+MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
+
+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_20201130.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   media-libs/lcms:2
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   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.4.0-r1-gnuinstalldirs.patch" # bug 667150
+   "${FILESDIR}/${PN}-2.4.0-fix-r2-segfault.patch" # bug 832007
+)
+
+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=$(usex static-libs)
+   )
+
+   # 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
+   multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
+
+   cmake_src_configure
+}
+
+multilib_src_test() {
+   if ! multilib_is_native_abi ; then
+   elog "Cannot run tests for non-multilib abi."
+   return 0
+   fi
+
+   local myctestargs=
+
+   pushd "${BUILD_DIR}" > /dev/null || die
+   [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check 
source!"
+
+   [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose 
--output-on-failure )
+
+   echo ctest "${myctestargs[@]}" "$@"
+   if ctest "${myctestargs[@]}" "$@" ; then
+   einfo "Tests succeeded."
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/, media-libs/openjpeg/

2022-02-02 Thread Sam James

commit: fde99243e307bd130c6f9cc04090bcb9829ce9c0
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Wed Feb  2 19:19:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  3 02:20:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde99243

media-libs/openjpeg: Fix mandir and docdir for generated pkgconfig

Update the patch to remove the ${prefix} variable from mandir and docdir
as it results in incorrect paths.

Before:

$ pkg-config --variable=docdir libopenjp2
/usr//usr/share/doc/openjpeg-2.4.0
$ pkg-config --variable=mandir libopenjp2
/usr//usr/share/man

and after:

$ pkg-config --variable=docdir libopenjp2
/usr/share/doc/openjpeg-2.4.0-r1
$ pkg-config --variable=mandir libopenjp2
/usr/share/man

Bug: https://bugs.gentoo.org/694776
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24000
Signed-off-by: Sam James  gentoo.org>

 .../files/openjpeg-2.4.0-r1-gnuinstalldirs.patch   | 435 +
 media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild   | 139 +++
 2 files changed, 574 insertions(+)

diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch
new file mode 100644
index ..bc6771c0c4be
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch
@@ -0,0 +1,435 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+(Later rebased by s...@gentoo.org for 2.4.0)
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -105,58 +105,27 @@ endif()
+ # --
+ # Install directories
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
++include(GNUInstallDirs)
++
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR 
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
+   endif()
+ endif()
+ 
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  # We could install *.cmake files in share/ however those files contains
+-  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+-  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR 
"${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR 
"${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
+ endif()
+ 
+ if (APPLE)
+-  list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR 
"${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
++  list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR 
"${CMAKE_INSTALL_FULL_LIBDIR}")
+   option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+ endif()
+ 
+@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ )
+ 
+ #-
+-# install CHANGES and LICENSE
+-if(BUILD_DOC)
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTA

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-10-15 Thread Joonas Niilola

commit: a3f723f0bbd6226e9044d4f0a57ae5976e6c814a
Author: Haowen Liu  gmail  com>
AuthorDate: Tue Sep 28 17:12:10 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 15 10:22:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f723f0

media-libs/openjpeg: remove google-code upstream metadata

Signed-off-by: Haowen Liu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22431
Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/openjpeg/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 2001f66c697..7fa8ba2aacf 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -3,7 +3,6 @@
 


-   openjpeg
openjpeg.mirror
uclouvain/openjpeg

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-09-20 Thread James Le Cuirot

commit: 733079f29aa205bb5728821f9cb2de362adfba0d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Sep 20 12:26:33 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Sep 20 14:08:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733079f2

media-libs/openjpeg: Keyword 2.4.0 for ~m68k

49 tests out of 1541 failed. A couple are known failures. I compared
the output of some others by eye and they looked the same to me!

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 58bad868b8f..2541abf1fe5 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2021-02-11 Thread Sam James

commit: e31a773aa52771524f781a95e46c6c1904e6a08f
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 11 08:15:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 11 08:15:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31a773a

media-libs/openjpeg: security cleanup

Bug: https://bugs.gentoo.org/718918
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/Manifest   |   2 -
 .../files/openjpeg-2.3.1-CVE-2020-6851.patch   |  29 --
 .../files/openjpeg-2.3.1-CVE-2020-8112.patch   |  43 --
 .../files/openjpeg-2.3.1-gnuinstalldirs.patch  | 495 -
 .../files/openjpeg-2.3.1-libtiff-4.1-compat.patch  | 210 -
 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild   | 136 --
 6 files changed, 915 deletions(-)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 4421745b114..2971ec0815a 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,4 +1,2 @@
-DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B 
ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9
 SHA512 
339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B 
ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf
 SHA512 
55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
-DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 
3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe
 SHA512 
32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 
35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b
 SHA512 
4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch
deleted file mode 100644
index 9a70291f50e..000
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Sat, 11 Jan 2020 01:51:19 +0100
-Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
- coordinates are beyond INT_MAX (fixes #1228)
-

- src/lib/openjp2/j2k.c | 8 
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
-index 14f6ff41a..922550eb1 100644
 a/src/lib/openjp2/j2k.c
-+++ b/src/lib/openjp2/j2k.c
-@@ -9221,6 +9221,14 @@ static OPJ_BOOL 
opj_j2k_update_image_dimensions(opj_image_t* p_image,
- l_img_comp = p_image->comps;
- for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
- OPJ_INT32 l_h, l_w;
-+if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
-+p_image->y0 > (OPJ_UINT32)INT_MAX ||
-+p_image->x1 > (OPJ_UINT32)INT_MAX ||
-+p_image->y1 > (OPJ_UINT32)INT_MAX) {
-+opj_event_msg(p_manager, EVT_ERROR,
-+  "Image coordinates above INT_MAX are not 
supported\n");
-+return OPJ_FALSE;
-+}
- 
- l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
-  (OPJ_INT32)l_img_comp->dx);

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch
deleted file mode 100644
index 95cb8095f56..000
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Thu, 30 Jan 2020 00:59:57 +0100
-Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
-
-That could lead to later assertion failures.
-
-Fixes #1231 / CVE-2020-8112

- src/lib/openjp2/tcd.c | 20 ++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
-index deecc4dff..aa419030a 100644
 a/src/lib/openjp2/tcd.c
-+++ b/src/lib/openjp2/tcd.c
-@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t 
*p_tcd, OPJ_UINT32 p_tile_no,
- /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
- l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, 
(OPJ_INT32)l_pdx) << l_pdx;
- l_tl

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-02-11 Thread Sam James

commit: 16046bd0ffea18104eb033de724b3f8007d278af
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 11 08:14:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 11 08:14:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16046bd0

media-libs/openjpeg: Stabilize 2.4.0 s390, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 58bad868b8f..d14c44cab8a 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-23 Thread Andreas Sturmlechner

commit: 3ba62aa6a060734ae14a0e6f978c584746635248
Author: John Helmert III  posteo  net>
AuthorDate: Thu Jul 30 07:01:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 23 18:12:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba62aa6

media-libs/openjpeg: Security cleanup (drop :0)

Bug: https://bugs.gentoo.org/711260
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16909
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/openjpeg/Manifest |  1 -
 media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild | 77 
 2 files changed, 78 deletions(-)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 0179013e339..4421745b114 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,4 +1,3 @@
-DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 
936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1
 SHA512 
b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B 
ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9
 SHA512 
339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B 
ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf
 SHA512 
55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 
3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe
 SHA512 
32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507

diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild 
b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
deleted file mode 100644
index 59ab4ced81a..000
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org";
-SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="
-   media-libs/lcms:2=
-   media-libs/libpng:0=
-   media-libs/tiff:0=
-   sys-libs/zlib:="
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS CHANGES NEWS README THANKS )
-
-RESTRICT="test" # bug 409263
-
-src_prepare() {
-   cmake-utils_src_prepare
-   # Stop installing LICENSE file, and install CHANGES from DOCS instead:
-   sed -i -e '/INSTALL.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' 
CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-   -DBUILD_TESTING=$(usex test)
-   -DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-   -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-   )
-
-   cmake-utils_src_configure
-
-   if use static-libs; then
-   mycmakeargs=(
-   -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-   -DBUILD_TESTING=$(usex test)
-   -DBUILD_SHARED_LIBS=OFF
-   -DBUILD_CODEC=OFF
-   )
-   BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-   fi
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-
-   if use static-libs; then
-   BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-   fi
-}
-
-multilib_src_install() {
-   if use static-libs; then
-   BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-   fi
-
-   cmake-utils_src_install
-
-   dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
-   dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
-
-   if use doc && multilib_is_native_abi; then
-   dodoc -r doc/html
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/

2021-01-18 Thread Sam James

commit: ac08393ceca2d9c7bedbd874cbe48180fa079705
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 17:47:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 17:47:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac08393c

media-libs/openjpeg: fix email in patch

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
index b0b2666c722..7eb393b8922 100644
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -1,5 +1,5 @@
 From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
+From: Andreas Sturmlechner 
 Date: Thu, 11 Apr 2019 13:10:57 +0200
 Subject: [PATCH] Use GNUInstallDirs for standard installation directories

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-17 Thread Sergei Trofimovich

commit: 6a8c3aa429fc5e578a6ca719ffafffc028822944
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Jan 17 09:05:09 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jan 17 11:41:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8c3aa4

media-libs/openjpeg: stable 2.4.0 for hppa, bug #718918

Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index d8c01ec6cc6..58bad868b8f 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-10 Thread Sam James

commit: 80ac549d788cdd5fa7ef2fbc7b3c8831eaf86eef
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 09:35:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 09:35:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ac549d

media-libs/openjpeg: Stabilize 2.4.0 sparc, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 5aaab89871b..d8c01ec6cc6 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-07 Thread Sam James

commit: 7be614cfc8c2e7f764b3dabf65594e62f0b21146
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 10:42:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 10:42:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be614cf

media-libs/openjpeg: Stabilize 2.4.0 ppc64, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index b9f987c7fad..5aaab89871b 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-06 Thread Sam James

commit: ca107df75de0efef3e33b25ac4b0cbac4c832655
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 02:34:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 02:35:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca107df7

media-libs/openjpeg: Stabilize 2.4.0 ppc, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 103c1201eb5..b9f987c7fad 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-06 Thread Sam James

commit: 132f19815c78a0ca7ea446b8eef7c2ff44fadb59
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 01:09:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 01:09:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132f1981

media-libs/openjpeg: Stabilize 2.4.0 arm64, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index f5649695c3f..103c1201eb5 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-06 Thread Fabian Groffen

commit: 26aa083165ccf690f87525eebc8b838f02bad572
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:22:53 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 14:26:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26aa0831

media-libs/openjpeg: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild | 4 ++--
 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 4 ++--
 media-libs/openjpeg/openjpeg-2.4.0.ebuild| 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild 
b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 2ef40a90123..59ab4ced81a 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 5d48325ab00..07ed6a38acd 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index cd115e912df..f5649695c3f 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-05 Thread Sam James

commit: 957453494630401e890178f68e64d29d08434125
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  6 06:36:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  6 06:36:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95745349

media-libs/openjpeg: Stabilize 2.4.0 arm, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 6a3dec12bc6..cd115e912df 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-05 Thread Sam James

commit: c518522cda5631f28c3b652925c86e26d0380fff
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  6 06:33:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  6 06:33:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c518522c

media-libs/openjpeg: Stabilize 2.4.0 x86, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 8e78d7a0a8a..6a3dec12bc6 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2021-01-05 Thread Sam James

commit: 4a9aaa1fa237ba6c77a01eb406cf3d8bc614f57d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  6 03:09:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  6 03:09:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9aaa1f

media-libs/openjpeg: Stabilize 2.4.0 amd64, #718918

Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/openjpeg-2.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 835a389bc40..8e78d7a0a8a 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/

2020-12-29 Thread Sam James

commit: 8000a18e51631d5ef563000469ab6d0a3d60e24e
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 29 08:35:03 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 29 08:35:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8000a18e

media-libs/openjpeg: fix install locations patch

Closes: https://bugs.gentoo.org/762373
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../files/openjpeg-2.4.0-gnuinstalldirs.patch  | 25 +-
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
index 7b0014980fd..82ad4075a94 100644
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
@@ -4,7 +4,7 @@ Date: Thu, 11 Apr 2019 13:10:57 +0200
 Subject: [PATCH] Use GNUInstallDirs for standard installation directories
 
 Raises minimum cmake version by a little.
-- Later rebased by s...@gentoo.org for 2.4.0
+(Later rebased by s...@gentoo.org for 2.4.0)
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -7,7 +7,7 @@
@@ -81,7 +81,22 @@ Raises minimum cmake version by a little.
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
  endif()
  
-@@ -366,14 +335,14 @@ if(BUILD_PKGCONFIG_FILES)
+@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ )
+ 
+ #-
+-# install CHANGES and LICENSE
+-if(BUILD_DOC)
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+ 
+ include (cmake/OpenJPEGCPack.cmake)
+ 
+@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
@@ -98,7 +113,7 @@ Raises minimum cmake version by a little.
endif()
  #
if(BUILD_JPIP)
-@@ -381,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
+@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
@@ -107,7 +122,7 @@ Raises minimum cmake version by a little.
endif()
  #
if(BUILD_JP3D)
-@@ -389,7 +358,7 @@ if(BUILD_PKGCONFIG_FILES)
+@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
@@ -318,7 +333,7 @@ Raises minimum cmake version by a little.
 +mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
 +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
 +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ 
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
  
  Name: openjp3d
  Description: JPEG2000 Extensions for three-dimensional data (Part 10)

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/, media-libs/openjpeg/

2020-12-28 Thread Sam James

commit: 77e5ad18b2cc380826ad062461b08357633889a6
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 29 02:56:24 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 29 02:56:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e5ad18

media-libs/openjpeg: security bump to 2.4.0

Bug: https://bugs.gentoo.org/675426
Bug: https://bugs.gentoo.org/718918
Closes: https://bugs.gentoo.org/715306
Closes: https://bugs.gentoo.org/715422
Closes: https://bugs.gentoo.org/715130
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/openjpeg/Manifest   |   2 +
 .../files/openjpeg-2.4.0-gnuinstalldirs.patch  | 420 +
 media-libs/openjpeg/openjpeg-2.4.0.ebuild  | 139 +++
 3 files changed, 561 insertions(+)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 1d294acdcfb..0179013e339 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,3 +1,5 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 
936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1
 SHA512 
b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B 
ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9
 SHA512 
339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
+DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B 
ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf
 SHA512 
55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 
3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe
 SHA512 
32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
+DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 
35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b
 SHA512 
4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31

diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
new file mode 100644
index 000..7b0014980fd
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
@@ -0,0 +1,420 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+- Later rebased by s...@gentoo.org for 2.4.0
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -105,58 +105,27 @@ endif()
+ # --
+ # Install directories
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
++include(GNUInstallDirs)
++
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR 
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-31 Thread Thomas Deutschmann

commit: 73a868c63912a8fe32e7db61250ff92d7917181d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar 31 18:36:50 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar 31 18:39:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a868c6

media-libs/openjpeg: ia64 marked stable to keep CI happy

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index fb58d28a6ca..fd397f1d515 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-31 Thread Thomas Deutschmann

commit: 8fe3f2e1ea52b4d887f707ff3b0564862c5d7b86
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar 31 17:57:39 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar 31 17:57:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe3f2e1

media-libs/openjpeg: security cleanup (#707926)

Bug: https://bugs.gentoo.org/707926
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 133 --
 1 file changed, 133 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
deleted file mode 100644
index 9cfc8e401cd..000
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e"
-
-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_20180620.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   media-libs/lcms:2
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   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.3.1-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=$(usex static-libs)
-   )
-
-   cmake_src_configure
-}
-
-multilib_src_test() {
-   if ! multilib_is_native_abi ; then
-   elog "Cannot run tests for non-multilib abi."
-   return 0
-   fi
-
-   local myctestargs=
-
-   pushd "${BUILD_DIR}" > /dev/null || die
-   [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check 
source!"
-
-   [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose 
--output-on-failure )
-
-   echo ctest "${myctestargs[@]}" "$@"
-   if ctest "${myctestargs[@]}" "$@" ; then
-   einfo "Tests succeeded."
-   popd > /dev/null || die
-   return 0
-   else
-   local 
FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-
-   if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
-   # Should never happen
-   die "Cannot analyze test failures: LastTestsFailed.log 
is missing!"
-   fi
-
-   echo ""
-   einfo "Note: Upstream is maintaining a list of known test 
failures."
-   einfo "We will now compare our test results against this list 
and sort out any known failure."
-
-   local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
-   cat "${S}/tools/travis-ci/knownfailures-all.txt" > 
"${KNOWN_FAILURES_LIST}" || die
-
-   local ARCH_SPECIFIC_FAILURES=
-   if use amd64 ; then
-   ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" 
-name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d 
'\0')"
-   elif use x86 || use arm || use arm64; then
-   ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" 
-name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-   fi
-
-   if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
-   einfo "Adding architecture specific failures 
(${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
-   cat "${ARCH_SPECIFIC_FAILURES}" >> 
"${KNOWN_FAILURES_LIST}" || die
-   fi
-
-   # Logic copied from $S/tools/travis-ci/run.s

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-30 Thread Agostino Sarubbo

commit: 35b2300f886e3e37367247941d9d34a602739982
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 30 13:35:42 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 30 13:35:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b2300f

media-libs/openjpeg: arm stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 2419e6b4631..fb58d28a6ca 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-29 Thread Mart Raudsepp

commit: f7a55b59dc02c6db06fab073be3e83cf23046b46
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Mar 29 11:17:42 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Mar 29 11:17:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a55b59

media-libs/openjpeg: arm64 stable (bug #707926)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 1ed9b76ec33..2419e6b4631 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Sergei Trofimovich

commit: 6cfba337127a2171e0a29b90cc46194d3fdd749c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Mar 26 16:03:56 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Mar 26 18:01:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfba337

media-libs/openjpeg: stable 2.3.1-r1 for hppa, bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 867181a30f4..1ed9b76ec33 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Agostino Sarubbo

commit: c16dd2be6aaad68025a19691ca52af9a3597a319
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 26 12:04:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 26 12:04:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c16dd2be

media-libs/openjpeg: s390 stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 5f68941d531..bead29384de 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Agostino Sarubbo

commit: 1490be2896b40fa78e75795f2fd516df43dbe5ff
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 26 10:23:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 26 10:23:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1490be28

media-libs/openjpeg: x86 stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index f9b112d34d7..5f68941d531 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Agostino Sarubbo

commit: f664416a45592b7830c6c55cf50c6be6231ca06a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 26 10:22:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 26 10:22:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f664416a

media-libs/openjpeg: sparc stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 664b7605b8b..f9b112d34d7 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Agostino Sarubbo

commit: 1db4c82e02417e1f3352cee7aec1903417106831
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 26 10:21:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 26 10:21:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db4c82e

media-libs/openjpeg: ppc64 stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index ec052a5823b..664b7605b8b 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Agostino Sarubbo

commit: 518ef4d5f12b46d2cdb077c454784bcbdfd09dc4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 26 10:20:38 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 26 10:20:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518ef4d5

media-libs/openjpeg: ppc stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 502760829bf..ec052a5823b 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2020-03-26 Thread Agostino Sarubbo

commit: 343096f9fe2749350a0f1140d804017c69f1e5d7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 26 10:17:04 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 26 10:17:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343096f9

media-libs/openjpeg: amd64 stable wrt bug #707926

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index 871bae223ed..502760829bf 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/, media-libs/openjpeg/

2020-03-25 Thread Thomas Deutschmann

commit: cc5624c83ee4d27e8beba205f28324ad8765adeb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Mar 25 22:41:37 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Mar 25 22:42:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5624c8

media-libs/openjpeg: fix tests with tiff-4.1+

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/openjpeg-2.3.1-libtiff-4.1-compat.patch  | 210 +
 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild   |   1 +
 2 files changed, 211 insertions(+)

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch
new file mode 100644
index 000..53985b19093
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch
@@ -0,0 +1,210 @@
+From b5cb419faff300fdbc0b4e98dab5c9010db6f39d Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Fri, 7 Feb 2020 21:53:10 +0100
+Subject: [PATCH] tests: add alternate checksums for libtiff 4.1
+
+Fixes #1233
+
+libtiff 4.1 slightly modifies the way it generates files. So
+add the new expected md5sum.
+
+Not super elegant solution admitedly.
+---
+ tests/nonregression/checkmd5refs.cmake  |  5 ++
+ tests/nonregression/md5refs.txt | 86 +++--
+ tests/nonregression/test_suite.ctest.in | 16 ++---
+ 3 files changed, 93 insertions(+), 14 deletions(-)
+
+diff --git a/tests/nonregression/checkmd5refs.cmake 
b/tests/nonregression/checkmd5refs.cmake
+index 75afbed05..76e2f245f 100644
+--- a/tests/nonregression/checkmd5refs.cmake
 b/tests/nonregression/checkmd5refs.cmake
+@@ -46,10 +46,15 @@ foreach(pgxfullpath ${globfiles})
+ 
+   string(REGEX MATCH "[0-9a-f]+  ${pgxfile}" output_var "${variable}")
+ 
++  # Search for variant md5sum for libtiff >= 4.1
++  string(REGEX MATCH "libtiff_4_1:[0-9a-f]+  ${pgxfile}" alternate_output_var 
"${variable}")
++
+   set(output "${output}  ${pgxfile}")
+ 
+   if("${output_var}" STREQUAL "${output}")
+ message(STATUS "equal: [${output_var}] vs [${output}]")
++  elseif("${alternate_output_var}" STREQUAL "libtiff_4_1:${output}")
++message(STATUS "equal: [${alternate_output_var}] vs 
[libtiff_4_1:${output}]")
+   else()
+ message(SEND_ERROR "not equal: [${output_var}] vs [${output}]")
+   endif()
+diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt
+index a33e82a12..95d3d74cb 100644
+--- a/tests/nonregression/md5refs.txt
 b/tests/nonregression/md5refs.txt
+@@ -180,6 +180,7 @@ dacaf60e4c430916a8c2a9ebec32e71c  issue458.jp2_3.pgx
+ d33fb5dbddb9b9b4438eb51fa27445a3  issue495.jp2_0.pgx
+ 27db8c35e12a5d5eb94d403d2aae2909  issue495.jp2_1.pgx
+ 97da625d2f2d0b75bf891d8083ce8bfb  issue495.jp2_2.pgx
++
+ 86729c5f2b74b2dfd42cb0d8e47aef79  a1_mono_tif-1.tif
+ fa9b7b896536b25a7a1d8eeeacb59141  a1_mono_tif-10.tif
+ e1f194f69d1c58ce8bed62cd4f1d5b6a  a1_mono_tif-11.tif
+@@ -196,6 +197,24 @@ de53251a33356e206a793fbdbaf90db2  a1_mono_tif-13.tif
+ e164a6c0219737ee05a3d55d6e3a3104  a1_mono_tif-7.tif
+ c3ebfcf478b1c4fc786748813f2b5d53  a1_mono_tif-8.tif
+ 67adb084f1fe234f240a1d0b2698507e  a1_mono_tif-9.tif
++
++libtiff_4_1:fc19057ff2d65c24daf9c9e25e34a48a  a1_mono_tif-1.tif
++libtiff_4_1:66246b6bbc83c06962f034235acb9924  a1_mono_tif-10.tif
++libtiff_4_1:ce1e07bdafe83a84a5df87fce2ffde6a  a1_mono_tif-11.tif
++libtiff_4_1:614f1ab59ca8473f5f8b1772b7a19d24  a1_mono_tif-12.tif
++libtiff_4_1:941bdcdf9103a22f7b6f66aaca3276d1  a1_mono_tif-13.tif
++libtiff_4_1:38df45296861df2b44879e8a0787d43c  a1_mono_tif-14.tif
++libtiff_4_1:387575ff38bed3d16891e1b2804e  a1_mono_tif-15.tif
++libtiff_4_1:ee4838fbd88ddcb73ef26df523a3bb5d  a1_mono_tif-16.tif
++libtiff_4_1:6de7e8cbd95e2c465b587f2273daf9dc  a1_mono_tif-2.tif
++libtiff_4_1:e1e026d7ed26e8f3334cf25a8884abbd  a1_mono_tif-3.tif
++libtiff_4_1:c120fac03d1b3756a2deb9b92ba519d4  a1_mono_tif-4.tif
++libtiff_4_1:3a7b84ed9061e0b13996660fc2910e8a  a1_mono_tif-5.tif
++libtiff_4_1:7ac8316261d54f22e6c847fbac01542b  a1_mono_tif-6.tif
++libtiff_4_1:d714670f6746931c4e7defbfbe38b249  a1_mono_tif-7.tif
++libtiff_4_1:b28f4b92be5e3481d44f50f2cd7626aa  a1_mono_tif-8.tif
++libtiff_4_1:2a12dcda3e9927384e7344c4ecabdcf1  a1_mono_tif-9.tif
++
+ 31650ec40241737634179fff6ad306f8  basn4a08_tif-1.tif
+ abf884080bcfbf58c044a9d86bfa5e5d  basn4a08_tif-10.tif
+ b0d82c12aa2c9b3ecd96c6a5b5663a8c  basn4a08_tif-11.tif
+@@ -212,6 +231,24 @@ fb5cf848d63c61dc485c87c9246ee9c7  basn4a08_tif-16.tif
+ 18a59ac6036ee64e92af19b7e3cd3d64  basn4a08_tif-7.tif
+ dc40cc1da6de28e7e973c8ba796ca189  basn4a08_tif-8.tif
+ 824b776a5aa3459b77894b5f77621311  basn4a08_tif-9.tif
++
++libtiff_4_1:4c50df5b25e006041b05e8a6fb77c95e  basn4a08_tif-1.tif
++libtiff_4_1:68cc9a9bc5f95474744d06ea4efb2cf3  basn4a08_tif-10.tif
++libtiff_4_1:f643c00bd0673c8f6092125e38759a35  basn4a08_tif-11.tif
++libtiff_4_1:cfcefece2fb08a437876d85941cdaa27  basn4a08_tif-12.t

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2020-03-25 Thread Thomas Deutschmann

commit: 26f7a380f84826f1b0b5510cd34e4f72894b5e8f
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sun Mar 22 01:56:44 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Mar 25 22:42:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f7a380

media-libs/openjpeg: Patch CVEs in SLOT:2

Uses upstream patches to fix CVE-2020-6851, CVE-2020-8112.

Bug: https://bugs.gentoo.org/707926
Signed-off-by: Sam James (sam_c)  cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/15049
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/openjpeg-2.3.1-CVE-2020-6851.patch   |  29 +
 .../files/openjpeg-2.3.1-CVE-2020-8112.patch   |  43 +++
 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild   | 135 +
 3 files changed, 207 insertions(+)

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch
new file mode 100644
index 000..9a70291f50e
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch
@@ -0,0 +1,29 @@
+From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Sat, 11 Jan 2020 01:51:19 +0100
+Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
+ coordinates are beyond INT_MAX (fixes #1228)
+
+---
+ src/lib/openjp2/j2k.c | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
+index 14f6ff41a..922550eb1 100644
+--- a/src/lib/openjp2/j2k.c
 b/src/lib/openjp2/j2k.c
+@@ -9221,6 +9221,14 @@ static OPJ_BOOL 
opj_j2k_update_image_dimensions(opj_image_t* p_image,
+ l_img_comp = p_image->comps;
+ for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
+ OPJ_INT32 l_h, l_w;
++if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
++p_image->y0 > (OPJ_UINT32)INT_MAX ||
++p_image->x1 > (OPJ_UINT32)INT_MAX ||
++p_image->y1 > (OPJ_UINT32)INT_MAX) {
++opj_event_msg(p_manager, EVT_ERROR,
++  "Image coordinates above INT_MAX are not 
supported\n");
++return OPJ_FALSE;
++}
+ 
+ l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
+  (OPJ_INT32)l_img_comp->dx);

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch
new file mode 100644
index 000..95cb8095f56
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch
@@ -0,0 +1,43 @@
+From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Thu, 30 Jan 2020 00:59:57 +0100
+Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
+
+That could lead to later assertion failures.
+
+Fixes #1231 / CVE-2020-8112
+---
+ src/lib/openjp2/tcd.c | 20 ++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
+index deecc4dff..aa419030a 100644
+--- a/src/lib/openjp2/tcd.c
 b/src/lib/openjp2/tcd.c
+@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t 
*p_tcd, OPJ_UINT32 p_tile_no,
+ /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+ l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, 
(OPJ_INT32)l_pdx) << l_pdx;
+ l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, 
(OPJ_INT32)l_pdy) << l_pdy;
+-l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) 
<< l_pdx;
+-l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) 
<< l_pdy;
++{
++OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
++  (OPJ_INT32)l_pdx)) << l_pdx;
++if (tmp > (OPJ_UINT32)INT_MAX) {
++opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
++return OPJ_FALSE;
++}
++l_br_prc_x_end = (OPJ_INT32)tmp;
++}
++{
++OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
++  (OPJ_INT32)l_pdy)) << l_pdy;
++if (tmp > (OPJ_UINT32)INT_MAX) {
++opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
++return OPJ_FALSE;
++}
++l_br_prc_y_end = (OPJ_INT32)tmp;
++}
+ /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, 
br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, 
l_br_prc_x_end ,l_br_prc_y_end );*/
+ 
+ l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((

diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
new file mode 100644
index 000..7f22db1cc92
--- /de

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/

2019-10-12 Thread David Seifert

commit: ef58e4bf1e89bb88381263c85ea4f55d9aae7efc
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Aug 21 18:24:49 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 12 10:18:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef58e4bf

media-libs/openjpeg: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12761
Signed-off-by: David Seifert  gentoo.org>

 .../openjpeg-2.3.0-fix-disable-static-libs.patch   |  23 -
 .../files/openjpeg-2.3.0-gnuinstalldirs.patch  | 501 -
 2 files changed, 524 deletions(-)

diff --git 
a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
deleted file mode 100644
index 9e30f4694f3..000
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Mon, 9 Oct 2017 11:40:43 +0200
-Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
- static-only build lacks the installation target for the library (#1019, fixes
- regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
-

- src/lib/openjp2/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index 0b4520384..f8990ccf0 100644
 a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -99,6 +99,7 @@ else()
- set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
-   else()
- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-+set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
-   endif()
- endif()
- 

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch
deleted file mode 100644
index 41942e45155..000
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,501 +0,0 @@
-From: Andreas Sturmlechner 
-Date: Fri, 2 Nov 2018 17:23:49 +0100
-Subject: Use GNUInstallDirs for standard installation directories
-
-Raises minimum cmake version by a little.
-
-
-commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97
-Author: Libor Bukata 
-Date:   Fri Aug 31 12:57:40 2018 +0200
-
-The change makes a relative path to header files
-always correct regardless of the number of sub-
-directories in OPENJPEG_INSTALL_PACKAGE_DIR variable.
-
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index b20294ca..2925108a 100644
 a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -26,8 +26,13 @@ get_filename_component(SELF_DIR 
"${CMAKE_CURRENT_LIST_FILE}" PATH)
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
--  get_filename_component(OPENJPEG_INCLUDE_ROOT 
"${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
--  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
-+
-+  # We find a relative path from the PKG directory to header files.
-+  set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
-+  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-+
-+  get_filename_component(OPENJPEG_INCLUDE_DIRS 
"${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
- 
- else()
-   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb545666..2ff3b00a 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
- # e.g.:
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
--cmake_minimum_required(VERSION 2.8.2)
-+cmake_minimum_required(VERSION 2.8.5)
- 
- if(COMMAND CMAKE_POLICY)
-   cmake_policy(SET CMP0003 NEW)
-@@ -102,59 +102,28 @@ endif()
- 
- # --
- # Install directories
-+include(GNUInstallDirs)
-+
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
- 
- string(TOLOWER ${PROJECT_NAME} projectname)
- set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
- 
--if(NOT OPENJPEG_INSTALL_BIN_DIR)
--  set(OPENJPEG_INSTALL_BIN_DIR "bin")
--endif()
--
--if(NOT OPENJPEG_INSTALL_LIB_DIR)
--  set(OPENJPEG_INSTALL_LIB_DIR "lib")
--endif()
--
--if(NOT OPENJPEG_INSTALL_SHARE_DIR)
--  set(OPENJPEG_INSTALL_SHARE_DIR "share")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DATA_DIR)
--  set(OPENJPEG_INSTALL_DATA_DIR 
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  set(OPENJPEG_

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-08-11 Thread Aaron Bauman

commit: 57c588138515718d3c3fb00bbeed28f8f26891ea
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Aug 11 21:54:43 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Aug 11 21:54:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c58813

media-libs/openjpeg: drop vulnerable wrt bug #646774

Signed-off-by: Aaron Bauman  gentoo.org>

 media-libs/openjpeg/Manifest |   2 -
 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 131 ---
 2 files changed, 133 deletions(-)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index cd6c971b736..1d294acdcfb 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,3 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 
936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1
 SHA512 
b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
-DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B 
b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508
 SHA512 
0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B 
ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9
 SHA512 
339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
-DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B 
ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0
 SHA512 
a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 
3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe
 SHA512 
32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
deleted file mode 100644
index cb02969ce24..000
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
-
-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_20170814.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="
-   media-libs/lcms:2
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   sys-libs/zlib"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-PATCHES=(
-   "${FILESDIR}/${P}-fix-disable-static-libs.patch" # bug 650322
-   "${FILESDIR}/${P}-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-utils_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=$(usex static-libs)
-   )
-
-   cmake-utils_src_configure
-}
-
-multilib_src_test() {
-   if ! multilib_is_native_abi ; then
-   elog "Cannot run tests for non-multilib abi."
-   return 0
-   fi
-
-   local myctestargs=
-
-   pushd "${BUILD_DIR}" > /dev/null || die
-   [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check 
source!"
-
-   [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose 
--output-on-fai

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-07-05 Thread Sergei Trofimovich

commit: 23cb9955f6ad17c319f09122bf80bceab0e2828c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Jul  5 15:18:15 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  5 15:43:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23cb9955

media-libs/openjpeg: stable 2.3.1 for hppa, bug #646774

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index fab3cb439ed..faf9ac61c7c 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-14 Thread Agostino Sarubbo

commit: e8963465a6204fb90601baabaef1ff0e0bb3fb19
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 14 08:59:48 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 14 08:59:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8963465

media-libs/openjpeg: alpha stable wrt bug #646774

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 7983d02eda3..fab3cb439ed 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-13 Thread Agostino Sarubbo

commit: 30cf17b9dcf59a07fd50d9a0ac2a81fb8765fd2a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 13 14:52:24 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 13 14:52:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30cf17b9

media-libs/openjpeg: ia64 stable wrt bug #646774

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 0b0ceaa88fc..7983d02eda3 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-13 Thread Agostino Sarubbo

commit: 7e8582f07cf53531ee984ea54b069f5f9e85403d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 13 14:31:08 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 13 14:31:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8582f0

media-libs/openjpeg: ppc64 stable wrt bug #646774

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index c5628ce6d47..0b0ceaa88fc 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-13 Thread Agostino Sarubbo

commit: 2ee4c71780332fc9a091e7d25867a6c5d972685b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 13 14:18:54 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 13 14:18:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee4c717

media-libs/openjpeg: ppc stable wrt bug #646774

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index ae9e5b84519..c5628ce6d47 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-13 Thread Agostino Sarubbo

commit: 91561183a304a4bd48a3db90fd5fcb2637552a20
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 13 14:17:29 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 13 14:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91561183

media-libs/openjpeg: s390 stable wrt bug #646774

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 276b5b6ba08..ae9e5b84519 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-13 Thread Agostino Sarubbo

commit: e1a1271f5db3ae87643fc47400de69feffaaaf2f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 13 14:11:46 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 13 14:11:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a1271f

media-libs/openjpeg: amd64 stable wrt bug #646774

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 50a879f60f2..276b5b6ba08 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-12 Thread Markus Meier

commit: 261e9a1adfc6396b18dc7b3ccfabf96d2ef4478a
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Jun 13 04:25:41 2019 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Jun 13 04:25:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261e9a1a

media-libs/openjpeg: arm stable, bug #646774

Signed-off-by: Markus Meier  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index b7f686a688a..50a879f60f2 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-11 Thread Sergei Trofimovich

commit: 7e6f61fea82e21ce644070bbd6b7065396dac41b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jun 11 19:08:20 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jun 11 22:15:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6f61fe

media-libs/openjpeg: stable 2.3.1 for sparc, bug #646774

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 58a6fc46fbd..b7f686a688a 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-10 Thread Aaron Bauman

commit: 9b15c576a0205726ce9157df35999257bb19dd63
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Jun 11 02:22:48 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jun 11 02:22:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b15c576

media-libs/openjpeg: arm64 stable (bug #646774)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.14
RepoMan-Options: --include-arches="arm64"

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 2bd15d808aa..58a6fc46fbd 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-06-10 Thread Thomas Deutschmann

commit: a6ff59ffa1532c3a458f87ccf600552ac187ba51
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jun 10 19:47:08 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jun 10 19:50:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ff59ff

media-libs/openjpeg: x86 stable (bug #646774)

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index 9140607a0a3..2bd15d808aa 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-04-11 Thread Lars Wendler

commit: 14cd31a76048c49927ab3c172c57f37e6ce137f5
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 11 11:39:17 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 11 11:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cd31a7

media-libs/openjpeg: Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0.ebuild | 135 --
 1 file changed, 135 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
deleted file mode 100644
index e447db85d6a..000
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
-
-DESCRIPTION="An 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_20170814.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=
-   media-libs/libpng:0=
-   media-libs/tiff:0=
-   sys-libs/zlib:="
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-src_prepare() {
-   if use test; then
-   mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} 
"${WORKDIR}"/data || die "Failed to rename test data"
-   fi
-
-   cmake-utils_src_prepare
-
-   # Stop installing LICENSE file, and install CHANGES from DOCS instead:
-   sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' 
CMakeLists.txt || die
-
-   # Install doxygen docs to the right directory:
-   sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || 
die
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-   -DBUILD_TESTING="$(multilib_native_usex test)"
-   -DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-   -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-   )
-
-   cmake-utils_src_configure
-
-   if use static-libs; then
-   mycmakeargs=(
-   -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-   -DBUILD_TESTING="$(usex test)"
-   -DBUILD_CODEC="$(usex test)"
-   )
-   BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-   fi
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-
-   if use static-libs; then
-   BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-   fi
-}
-
-multilib_src_test() {
-   if ! multilib_is_native_abi ; then
-   elog "Cannot run tests for non-multilib abi."
-   return 0
-   fi
-
-   local myctestargs=
-
-   pushd "${BUILD_DIR}" > /dev/null || die
-   [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check 
source!"
-
-   [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose 
--output-on-failure )
-
-   echo ctest "${myctestargs[@]}" "$@"
-   if ctest "${myctestargs[@]}" "$@" ; then
-   einfo "Tests succeeded."
-   popd > /dev/null || die
-   return 0
-   else
-   echo ""
-   einfo "Note: Upstream is maintaining a list of known test 
failures."
-   einfo "We will now compare our test results against this list 
and sort out any known failure."
-
-   local 
KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-   local 
FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-   local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-   local FAILEDTEST=
-   local HAS_UNKNOWN_TEST_FAILURES=0
-   if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; 
then
-   # Logic copied from $S/tools/travis-ci/run.sh
-
-   echo ""
-
-   awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > 
"${FAILURES_LOG}"
-   while read FAILEDTEST; do
-   # Common errors
-   if grep -x "${FAILEDTEST}" 
"${S}/too

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/, media-libs/openjpeg/

2019-04-11 Thread Lars Wendler

commit: 1300f5f73c69b5d2e0352cdb0a5f8f5e169e0723
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 11 10:47:25 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 11 11:40:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1300f5f7

media-libs/openjpeg: Bump to version 2.3.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/openjpeg/Manifest   |   2 +
 .../files/openjpeg-2.3.1-gnuinstalldirs.patch  | 495 +
 media-libs/openjpeg/openjpeg-2.3.1.ebuild  | 131 ++
 3 files changed, 628 insertions(+)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 62efea271dd..cd6c971b736 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,3 +1,5 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 
936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1
 SHA512 
b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B 
b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508
 SHA512 
0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
+DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B 
ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9
 SHA512 
339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B 
ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0
 SHA512 
a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
+DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 
3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe
 SHA512 
32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507

diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
new file mode 100644
index 000..b0b2666c722
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -0,0 +1,495 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+---
+ CMakeLists.txt   | 61 +---
+ cmake/OpenJPEGConfig.cmake.in|  2 +-
+ doc/CMakeLists.txt   |  2 +-
+ src/bin/jp2/CMakeLists.txt   |  4 +-
+ src/bin/jp3d/CMakeLists.txt  |  2 +-
+ src/bin/jpip/CMakeLists.txt  | 10 ++--
+ src/bin/jpwl/CMakeLists.txt  |  2 +-
+ src/bin/mj2/CMakeLists.txt   |  2 +-
+ src/lib/openjp2/CMakeLists.txt   | 12 ++---
+ src/lib/openjp2/libopenjp2.pc.cmake.in   | 10 ++--
+ src/lib/openjp3d/CMakeLists.txt  |  4 +-
+ src/lib/openjp3d/libopenjp3d.pc.cmake.in | 10 ++--
+ src/lib/openjpip/CMakeLists.txt  |  8 ++--
+ src/lib/openjpip/libopenjpip.pc.cmake.in | 10 ++--
+ src/lib/openjpwl/CMakeLists.txt  |  6 +--
+ src/lib/openjpwl/libopenjpwl.pc.cmake.in | 10 ++--
+ src/lib/openmj2/CMakeLists.txt   |  4 +-
+ wrapping/java/openjp2/CMakeLists.txt |  2 +-
+ 18 files changed, 61 insertions(+), 100 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ea2424a..1f70226a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever 
you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -103,59 +103,28 @@ endif()
+ 
+ # --
+ # Install directories
++include(GNUInstallDirs)
++
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." 
OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR 
"${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-en

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-01-29 Thread Mikle Kolyada

commit: 410a7f1a83603f81b66a523a6d656640fd3b75ae
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Jan 29 11:53:33 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Jan 29 11:53:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410a7f1a

media-libs/openjpeg: s390 stable wrt bug #659828

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index f292e53179e..cb02969ce24 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-01-17 Thread Sergei Trofimovich

commit: c18ace421f752eac9022c79acce8d53219121ea5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan 17 23:14:34 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jan 17 23:14:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18ace42

media-libs/openjpeg: stable 2.3.0-r1 for ppc/ppc64, bug #659828

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.56, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index e64e6fcf028..f292e53179e 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-01-03 Thread Mart Raudsepp

commit: 90c77a0df562519538ecc4785269603cea859a93
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Jan  4 00:43:49 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Jan  4 00:43:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c77a0d

media-libs/openjpeg: arm64 stable (bug #659828)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index 55be8032518..e64e6fcf028 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2019-01-02 Thread Markus Meier

commit: 3efc63c0710ae0755146a7a84960795c4a12143b
Author: Markus Meier  gentoo  org>
AuthorDate: Wed Jan  2 12:13:37 2019 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed Jan  2 12:13:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efc63c0

media-libs/openjpeg: arm stable, bug #659828

Signed-off-by: Markus Meier  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index b28122418d8..55be8032518 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-30 Thread Matt Turner

commit: 80d98ff1ac8250dcd9350afe8c975a4a9c1b408f
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Dec 30 22:15:35 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec 30 22:16:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d98ff1

media-libs/openjpeg-2.3.0-r1: hppa stable, bug 659828

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index 998d52d9e1a..b28122418d8 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-28 Thread Mikle Kolyada

commit: f49c008b0e85618d47a58e2c40844fccdbba4af1
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec 28 08:13:29 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec 28 08:13:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49c008b

media-libs/openjpeg: amd64 stable wrt bug #659828

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index 7949e3a920a..998d52d9e1a 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-27 Thread Fabian Groffen

commit: 06ee1612931cb76bbf7ad0eb6df28427a3977b44
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec 27 18:28:07 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec 27 18:48:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ee1612

media-libs/openjpeg: added prefix keywords, bug #667266

Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index 3564cee241e..7949e3a920a 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-26 Thread Matt Turner

commit: 2169fc55a9dd4ac7a65c7d84e7f6beddc84b1d00
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Dec 26 17:23:05 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Dec 26 17:23:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2169fc55

media-libs/openjpeg-2.3.0-r1: alpha stable, bug 659828

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index bac0e1d4ca4..3564cee241e 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-26 Thread Sergei Trofimovich

commit: 8d7a6992ba879cc4fffc8212dc52409f09c9ef9e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Dec 26 11:46:29 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Dec 26 11:46:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d7a6992

media-libs/openjpeg: stable 2.3.0-r1 for ia64, bug #659828

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index a62837011f3..bac0e1d4ca4 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-25 Thread Sergei Trofimovich

commit: 71ce9fe387e0341062749a9f619fb15605efe97b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Dec 25 10:54:49 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Dec 25 11:11:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ce9fe3

media-libs/openjpeg: stable 2.3.0-r1 for sparc, bug #659828

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index 19efa380456..a62837011f3 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-19 Thread Thomas Deutschmann

commit: 5e7cfa2e1809e6f11815c8360a17f6517b0b521e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Dec 20 01:24:28 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Dec 20 01:29:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7cfa2e

media-libs/openjpeg: x86 stable (bug #659828)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index d707632ac09..19efa380456 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

2018-12-19 Thread Thomas Deutschmann

commit: 6bfd73a8952c21351d8d061a5ae82bda24d00205
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Dec 20 00:59:54 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Dec 20 01:06:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bfd73a8

media-libs/openjpeg: check against known architecture specific failures

Bug: https://bugs.gentoo.org/628430
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 65 ++--
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index 8d15446c08e..d707632ac09 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -74,39 +74,58 @@ multilib_src_test() {
popd > /dev/null || die
return 0
else
+   local 
FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
+
+   if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
+   # Should never happen
+   die "Cannot analyze test failures: LastTestsFailed.log 
is missing!"
+   fi
+
echo ""
einfo "Note: Upstream is maintaining a list of known test 
failures."
einfo "We will now compare our test results against this list 
and sort out any known failure."
 
-   local 
KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-   local 
FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-   local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
+   local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
+   cat "${S}/tools/travis-ci/knownfailures-all.txt" > 
"${KNOWN_FAILURES_LIST}" || die
+
+   local ARCH_SPECIFIC_FAILURES=
+   if use amd64 ; then
+   ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" 
-name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d 
'\0')"
+   elif use x86 || use arm || use arm64; then
+   ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" 
-name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+   fi
+
+   if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
+   einfo "Adding architecture specific failures 
(${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
+   cat "${ARCH_SPECIFIC_FAILURES}" >> 
"${KNOWN_FAILURES_LIST}" || die
+   fi
+
+   # Logic copied from $S/tools/travis-ci/run.sh
local FAILEDTEST=
+   local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
local HAS_UNKNOWN_TEST_FAILURES=0
-   if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; 
then
-   # Logic copied from $S/tools/travis-ci/run.sh
 
-   echo ""
+   echo ""
 
-   awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > 
"${FAILURES_LOG}"
-   while read FAILEDTEST; do
-   # Common errors
-   if grep -x "${FAILEDTEST}" 
"${S}/tools/travis-ci/knownfailures-all.txt" > /dev/null; then
-   ewarn "Test '${FAILEDTEST}' is known to 
fail, ignoring ..."
-   continue
-   fi
-   eerror "New/unknown test failure found: 
'${FAILEDTEST}'"
-   HAS_UNKNOWN_TEST_FAILURES=1
-   done < "${FAILURES_LOG}"
-
-   if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-   die "Test suite failed. New/unknown test 
failure(s) found!"
-   else
-   echo ""
-   einfo "Test suite passed. No new/unknown test 
failure(s) found!"
+   awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
+   while read FAILEDTEST; do
+   # is this failure known?
+   if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > 
/dev/null; then
+   ewarn "Test '${FAILEDTEST}' is known to fail, 
ignoring ..."
+   continue
fi
 
-   return 0
+   eerror "New/unknown test failure found: '${FAILEDTEST}'"
+   HAS_UNKNOWN_TEST_FAILURES=1
+   done < "${FAILURES_LOG}"
+
+   if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
+   die "Test suite failed. New/unk

[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/

2018-11-03 Thread Andreas Sturmlechner

commit: 6c8b95f0ffa4570543e8c10e594584db64e1541a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov  3 21:04:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov  3 21:30:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8b95f0

media-libs/openjpeg: Fix USE static-libs

Bug: https://bugs.gentoo.org/634144
Bug: https://bugs.gentoo.org/650322
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../openjpeg-2.3.0-fix-disable-static-libs.patch   |  23 
 media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild   | 117 +
 2 files changed, 140 insertions(+)

diff --git 
a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch 
b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
new file mode 100644
index 000..9e30f4694f3
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
@@ -0,0 +1,23 @@
+From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Mon, 9 Oct 2017 11:40:43 +0200
+Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
+ static-only build lacks the installation target for the library (#1019, fixes
+ regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
+
+---
+ src/lib/openjp2/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
+index 0b4520384..f8990ccf0 100644
+--- a/src/lib/openjp2/CMakeLists.txt
 b/src/lib/openjp2/CMakeLists.txt
+@@ -99,6 +99,7 @@ else()
+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
+   else()
+ add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
+   endif()
+ endif()
+ 

diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild 
b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
new file mode 100644
index 000..d0f7f1e15ff
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
+
+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_20170814.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+RDEPEND="
+   media-libs/lcms:2
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   sys-libs/zlib"
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+PATCHES=(
+   "${FILESDIR}/${P}-fix-disable-static-libs.patch" # bug 650322
+)
+
+src_prepare() {
+   if use test; then
+   mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} 
"${WORKDIR}"/data ||
+   die "Failed to rename test data"
+   fi
+
+   cmake-utils_src_prepare
+
+   # Stop installing LICENSE file, and install CHANGES from DOCS instead:
+   sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' 
CMakeLists.txt || die
+
+   # Install doxygen docs to the right directory:
+   sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || 
die
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
+   -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=$(usex static-libs)
+   )
+
+   cmake-utils_src_configure
+}
+
+multilib_src_test() {
+   if ! multilib_is_native_abi ; then
+   elog "Cannot run tests for non-multilib abi."
+   return 0
+   fi
+
+   local myctestargs=
+
+   pushd "${BUILD_DIR}" > /dev/null || die
+   [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check 
source!"
+
+   [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose 
--output-on-failure )
+
+   echo ctest "${myctestargs[@]}" "$@"
+   if ctest "${myctestargs[@]}" "$@" ; then
+   einfo "Tests succeeded."
+   popd > /dev/null || die
+   return 0
+   else
+

1 2 >

1 - 100 of 155 matches

Mail list logo