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

[Andreas Radke]

    Date: Tuesday, April 2, 2019 @ 19:14:31
  Author: andyrtr
Revision: 349706

upgpkg: openjpeg2 2.3.1-1

upstream update 2.3.1

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

-------------------------+
 PKGBUILD                |   30 +++++-------------------------
 openjpeg2_install.patch |   12 ------------
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-02 19:13:39 UTC (rev 349705)
+++ PKGBUILD	2019-04-02 19:14:31 UTC (rev 349706)
@@ -2,42 +2,28 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=openjpeg2
-pkgver=2.3.0
-pkgrel=3
+pkgver=2.3.1
+pkgrel=1
 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')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz")
+sha256sums=('63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9')
 
 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 \
@@ -45,12 +31,6 @@
     -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
 }
 

Deleted: openjpeg2_install.patch
===================================================================
--- openjpeg2_install.patch	2019-04-02 19:13:39 UTC (rev 349705)
+++ openjpeg2_install.patch	2019-04-02 19:14:31 UTC (rev 349706)
@@ -1,12 +0,0 @@
-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()
- 
-