diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2016-11-14 23:58:30 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-11-14 23:47:38 +0100 |
| commit | 2775276135b3c8d06084c97e6195bc310bc432bf (patch) | |
| tree | 3d3e51ffc7651b777ee635f096adb01c14e55fb5 /package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch | |
| parent | d3f0d52144f27097bba225bdb2a3b1620d44ab5a (diff) | |
| download | buildroot-2775276135b3c8d06084c97e6195bc310bc432bf.tar.gz buildroot-2775276135b3c8d06084c97e6195bc310bc432bf.zip | |
openjpeg: refresh patches
The 2.1.2 version bump did not take into account the recently added fixes.
Update the patches to apply based on upstream pull requests #866 and #867.
Cc: Peter Seiderer <ps.report@gmx.net>
Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch')
| -rw-r--r-- | package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch index 4366c0af88..5697b82de2 100644 --- a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch +++ b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch @@ -7,9 +7,11 @@ Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if This change allows to get all required CFLAGS/LDFLAGS in case of static only build. -Fixes a buildroot build failure (see [1]). +Fixes a buildroot build failure (see [1], [2] and [3]). [1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 +[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html +[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- @@ -17,31 +19,31 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net> 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 225f51d..42770ad 100644 +index cd6a5e1391b0..a3a8494d89b1 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) +@@ -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) ++ if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_LCMS2 QUIET lcms2) -+ ENDIF(PKG_CONFIG_FOUND) - IF(LCMS2_FOUND) ++ 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 + 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) + find_package(LCMS) -- -2.8.1 +2.10.2 |
