[arch-commits] Commit in openjpeg2/trunk (PKGBUILD openjpeg2_install.patch)

[Andreas Radke]

    Date: Wednesday, August 8, 2018 @ 18:21:07
  Author: andyrtr
Revision: 331253

upgpkg: openjpeg2 2.3.0-3

fix cmake targets - FS#59511

Added:
  openjpeg2/trunk/openjpeg2_install.patch
Modified:
  openjpeg2/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   12 +++++++++---
 openjpeg2_install.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-08 17:59:14 UTC (rev 331252)
+++ PKGBUILD	2018-08-08 18:21:07 UTC (rev 331253)
@@ -4,7 +4,7 @@
 
 pkgname=openjpeg2
 pkgver=2.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
 arch=(x86_64)
 license=('custom: BSD')
@@ -13,8 +13,10 @@
 makedepends=('cmake' 'doxygen')
              #'fcgi' 'xerces2-java')
 depends=('zlib' 'libpng' 'libtiff' 'lcms2')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz")
-sha256sums=('3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz"
+        openjpeg2_install.patch)
+sha256sums=('3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a'
+            '3196676a215f2c2921928b992ff8df1e76c616b8bdc8e5f84c0552db8c327239')
 
 prepare() {
   cd ${srcdir}
@@ -24,6 +26,8 @@
   
   # Install doxygen docs to the right directory
   sed -i -e "s:DESTINATION\ share/doc:DESTINATION\ share/doc/${pkgname}:" openjpeg-${pkgver}/doc/CMakeLists.txt
+
+  patch -Np0 -i openjpeg2_install.patch
 }
 
 build() {
@@ -38,6 +42,8 @@
   cmake "../openjpeg-${pkgver}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_STATIC_LIBS=OFF \
     -DBUILD_DOC=on
 
 #    -DBUILD_MJ2=ON \

Added: openjpeg2_install.patch
===================================================================
--- openjpeg2_install.patch	                        (rev 0)
+++ openjpeg2_install.patch	2018-08-08 18:21:07 UTC (rev 331253)
@@ -0,0 +1,12 @@
+diff -rupN openjpeg-2.3.0/src/lib/openjp2/CMakeLists.txt openjpeg-2.3.0-new/src/lib/openjp2/CMakeLists.txt
+--- openjpeg-2.3.0/src/lib/openjp2/CMakeLists.txt	2017-10-05 00:23:14.000000000 +0200
++++ openjpeg-2.3.0-new/src/lib/openjp2/CMakeLists.txt	2017-12-25 13:53:07.000000000 +0100
+@@ -99,6 +99,7 @@ else()
+     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
+   else()
+     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
+   endif()
+ endif()
+ 
+