diff options
Diffstat (limited to 'main/libjpeg-turbo/APKBUILD')
| -rw-r--r-- | main/libjpeg-turbo/APKBUILD | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD index b3fff7e14cf..7eb09c36324 100644 --- a/main/libjpeg-turbo/APKBUILD +++ b/main/libjpeg-turbo/APKBUILD @@ -1,23 +1,24 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libjpeg-turbo -pkgver=2.1.2 +pkgver=3.0.2 pkgrel=0 pkgdesc="Accelerated baseline JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" -license="BSD-3-Clause IJG Zlib" -makedepends="cmake nasm" +license="BSD-3-Clause AND IJG AND Zlib" +makedepends="cmake nasm samurai" replaces="libjpeg" -subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-utils" -source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz" - -# Some tests broken on mips64. -[ "$CARCH" = "mips64" ] && options="!check" +subpackages="$pkgname-static $pkgname-doc $pkgname-dev libturbojpeg $pkgname-utils" +source="https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$pkgver/libjpeg-turbo-$pkgver.tar.gz" # secfixes: +# 2.1.5.1-r4: +# - CVE-2023-2804 # 2.1.0-r0: # - CVE-2021-20205 +# 2.0.6-r0: +# - CVE-2020-35538 # 2.0.4-r2: # - CVE-2020-13790 # 2.0.4-r0: @@ -30,7 +31,6 @@ source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.ta # 1.5.3-r2: # - CVE-2018-1152 - build() { local _floattest= if [ "$CBUILD" != "$CHOST" ]; then @@ -40,24 +40,43 @@ build() { ppc64le) export JSIMD_FORCENONE=1;; s390x|riscv64) _floattest="-DFLOATTEST=fp-contract";; esac - cmake \ + + CFLAGS="$CFLAGS -O2 -DNDEBUG -flto=auto" \ + CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -flto=auto" \ + cmake -B build-shared -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DBUILD_SHARED_LIBS=True \ + -DENABLE_STATIC=False \ -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DWITH_JPEG8=1 \ $_floattest \ $CMAKE_CROSSOPTS - make + cmake --build build-shared + + cmake -B build-static -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DBUILD_SHARED_LIBS=False \ + -DENABLE_STATIC=True \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ + -DWITH_JPEG8=1 \ + $_floattest \ + $CMAKE_CROSSOPTS + cmake --build build-static } check() { - make test + cd build-shared + # random checksum failures + ctest --output-on-failure -E '(djpeg-shared-3x2-float-prog-cmp|example-12bit-shared-decompress-cmp)' } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build-static + DESTDIR="$pkgdir" cmake --install build-shared install -d "$pkgdir"/usr/share/licenses/$pkgname ln -s ../../doc/libjpeg-turbo/LICENSE.md "$pkgdir/usr/share/licenses/$pkgname" } @@ -65,8 +84,12 @@ package() { utils() { pkgdesc="Utilities for manipulating JPEG images" replaces="jpeg" - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ + + amove usr/bin +} + +libturbojpeg() { + amove usr/lib/libturbojpeg.so.* } doc() { @@ -80,5 +103,5 @@ dev() { } sha512sums=" -f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5 libjpeg-turbo-2.1.2.tar.gz +f5eadda0712feb810a8c3bb2621fda24a4c30574998ce30f423b3ffa25225c7a87cb14b696232bc0270485f422a2853a5c32eafb65bc5eeab1b41d8aeb32ad29 libjpeg-turbo-3.0.2.tar.gz " |