summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md12
-rw-r--r--CMakeLists.txt3
-rw-r--r--NEWS.md6
-rw-r--r--appveyor.yml2
4 files changed, 21 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52377888..54aeb155 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## [v2.5.2](https://github.com/uclouvain/openjpeg/releases/v2.5.2) (2024-02-28)
+
+[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.5.1...v2.5.2)
+
+**Closed issues:**
+
+- API breakage in 2.5.1 / openjpeg version no longer detected \(openjpeg.h no longer includes opj\_config.h\) [\#1514](https://github.com/uclouvain/openjpeg/issues/1514)
+
+**Merged pull requests:**
+
+- openjpeg.h: make sure to include opj\_config.h \(fixes \#1514\) [\#1515](https://github.com/uclouvain/openjpeg/pull/1515) ([rouault](https://github.com/rouault))
+
## [v2.5.1](https://github.com/uclouvain/openjpeg/releases/v2.5.1) (2024-02-26)
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.5.0...v2.5.1)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 127d34f0..65570b44 100644
--- a/CMakeLists.txt
+++ b/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 1)
+set(OPENJPEG_VERSION_BUILD 2)
set(OPENJPEG_VERSION
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
set(PACKAGE_VERSION
@@ -53,6 +53,7 @@ set(PACKAGE_VERSION
# 2.4.0 | 7
# 2.5.0 | 7
# 2.5.1 | 7
+# 2.5.2 | 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
diff --git a/NEWS.md b/NEWS.md
index 5f9b11fa..20e9184a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,12 @@
More details in the [CHANGELOG](https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md)
+## OpenJPEG 2.5.2 (Feb 2024)
+
+No API/ABI break compared to v2.5.1
+
+* Make sure openjpeg.h includes opj_config.h [\#1514](https://github.com/uclouvain/openjpeg/issues/1514)
+
## OpenJPEG 2.5.1 (Feb 2024)
No API/ABI break compared to v2.5.0
diff --git a/appveyor.yml b/appveyor.yml
index 744226eb..a177ee7c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.5.1.{build}
+version: 2.5.2.{build}
branches:
except:
- coverity_scan