aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2017-10-24 01:50:15 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2017-10-24 01:50:15 +0000
commitc745594ff2f253560adb4e421335eefba48c29f3 (patch)
tree6daa3320c1933f073cb0ccd1c1379eb1a4d02d5d
parent8c7c9b74de223e3e75fa7d90b01d3ffb068a0fed (diff)
downloadaports-c745594ff2f253560adb4e421335eefba48c29f3.tar.bz2
aports-c745594ff2f253560adb4e421335eefba48c29f3.tar.xz
main/openjpeg: upgrade to 2.3.0, modernize APKBUILD
-rw-r--r--main/openjpeg/APKBUILD33
1 files changed, 8 insertions, 25 deletions
diff --git a/main/openjpeg/APKBUILD b/main/openjpeg/APKBUILD
index 460faa2b84..66da4b6b7f 100644
--- a/main/openjpeg/APKBUILD
+++ b/main/openjpeg/APKBUILD
@@ -1,25 +1,15 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=openjpeg
-pkgver=2.2.0
-pkgrel=3
+pkgver=2.3.0
+pkgrel=0
pkgdesc="Open-source implementation of JPEG2000 image codec"
url="http://www.openjpeg.org/"
arch="all"
license="BSD"
-depends=""
-depends_dev=""
-makedepends="$depends_dev libpng-dev tiff-dev lcms2-dev doxygen cmake"
-install=""
+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
- CVE-2017-12982.patch
- CVE-2017-14040.patch
- CVE-2017-14041.patch
- CVE-2017-14151.patch
- CVE-2017-14152.patch
- CVE-2017-14164.patch"
-
+source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz"
builddir="${srcdir}/$pkgname-$pkgver"
build() {
@@ -28,9 +18,8 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPENJPEG_INSTALL_LIB_DIR=lib \
- -DOPENJPEG_INSTALL_PACKAGE_DIR=/usr/lib/cmake/$pkgname-${pkgver%.*} \
- || return 1
- make || return 1
+ -DOPENJPEG_INSTALL_PACKAGE_DIR=/usr/lib/cmake/$pkgname-${pkgver%.*}
+ make
}
# secfixes:
@@ -48,7 +37,7 @@ build() {
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
tools() {
@@ -57,10 +46,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="20651c380bee582ab1950994c424cc00061ad852e9c5438fb32a9809e3f275571a4cc7e92589add0d91debf2394262e58f441c2dd918809fc1c602ed68396a3a openjpeg-2.2.0.tar.gz
-0e0ce7bdf53c4b6f1b2e9e5f855186763a1bea39b70bdc1fd5b60a5516036a04562cb43030e9946972009e3733d0efadb8ba4825939e32ba6b9419d6428ee9ad CVE-2017-12982.patch
-532c268346ad6993d7085652fbebe65ec0412a8d12771b86c325ef9f1cb6e0f7252ac95dfb976fa00ecfffd7b140ddc74b2964b04764e0803fb7e8c344a2b58a CVE-2017-14040.patch
-d22735e20c7b08bb292bfda03a659481466a152294c388854aed3623ff769aed6c6491a8e6286b4dfdc8212a465b1596232e51fe8e8ba3a608ebf27b32d33d56 CVE-2017-14041.patch
-66019c7a30a6b6303992d518b8184e57b58824f8b63bc8857436aa404257bf1f1d64ab6100a5f0ed18fa1b41c09501e77230207ca028bc16db35fc2d834a6506 CVE-2017-14151.patch
-c244e0e4db1473583ffac6b31808b70bd3554e6eba7b357891aca7f8ad0ab687d433aac3d3f210349507cc54981b0171eb9a72e4a890925beaa2c9d9ee877dfd CVE-2017-14152.patch
-640cd731f5ee3a5fecbc8ca7c78d626c383155dbefe3a240319bcea81b5bc9996e028055ff64df192b5ed02e3a9e18b681b2ab4f106c3d555b68c93115dc6d01 CVE-2017-14164.patch"
+sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz"