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

[David Runge]

    Date: Friday, November 20, 2020 @ 20:07:25
  Author: dvzrv
Revision: 758077

upgpkg: lib32-libjpeg-turbo 2.0.6-1: Upgrade to 2.0.6.


Sync PKGBUILD with libjpeg-turbo.
Remove unnecessary provides, conflicts and replaces.
Apply latest cmake packaging guidelines.
Update maintainer info.

Modified:
  lib32-libjpeg-turbo/trunk/PKGBUILD

----------+
 PKGBUILD |   63 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-20 19:47:38 UTC (rev 758076)
+++ PKGBUILD	2020-11-20 20:07:25 UTC (rev 758077)
@@ -1,53 +1,56 @@
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: David Rungel <dvzrv at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado at gmail.com>
 
-_pkgbasename=libjpeg-turbo
-pkgname=lib32-$_pkgbasename
-pkgver=2.0.5
+_name=libjpeg-turbo
+pkgname=lib32-${_name}
+pkgver=2.0.6
 pkgrel=1
-pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)"
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
 arch=('x86_64')
 url="https://libjpeg-turbo.org/"
-license=('custom')
-depends=('lib32-glibc' $_pkgbasename)
+license=('BSD')
+depends=('lib32-glibc' "${_name}=${pkgver}")
 makedepends=('nasm' 'cmake')
-provides=('lib32-libjpeg=8.2.2' 'lib32-turbojpeg')
-conflicts=('lib32-libjpeg' 'lib32-turbojpeg')
-replaces=('lib32-libjpeg' 'lib32-turbojpeg')
-validpgpkeys=('7D6293CC6378786E1B5C496885C7044E033FDE16')
-source=(https://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz{,.sig})
-sha512sums=('5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555'
+provides=('lib32-libjpeg' 'libjpeg.so' 'libturbojpeg.so')
+source=("https://sourceforge.net/projects/${_name}/files/${pkgver}/${_name}-${pkgver}.tar.gz"{,.sig})
+sha512sums=('504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c'
             'SKIP')
+b2sums=('1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f'
+        'SKIP')
+validpgpkeys=('0338C8D8D9FDA62CF9C421BD7EC2DBB6F4DBF434') # The libjpeg-turbo Project (Signing key for official binaries) <information at libjpeg-turbo.org>
 
 build() {
-  cd "$_pkgbasename-$pkgver"
+  cd "${_name}-$pkgver"
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cmake -DWITH_JPEG8=1 \
-        -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
-        .
-
-  make
+        -DCMAKE_BUILD_TYPE='None' \
+        -DWITH_JPEG8=ON \
+        -W no-dev \
+        -B build \
+        -S .
+  make VERBOSE=1 -C build
 }
 
 check() {
-  cd "$_pkgbasename-$pkgver"
-  make test
+  cd "${_name}-$pkgver"
+  make test -C build
 }
 
 package() {
-  cd "$_pkgbasename-$pkgver"
+  cd "${_name}-$pkgver"
 
-  make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \
-    exampledir=/usr/share/doc/libjpeg-turbo install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-  install -Dm 644 ChangeLog.md -t"${pkgdir}/usr/share/doc/${pkgname}"
+  make VERBOSE=1 DESTDIR="${pkgdir}" \
+       docdir="/usr/share/doc/${_name}" \
+       exampledir="/usr/share/doc/${_name}" \
+       install -C build
+  # remove everything that is provided by libjpeg-turbo
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  # license
+  install -vDm 644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }