diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD index dcde125150310e3ce26a11538a7f608e0b0f2f0c..01ca2a2d02c77f77aa2090908064f37a2c00fb02 100644 --- a/main/libjpeg-turbo/APKBUILD +++ b/main/libjpeg-turbo/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libjpeg-turbo -pkgver=2.1.3 -pkgrel=1 +pkgver=2.1.4 +pkgrel=0 pkgdesc="Accelerated baseline JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" -license="BSD-3-Clause IJG Zlib" +license="BSD-3-Clause AND IJG AND Zlib" makedepends="cmake nasm samurai" replaces="libjpeg" subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-utils" @@ -42,7 +42,6 @@ build() { -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DCMAKE_C_FLAGS="$CFLAGS" \ -DWITH_JPEG8=1 \ $_floattest \ $CMAKE_CROSSOPTS @@ -55,7 +54,7 @@ check() { } package() { - DESTDIR="$pkgdir" cmake --build build --target install + DESTDIR="$pkgdir" cmake --install build install -d "$pkgdir"/usr/share/licenses/$pkgname ln -s ../../doc/libjpeg-turbo/LICENSE.md "$pkgdir/usr/share/licenses/$pkgname" } @@ -63,8 +62,8 @@ package() { utils() { pkgdesc="Utilities for manipulating JPEG images" replaces="jpeg" - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ + + amove usr/bin } doc() { @@ -78,5 +77,5 @@ dev() { } sha512sums=" -975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d libjpeg-turbo-2.1.3.tar.gz +511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70 libjpeg-turbo-2.1.4.tar.gz "