Merge pull request uclouvain#1594 from rouault/bump_cmake_min_req

Bump cmake_minimum_required() in thirdparty/ and tools/ctest_scripts/travis-ci.cmake

Author: rouault

.github/workflows/build.yml

@@ -152,19 +152,19 @@ jobs:
           files: build/openjpeg-*.zip
 
   windows_build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
 
     strategy:
       matrix:
         include:
-          - VS_VER: 2019
+          - VS_VER: 2022
             OPJ_CI_ARCH: x64
             OPJ_CI_INCLUDE_IF_DEPLOY: 1
-          - VS_VER: 2019
+          - VS_VER: 2022
             OPJ_CI_ARCH: x86
             OPJ_CI_INCLUDE_IF_DEPLOY: 1
-          - VS_VER: 2019
+          - VS_VER: 2022
             OPJ_CI_ARCH: x64
             # We do have specific failures noted in tools/travis-ci/knownfailures-windows-vs2015-x64-avx2-Release-3rdP.txt
             # not sure why that happens
@@ -190,7 +190,7 @@ jobs:
       - name: Set compiler environment
         shell: cmd
         run: |
-            if "%VS_VER%" == "2019" CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%OPJ_CI_ARCH%
+            if "%VS_VER%" == "2022" CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%OPJ_CI_ARCH%
             echo PATH=%PATH%>> %GITHUB_ENV%
             echo INCLUDE=%INCLUDE%>> %GITHUB_ENV%
             echo LIB=%LIB%>> %GITHUB_ENV%

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v2.5.4](https://github.com/uclouvain/openjpeg/releases/v2.5.4) (2025-09-20)
+
+[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.5.3...v2.5.4)
+
+**Closed issues:**
+
+- CMake configure warning with CMake 3.30 and newer [\#1579](https://github.com/uclouvain/openjpeg/issues/1579)
+
+**Merged pull requests:**
+
+- pkgconfig: drop unused libraries from `Libs.private` [\#1591](https://github.com/uclouvain/openjpeg/pull/1591) ([bgilbert](https://github.com/bgilbert))
+- Fix CMake warning: Compatibility with CMake \< 3.10 will be removed [\#1580](https://github.com/uclouvain/openjpeg/pull/1580) ([dzenanz](https://github.com/dzenanz))
+- code documentation updates [\#1576](https://github.com/uclouvain/openjpeg/pull/1576) ([weanti](https://github.com/weanti))
+- Fixed ICC profile copy failure on write [\#1574](https://github.com/uclouvain/openjpeg/pull/1574) ([mircomir](https://github.com/mircomir))
+- opj\_jp2\_read\_header: Check for error after parsing header. [\#1573](https://github.com/uclouvain/openjpeg/pull/1573) ([sebras](https://github.com/sebras)) (CVE-2025-54874)
+
 ## [v2.5.3](https://github.com/uclouvain/openjpeg/releases/v2.5.3) (2024-12-09)
 
 [Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.5.2...v2.5.3)

CMakeLists.txt

@@ -26,7 +26,7 @@ include_regular_expression("^.*$")
 # OPENJPEG version number, useful for packaging and doxygen doc:
 set(OPENJPEG_VERSION_MAJOR 2)
 set(OPENJPEG_VERSION_MINOR 5)
-set(OPENJPEG_VERSION_BUILD 3)
+set(OPENJPEG_VERSION_BUILD 4)
 set(OPENJPEG_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
 set(PACKAGE_VERSION
@@ -55,6 +55,7 @@ set(PACKAGE_VERSION
 #   2.5.1 |  7
 #   2.5.2 |  7
 #   2.5.3 |  7
+#   2.5.4 |  7
 # above is the recommendation by the OPJ team. If you really need to override this default,
 # you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
 # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg

NEWS.md

@@ -2,6 +2,17 @@
 
 More details in the [CHANGELOG](https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md)
 
+## OpenJPEG 2.5.4 (Sept 2025)
+
+No API/ABI break compared to v2.5.3
+
+### Bug fixes
+
+* opj\_jp2\_read\_header: Check for error after parsing header. [\#1573](https://github.com/uclouvain/openjpeg/pull/1573)
+* pkgconfig: drop unused libraries from `Libs.private` [\#1591](https://github.com/uclouvain/openjpeg/pull/1591)
+* Fix CMake warning: Compatibility with CMake \< 3.10 will be removed [\#1580](https://github.com/uclouvain/openjpeg/pull/1580)
+* Fixed ICC profile copy failure on write [\#1574](https://github.com/uclouvain/openjpeg/pull/1574)
+
 ## OpenJPEG 2.5.3 (Dec 2024)
 
 No API/ABI break compared to v2.5.2

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.5.3.{build}
+version: 2.5.4.{build}
 branches:
   except:
   - coverity_scan

thirdparty/libtiff/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.5)
 set(CMAKE_C_STANDARD 99)
 project(libtiff C)
 

thirdparty/libz/CMakeLists.txt

@@ -1,6 +1,6 @@
 #based on zlib-1.2.5/CMakeLists.txt
 #
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.5)
 
 project(zlib C)
 

tools/ctest_scripts/travis-ci.cmake

@@ -4,7 +4,7 @@
 # Results will be available at: http://my.cdash.org/index.php?project=OPENJPEG
 # -----------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...3.31.5)
 
 set( ENV{LANG} en_US.UTF-8)
 if($ENV{OPJ_BINARY_DIR})