[arch-commits] Commit in openjpeg2/repos/extra-x86_64 (3 files)

[Andreas Radke]

    Date: Wednesday, August 8, 2018 @ 18:21:16
  Author: andyrtr
Revision: 331254

archrelease: copy trunk to extra-x86_64

Added:
  openjpeg2/repos/extra-x86_64/PKGBUILD
    (from rev 331253, openjpeg2/trunk/PKGBUILD)
  openjpeg2/repos/extra-x86_64/openjpeg2_install.patch
    (from rev 331253, openjpeg2/trunk/openjpeg2_install.patch)
Deleted:
  openjpeg2/repos/extra-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |  124 ++++++++++++++++++++++++----------------------
 openjpeg2_install.patch |   12 ++++
 2 files changed, 77 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-08 18:21:07 UTC (rev 331253)
+++ PKGBUILD	2018-08-08 18:21:16 UTC (rev 331254)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=openjpeg2
-pkgver=2.3.0
-pkgrel=2
-pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
-arch=(x86_64)
-license=('custom: BSD')
-#url="http://www.openjpeg.org"
-url="https://github.com/uclouvain/openjpeg"
-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')
-
-prepare() {
-  cd ${srcdir}
-  mkdir build
-  # remove thirdparty libs
-#  sed -i '/add_subdirectory(thirdparty)/d' openjpeg-${pkgver}/CMakeLists.txt
-  
-  # Install doxygen docs to the right directory
-  sed -i -e "s:DESTINATION\ share/doc:DESTINATION\ share/doc/${pkgname}:" openjpeg-${pkgver}/doc/CMakeLists.txt
-}
-
-build() {
-  cd "${srcdir}/build"
-
-  # CMAKE flags
-  # MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
-  # JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
-  # JPIP client (java compiler recommended) library and executables: '-DBUILD_JPIP:bool=on' (default: 'OFF')
-  # JPIP server (need fcgi) library and executables: '-DBUILD_JPIP_SERVER:bool=on' (default: 'OFF')
-
-  cmake "../openjpeg-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_DOC=on
-
-#    -DBUILD_MJ2=ON \
-#    -DBUILD_JPWL=ON \
-#    -DBUILD_JPIP=ON \
-#    -DBUILD_JPIP_SERVER=ON \
-#    -DBUILD_JP3D=ON # --help -LAH
-
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2"
-  mv ${pkgdir}/usr/share/doc/openjpeg-*/LICENSE ${pkgdir}/usr/share/licenses/openjpeg2
-  rmdir ${pkgdir}/usr/share/doc/openjpeg-*
-}

Copied: openjpeg2/repos/extra-x86_64/PKGBUILD (from rev 331253, openjpeg2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-08 18:21:16 UTC (rev 331254)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=openjpeg2
+pkgver=2.3.0
+pkgrel=3
+pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
+arch=(x86_64)
+license=('custom: BSD')
+#url="http://www.openjpeg.org"
+url="https://github.com/uclouvain/openjpeg"
+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"
+        openjpeg2_install.patch)
+sha256sums=('3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a'
+            '3196676a215f2c2921928b992ff8df1e76c616b8bdc8e5f84c0552db8c327239')
+
+prepare() {
+  cd ${srcdir}
+  mkdir build
+  # remove thirdparty libs
+#  sed -i '/add_subdirectory(thirdparty)/d' openjpeg-${pkgver}/CMakeLists.txt
+  
+  # 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() {
+  cd "${srcdir}/build"
+
+  # CMAKE flags
+  # MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
+  # JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
+  # JPIP client (java compiler recommended) library and executables: '-DBUILD_JPIP:bool=on' (default: 'OFF')
+  # JPIP server (need fcgi) library and executables: '-DBUILD_JPIP_SERVER:bool=on' (default: 'OFF')
+
+  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 \
+#    -DBUILD_JPWL=ON \
+#    -DBUILD_JPIP=ON \
+#    -DBUILD_JPIP_SERVER=ON \
+#    -DBUILD_JP3D=ON # --help -LAH
+
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2"
+  mv ${pkgdir}/usr/share/doc/openjpeg-*/LICENSE ${pkgdir}/usr/share/licenses/openjpeg2
+  rmdir ${pkgdir}/usr/share/doc/openjpeg-*
+}

Copied: openjpeg2/repos/extra-x86_64/openjpeg2_install.patch (from rev 331253, openjpeg2/trunk/openjpeg2_install.patch)
===================================================================
--- openjpeg2_install.patch	                        (rev 0)
+++ openjpeg2_install.patch	2018-08-08 18:21:16 UTC (rev 331254)
@@ -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()
+ 
+