[arch-commits] Commit in lib32-libjpeg-turbo/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, August 16, 2022 @ 09:30:11
  Author: heftig
Revision: 1266618

2.1.4-2: major cleanup, match libjpeg-turbo better

Modified:
  lib32-libjpeg-turbo/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-16 09:28:17 UTC (rev 1266617)
+++ PKGBUILD	2022-08-16 09:30:11 UTC (rev 1266618)
@@ -1,4 +1,5 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
 # Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
 
@@ -5,13 +6,13 @@
 _name=libjpeg-turbo
 pkgname=lib32-$_name
 pkgver=2.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="JPEG image codec with accelerated baseline compression and decompression"
+url="https://libjpeg-turbo.org/"
 arch=(x86_64)
-url="https://libjpeg-turbo.org/"
 license=(BSD)
 depends=(lib32-glibc "$_name=$pkgver")
-makedepends=(nasm cmake)
+makedepends=(cmake ninja nasm)
 provides=(lib32-libjpeg libjpeg.so libturbojpeg.so)
 options=(debug)
 source=(https://sourceforge.net/projects/$_name/files/$pkgver/$_name-$pkgver.tar.gz{,.sig})
@@ -24,26 +25,31 @@
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -S $_name-$pkgver -B build -G Ninja \
+        -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
         -DCMAKE_BUILD_TYPE=None \
+        -DENABLE_STATIC=OFF \
+        -DWITH_JAVA=OFF \
         -DWITH_JPEG8=ON \
         -W no-dev \
         -B build \
         -S $_name-$pkgver
-  make VERBOSE=1 -C build
+  cmake --build build -v
 }
 
 check() {
-  make test -C build
+  cd build
+  ctest --output-on-failure --stop-on-failure -j$(nproc)
 }
 
 package() {
-  make VERBOSE=1 DESTDIR="$pkgdir" docdir="/usr/share/doc/$_name" exampledir="/usr/share/doc/$_name" install -C build
+  DESTDIR="$pkgdir" cmake --install build -v
+
   # remove everything that is provided by libjpeg-turbo
-  rm -rf "$pkgdir"/usr/{include,share,bin}
-  # license
+  rm -r "$pkgdir"/usr/{include,share,bin}
+
   install -vDm 644 $_name-$pkgver/LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname"
 }