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

[Andreas Radke]

    Date: Thursday, August 10, 2017 @ 19:32:07
  Author: andyrtr
Revision: 301858

upgpkg: openjpeg2 2.2.0-1

upstream update 2.2.0

Modified:
  openjpeg2/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-10 19:24:13 UTC (rev 301857)
+++ PKGBUILD	2017-08-10 19:32:07 UTC (rev 301858)
@@ -3,28 +3,26 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=openjpeg2
-pkgver=2.1.2
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
 arch=(i686 x86_64)
 license=('custom: BSD')
-url="http://www.openjpeg.org"
+#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"
-        repair_bugs_of_871_and_872.patch::https://github.com/szukw000/openjpeg/commit/cadff5fb.patch)
-sha256sums=('4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7'
-            'e352e9480925a31804d965c673545eeaa32d0a47605abaaa09b515ca956058ba')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz")
+sha256sums=('6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b')
 
 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
-  # http://seclists.org/oss-sec/2016/q4/649
-  cd ${srcdir}/openjpeg-$pkgver
-  patch -Np1 -i  ../repair_bugs_of_871_and_872.patch
 }
 
 build() {
@@ -55,6 +53,6 @@
   make DESTDIR="${pkgdir}" install
   
   install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2"
-  mv ${pkgdir}/usr/share/doc/openjpeg-2.1/LICENSE ${pkgdir}/usr/share/licenses/openjpeg2
-  rmdir ${pkgdir}/usr/share/doc/openjpeg-2.1
+  mv ${pkgdir}/usr/share/doc/openjpeg-2.2/LICENSE ${pkgdir}/usr/share/licenses/openjpeg2
+  rmdir ${pkgdir}/usr/share/doc/openjpeg-2.2
 }