commit: b26907becc0693a707999a082c61a8b9b95628d5 Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz> AuthorDate: Sun Feb 22 12:59:50 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 14 19:00:36 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26907be
media-libs/openjpeg: increase cmake_minimum_required Patch merged upstream, backported here to 2.5.4. Closes: https://bugs.gentoo.org/964470 Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz> Part-of: https://codeberg.org/gentoo/gentoo/pulls/113 Merges: https://codeberg.org/gentoo/gentoo/pulls/113 Signed-off-by: Sam James <sam <AT> gentoo.org> .../openjpeg/files/openjpeg-2.5.4-cmake4.patch | 21 +++++++++++++++++++++ media-libs/openjpeg/openjpeg-2.5.4.ebuild | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/media-libs/openjpeg/files/openjpeg-2.5.4-cmake4.patch b/media-libs/openjpeg/files/openjpeg-2.5.4-cmake4.patch new file mode 100644 index 000000000000..3a469b7d101e --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-2.5.4-cmake4.patch @@ -0,0 +1,21 @@ +See https://github.com/uclouvain/openjpeg/commit/8ac526236416b9c28f73d4684cf9e8a66f1d134e +--- 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 3.5...3.31.5) ++cmake_minimum_required(VERSION 3.10...3.31.5) + + if(NOT OPENJPEG_NAMESPACE) + set(OPENJPEG_NAMESPACE "OPENJPEG") +--- a/tests/nonregression/CMakeLists.txt ++++ b/tests/nonregression/CMakeLists.txt +@@ -1,6 +1,6 @@ + # NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression + +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.10) + + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary) diff --git a/media-libs/openjpeg/openjpeg-2.5.4.ebuild b/media-libs/openjpeg/openjpeg-2.5.4.ebuild index 102211046c72..dc04f1888a6e 100644 --- a/media-libs/openjpeg/openjpeg-2.5.4.ebuild +++ b/media-libs/openjpeg/openjpeg-2.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,8 @@ BDEPEND="doc? ( app-text/doxygen )" DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) +PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) + src_prepare() { if use test; then mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
