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

[Jan Steffens]

    Date: Tuesday, August 16, 2022 @ 09:29:54
  Author: heftig
Revision: 452995

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

Modified:
  libjpeg-turbo/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-16 09:18:34 UTC (rev 452994)
+++ PKGBUILD	2022-08-16 09:29:54 UTC (rev 452995)
@@ -3,19 +3,20 @@
 # Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
 
-pkgname=libjpeg-turbo
+_name=libjpeg-turbo
+pkgname=$_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=(glibc)
-makedepends=(cmake nasm 'java-environment>11')
+makedepends=(cmake ninja nasm 'java-environment>11')
 optdepends=('java-runtime>11: for TurboJPEG Java wrapper')
 provides=(libjpeg libjpeg.so libturbojpeg.so)
 options=(debug)
-source=(https://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz{,.sig})
+source=(https://sourceforge.net/projects/$_name/files/$pkgver/$_name-$pkgver.tar.gz{,.sig})
 sha512sums=('511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70'
             'SKIP')
 b2sums=('80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972'
@@ -23,7 +24,8 @@
 validpgpkeys=('0338C8D8D9FDA62CF9C421BD7EC2DBB6F4DBF434') # The libjpeg-turbo Project (Signing key for official binaries) <information at libjpeg-turbo.org>
 
 build() {
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -S $_name-$pkgver -B build -G Ninja \
+        -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=/usr/lib \
         -DCMAKE_BUILD_TYPE=None \
         -DENABLE_STATIC=OFF \
@@ -31,20 +33,21 @@
         -DWITH_JPEG8=ON \
         -W no-dev \
         -B build \
-        -S $pkgname-$pkgver
-  make VERBOSE=1 -C build
+        -S $_name-$pkgver
+  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/$pkgname exampledir=/usr/share/doc/$pkgname install -C build
+  DESTDIR="$pkgdir" cmake --install build -v
 
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  ln -s ../../doc/$pkgname/LICENSE.md "$pkgdir/usr/share/licenses/$pkgname"
-  # header required by some dependants
+  # header required by some dependents
   # https://bugs.archlinux.org/task/24787
-  install -vDm 644 $pkgname-$pkgver/jpegint.h "$pkgdir/usr/include"
+  install -vDm 644 $_name-$pkgver/jpegint.h "$pkgdir/usr/include"
+
+  install -vDm 644 $_name-$pkgver/LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname"
 }