diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-17 22:12:05 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-17 22:12:05 +0000 |
| commit | 96e20e183db86c7124307e84e57210641dfc6683 (patch) | |
| tree | 21e4485cc0dd54be228ea70442854a2dad4c3a72 | |
| parent | 84d326a11e440582d8b861d04b4994bb32d4a28a (diff) | |
| download | packages-96e20e183db86c7124307e84e57210641dfc6683.tar.gz packages-96e20e183db86c7124307e84e57210641dfc6683.tar.bz2 packages-96e20e183db86c7124307e84e57210641dfc6683.tar.xz packages-96e20e183db86c7124307e84e57210641dfc6683.zip | |
user/openjpeg: bump to 2.3.1
| -rw-r--r-- | user/openjpeg/APKBUILD | 13 | ||||
| -rw-r--r-- | user/openjpeg/fix-include-path.patch | 11 |
2 files changed, 4 insertions, 20 deletions
diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index 3b4c6dc49..6e2993bd6 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg -pkgver=2.3.0 -pkgrel=1 +pkgver=2.3.1 +pkgrel=0 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" @@ -11,12 +11,9 @@ license="BSD-2-Clause-NetBSD" depends_dev="$pkgname-tools" makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake" subpackages="$pkgname-dev $pkgname-tools" -source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz - fix-include-path.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz" build() { - cd "$builddir" cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -41,7 +38,6 @@ build() { # - CVE-2016-9581 package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -51,5 +47,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz -354fb181a25eeabe231d28216bcb8e401648cf8e71ba476cabd25e297f46bbc1ea5b091b4d2d4450501422b8b20649bf109ff5b3f3b49f1492650dbb46ed6e22 fix-include-path.patch" +sha512sums="339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 openjpeg-2.3.1.tar.gz" diff --git a/user/openjpeg/fix-include-path.patch b/user/openjpeg/fix-include-path.patch deleted file mode 100644 index f5ff1e60d..000000000 --- a/user/openjpeg/fix-include-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in.old 2017-10-04 22:23:14.000000000 +0000 -+++ openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in 2018-09-06 00:53:22.860000000 +0000 -@@ -26,7 +26,7 @@ - if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) -- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) -+ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) - set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) - - else() |