1diff -u CMakeLists.txt.orig CMakeLists.txt
2--- CMakeLists.txt.orig
3+++ CMakeLists.txt
4@@ -141,6 +141,17 @@
5                     set(HAVE_LIBJP2K 1)
6                 endif()
7             endif()
8+            if(NOT JP2K)
9+                find_path(JP2K_INCLUDE_DIR /openjpeg-2.5/openjpeg.h)
10+                find_library(JP2K_LIBRARY NAMES openjp2)
11+                if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY)
12+                    set(JP2K 1)
13+                    set(JP2K_FOUND TRUE)
14+                    set(JP2K_LIBRARIES ${JP2K_LIBRARY})
15+                    set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR})
16+                    set(HAVE_LIBJP2K 1)
17+                endif()
18+            endif()
19             set(libs_private "${libs_private} -lopenjp2")
20         endif()
21     endif()
22diff -u cmake/Configure.cmake.orig cmake/Configure.cmake
23--- cmake/Configure.cmake.orig
24+++ cmake/Configure.cmake
25@@ -69,6 +69,7 @@
26     openjpeg-2.2/openjpeg.h
27     openjpeg-2.3/openjpeg.h
28     openjpeg-2.4/openjpeg.h
29+    openjpeg-2.5/openjpeg.h
30 )
31 check_includes(include_files_list)
32
33@@ -146,7 +147,9 @@
34 /* Define to 1 if you have zlib. */
35 #cmakedefine HAVE_LIBZ 1
36
37-#if defined(HAVE_OPENJPEG_2_4_OPENJPEG_H)
38+#if defined(HAVE_OPENJPEG_2_5_OPENJPEG_H)
39+#define LIBJP2K_HEADER <openjpeg-2.5/openjpeg.h>
40+#elif defined(HAVE_OPENJPEG_2_4_OPENJPEG_H)
41 #define LIBJP2K_HEADER <openjpeg-2.4/openjpeg.h>
42 #elif defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
43 #define LIBJP2K_HEADER <openjpeg-2.3/openjpeg.h>
44diff -u config/config.h.in.orig config/config.h.in
45--- config/config.h.in.orig
46+++ config/config.h.in
47@@ -51,6 +51,12 @@
48 /* Define to 1 if you have the <openjpeg-2.3/openjpeg.h> header file. */
49 #undef HAVE_OPENJPEG_2_3_OPENJPEG_H
50
51+/* Define to 1 if you have the <openjpeg-2.4/openjpeg.h> header file. */
52+#undef HAVE_OPENJPEG_2_4_OPENJPEG_H
53+
54+/* Define to 1 if you have the <openjpeg-2.5/openjpeg.h> header file. */
55+#undef HAVE_OPENJPEG_2_5_OPENJPEG_H
56+
57 /* Define to 1 if you have the <stdint.h> header file. */
58 #undef HAVE_STDINT_H
59
60