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

[David Runge]

    Date: Saturday, October 17, 2020 @ 20:30:43
  Author: dvzrv
Revision: 398542

upgpkg: libjpeg-turbo 2.0.5-3: Rebuild to update provides.

Switch to (more) correct license (BSD).
Switch to github as tarball upstream. The release signing key has been 1024bit DSA:
https://github.com/libjpeg-turbo/libjpeg-turbo/issues/462
Apply latest cmake packaging guidelines.
Add note about additional header.
Add libjpeg.so and libturbojpeg.so to provides.
Update maintainer info.

Modified:
  libjpeg-turbo/trunk/PKGBUILD

----------+
 PKGBUILD |   68 ++++++++++++++++++++++++++++---------------------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-17 18:37:02 UTC (rev 398541)
+++ PKGBUILD	2020-10-17 20:30:43 UTC (rev 398542)
@@ -1,54 +1,50 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# 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>
 
 pkgname=libjpeg-turbo
 pkgver=2.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
 url='https://libjpeg-turbo.org/'
 arch=('x86_64')
-license=('custom')
-makedepends=('cmake' 'nasm' 'jdk8-openjdk')
-validpgpkeys=('7D6293CC6378786E1B5C496885C7044E033FDE16')
-source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha256sums=('16f8f6f2715b3a38ab562a84357c793dd56ae9899ce130563c72cd93d8357b5d'
-            'SKIP')
+license=('BSD')
+depends=('glibc')
+makedepends=('cmake' 'nasm' 'java-environment>11')
+optdepends=('java-runtime>11: for TurboJPEG Java wrapper')
+provides=('libjpeg=8.2.2' 'libjpeg.so' 'libturbojpeg.so')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('78e26d1f05b7dd9e6573b32b2324aa4b6a88a027c6b2d768aeefc46bc7780917bc850d6e77182d2ccb2cd228613a72222fbd3d1f1df0166a6e8128451ba731d2')
+b2sums=('9c0fdce1da12ec2589273e7e8cece7d9e2aa9d82a2059d7948ed51fb0999af2dd8a46fef249caa333e96bc80611c3d2f7390f882b200a79de91d979db634aaca')
 
-provides=('libjpeg=8.2.2')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's/Szathmáry/Szathmary/g' -i java/org/libjpegturbo/turbojpeg/*.java
-}
-
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	cmake \
-		-DWITH_JAVA=1 \
-		-DWITH_JPEG8=1 \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		.
-
-	make
+  cd "${pkgname}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DWITH_JAVA=ON \
+        -DWITH_JPEG8=ON \
+        -W no-dev \
+        -B build \
+        -S .
+  make VERBOSE=1 -C build
 }
 
 check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make test
+  cd "${pkgname}-${pkgver}"
+  make test -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make \
-		DESTDIR="${pkgdir}" \
-		docdir="/usr/share/doc/${pkgname}" \
-		exampledir="/usr/share/doc/${pkgname}" \
-		install
+  cd "${pkgname}-${pkgver}"
+  make VERBOSE=1 DESTDIR="${pkgdir}" \
+       docdir="/usr/share/doc/${pkgname}" \
+       exampledir="/usr/share/doc/${pkgname}" \
+       install -C build
 
-	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-	ln -s ../../doc/libjpeg-turbo/LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}"
-	install -m 644 jpegint.h "${pkgdir}/usr/include" # required by other software
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s ../../doc/libjpeg-turbo/LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}"
+  # header required by some dependants
+  # https://bugs.archlinux.org/task/24787
+  install -m 644 jpegint.h "${pkgdir}/usr/include"
 }