From 1fdb7bbe1da707257e5cb5a370ffe6e247451a1d Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Tue, 5 Jan 2021 02:58:52 +0800
Subject: [PATCH 1/2] [patch tracking] 20210105025849759401 -
 https://github.com/uclouvain/openjpeg/commit/0782cd075d7e9678bf1cb448c1f3d048fabe4489

---
 ...cd075d7e9678bf1cb448c1f3d048fabe4489.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 0782cd075d7e9678bf1cb448c1f3d048fabe4489.patch

diff --git a/0782cd075d7e9678bf1cb448c1f3d048fabe4489.patch b/0782cd075d7e9678bf1cb448c1f3d048fabe4489.patch
new file mode 100644
index 0000000..ed0d19f
--- /dev/null
+++ b/0782cd075d7e9678bf1cb448c1f3d048fabe4489.patch
@@ -0,0 +1,26 @@
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index c634cba35..a215d18df 100644
+--- a/thirdparty/CMakeLists.txt
++++ b/thirdparty/CMakeLists.txt
+@@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY)
+   set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
+ else(BUILD_THIRDPARTY)
+   find_package(LCMS2)
++  # Static only build:
++  #   it is necessary to invoke pkg_check_module on lcms2 since it may have
++  #   several other dependencies not declared by its cmake module, but they are
++  #   in the its pkgconfig module.
++  if(PKG_CONFIG_FOUND)
++    pkg_check_modules(PC_LCMS2 QUIET lcms2)
++  endif(PKG_CONFIG_FOUND)
+   if(LCMS2_FOUND)
+     message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
+     set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
+     set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
+-    set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
+-    set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
++    set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE)
++    set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
+   else(LCMS2_FOUND) # not found lcms2
+     # try to find LCMS
+     find_package(LCMS)
-- 
Gitee


From e64731721d0e3e8ad532b5040f905ec5a7c810a7 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Tue, 5 Jan 2021 02:58:52 +0800
Subject: [PATCH 2/2] [patch tracking] 20210105025849759401 - update spec file

---
 openjpeg2.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openjpeg2.spec b/openjpeg2.spec
index e4f0659..15ed296 100644
--- a/openjpeg2.spec
+++ b/openjpeg2.spec
@@ -1,6 +1,6 @@
 Name:           openjpeg2
 Version:        2.3.1
-Release:        3
+Release:        4
 Summary:        C-Library for JPEG 2000
 License:        BSD and MIT
 URL:            https://github.com/uclouvain/openjpeg
@@ -12,6 +12,7 @@ Patch1:         openjpeg2_opj2.patch
 Patch6000:	CVE-2016-10505.patch
 Patch6001:	CVE-2016-7445.patch
 Patch6002:      CVE-2020-15389.patch
+Patch6003: 0782cd075d7e9678bf1cb448c1f3d048fabe4489.patch
 
 BuildRequires:  cmake gcc-c++ make zlib-devel libpng-devel libtiff-devel lcms2-devel doxygen
 
@@ -87,6 +88,9 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump.
 %{_mandir}/man3/*.3*
 
 %changelog
+* 20210105025849759401 patch-tracking 2.3.1-4
+- append patch file of upstream repository from <0782cd075d7e9678bf1cb448c1f3d048fabe4489> to <0782cd075d7e9678bf1cb448c1f3d048fabe4489>
+
 * Sat Jul 25 2020 zhangnaru <zhangnaru@huawei.com> -2.3.1-3
 - fix CVE-2020-15389 
 
@@ -94,4 +98,4 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump.
 - fix CVE-2016-10505 and CVE-2016-7445
 
 * Thu Sep 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.1-1
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee