aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-08-11 13:29:10 +0200
committerFrancesco Colista <fcolista@alpinelinux.org>2021-08-11 13:26:21 +0000
commitb4d002f8c10b470d2a5b619f2fd839414280c4f8 (patch)
tree589529ccf4590051af5159088513028f1782f09e
parentd9dd58ec02123ca861267785352adcf0141203b2 (diff)
downloadaports-b4d002f8c10b470d2a5b619f2fd839414280c4f8.tar.gz
aports-b4d002f8c10b470d2a5b619f2fd839414280c4f8.tar.bz2
aports-b4d002f8c10b470d2a5b619f2fd839414280c4f8.tar.xz
main/openjpeg: make -dev depend on -tools
CMake files provided by openjpeg-dev actually reference and depend on binaries from openjpeg-tools, so let's depend on it Also modernize the APKBUILD while I'm touching it anyway
-rw-r--r--main/openjpeg/APKBUILD33
1 files changed, 18 insertions, 15 deletions
diff --git a/main/openjpeg/APKBUILD b/main/openjpeg/APKBUILD
index 946407e58a..07cbca21e1 100644
--- a/main/openjpeg/APKBUILD
+++ b/main/openjpeg/APKBUILD
@@ -1,27 +1,21 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=openjpeg
pkgver=2.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Open-source implementation of JPEG2000 image codec"
url="https://www.openjpeg.org/"
arch="all"
options="!check" # No test suite.
license="BSD-2-Clause-NetBSD"
+# Some of the development CMake files installed by -dev depend on tools provided by the -tools subpackage
+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
+source="https://github.com/uclouvain/openjpeg/archive/v$pkgver/openjpeg-v$pkgver.tar.gz
fix-cmakelists.patch
CVE-2021-29338.patch::https://github.com/uclouvain/openjpeg/commit/b4700bc09d55ac17ff6bef9b0a867f6de527be17.patch
"
-build() {
- cmake . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DOPENJPEG_INSTALL_LIB_DIR=lib
- make
-}
-
# secfixes:
# 2.4.0-r1:
# - CVE-2021-29338
@@ -59,16 +53,25 @@ build() {
# - CVE-2016-9580
# - CVE-2016-9581
+build() {
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DOPENJPEG_INSTALL_LIB_DIR=lib
+ cmake --build build
+}
+
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}
tools() {
pkgdesc="$pkgdesc - tools"
- mkdir -p "$subpkgdir"/usr/
- mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+ amove usr/bin
}
-sha512sums="55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8 openjpeg-2.4.0.tar.gz
+sha512sums="
+55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8 openjpeg-v2.4.0.tar.gz
b50cd382d08647db18f202769aae7df87613a18143a30e360e8f00aba1ec1b7fd0a153685dbea3950bc5623b06c314326777c4fb7aff56adfc6b17bc74c933e5 fix-cmakelists.patch
-94ca747f6655a9b927d50cceb82529c36e0d4ef3f883b76b7f1aacc0784dce5df3cc7ba21ff888077873e0c3029f0ac505f0c741cbe225edb3880790527f5d81 CVE-2021-29338.patch"
+94ca747f6655a9b927d50cceb82529c36e0d4ef3f883b76b7f1aacc0784dce5df3cc7ba21ff888077873e0c3029f0ac505f0c741cbe225edb3880790527f5d81 CVE-2021-29338.patch
+"