diff --git a/libjpeg-turbo/.SRCINFO b/libjpeg-turbo/.SRCINFO index 1666cda734..7c76427e98 100644 --- a/libjpeg-turbo/.SRCINFO +++ b/libjpeg-turbo/.SRCINFO @@ -1,27 +1,32 @@ pkgbase = libjpeg-turbo pkgdesc = JPEG image codec with accelerated baseline compression and decompression - pkgver = 3.0.4 + pkgver = 3.1.0 pkgrel = 1 url = https://libjpeg-turbo.org/ arch = x86_64 + arch = powerpc64le + arch = powerpc64 + arch = powerpc + arch = riscv64 license = BSD-3-Clause license = IJG makedepends = cmake makedepends = ninja makedepends = nasm - makedepends = java-environment>11 + makedepends = java-environment>=11 + makedepends = java-environment<=17 makedepends = strip-nondeterminism depends = glibc - optdepends = java-runtime>11: for TurboJPEG Java wrapper + optdepends = java-runtime>=11: for TurboJPEG Java wrapper provides = libjpeg provides = libjpeg.so provides = libturbojpeg.so - source = https://github.com/libjpeg-turbo/libjpeg-turbo//releases/download/3.0.4/libjpeg-turbo-3.0.4.tar.gz - source = https://github.com/libjpeg-turbo/libjpeg-turbo//releases/download/3.0.4/libjpeg-turbo-3.0.4.tar.gz.sig + source = https://github.com/libjpeg-turbo/libjpeg-turbo//releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz + source = https://github.com/libjpeg-turbo/libjpeg-turbo//releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz.sig validpgpkeys = 0338C8D8D9FDA62CF9C421BD7EC2DBB6F4DBF434 - sha512sums = 04d37d65131f7ab8586507fe6520452e791e9b8d72a08cf52f81279450b4c6b8a5b49ff3e14e358d3c32cb5666b6d4576d1e16895af8213a1761464de5dc9d31 + sha512sums = 63231854529f59a95814cf2414fe384360a4ed96c572764fabc535c3770c559d26943e129c905a63d5949088fa79138b1ffdb175b817f2f4d36329a3cbb23ea7 sha512sums = SKIP - b2sums = cf951582ce7cdf0dce39075bb1cc58f6a61fa0bdaca4874a4f06a03d2cd11775bc626c8d391d4fc76574d302a781ba47e5c90e2aa2d6a21a8b8d06712437e241 + b2sums = 1e83d5c062fa3700c23e2527812cb43daa1a5f97c7520c0a894c8333fbad4acd64586fdc3bf76e3692f8b9fa9b92014d18782949d0e30e80d0f2ba3608279f63 b2sums = SKIP pkgname = libjpeg-turbo diff --git a/libjpeg-turbo/PKGBUILD b/libjpeg-turbo/PKGBUILD index 94b3d7a0e2..a1ad5eff55 100644 --- a/libjpeg-turbo/PKGBUILD +++ b/libjpeg-turbo/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Simone Sclavi 'Ito' pkgname=libjpeg-turbo -pkgver=3.0.4 -pkgrel=1.1 +pkgver=3.1.0 +pkgrel=1 pkgdesc="JPEG image codec with accelerated baseline compression and decompression" url="https://libjpeg-turbo.org/" _url="https://github.com/libjpeg-turbo/libjpeg-turbo/" @@ -19,24 +19,11 @@ makedepends=( cmake ninja nasm + 'java-environment>=11' + 'java-environment<=17' strip-nondeterminism ) -makedepends_powerpc64=( - 'java-environment=17' -) -makedepends_powerpc64le=( - 'java-environment>=19' -) -makedepends_riscv64=( - 'java-environment>=19' -) -makedepends_x86_64=( - 'java-environment>=19' -) -optdepends_powerpc64=('java-runtime>=17: for TurboJPEG Java wrapper') -optdepends_powerpc64le=('java-runtime>=19: for TurboJPEG Java wrapper') -optdepends_riscv64=('java-runtime>=19: for TurboJPEG Java wrapper') -optdepends_x86_64=('java-runtime>=19: for TurboJPEG Java wrapper') +optdepends=('java-runtime>=11: for TurboJPEG Java wrapper') provides=( libjpeg libjpeg.so @@ -45,9 +32,9 @@ provides=( source=( $_url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz{,.sig} ) -sha512sums=('04d37d65131f7ab8586507fe6520452e791e9b8d72a08cf52f81279450b4c6b8a5b49ff3e14e358d3c32cb5666b6d4576d1e16895af8213a1761464de5dc9d31' +sha512sums=('63231854529f59a95814cf2414fe384360a4ed96c572764fabc535c3770c559d26943e129c905a63d5949088fa79138b1ffdb175b817f2f4d36329a3cbb23ea7' 'SKIP') -b2sums=('cf951582ce7cdf0dce39075bb1cc58f6a61fa0bdaca4874a4f06a03d2cd11775bc626c8d391d4fc76574d302a781ba47e5c90e2aa2d6a21a8b8d06712437e241' +b2sums=('1e83d5c062fa3700c23e2527812cb43daa1a5f97c7520c0a894c8333fbad4acd64586fdc3bf76e3692f8b9fa9b92014d18782949d0e30e80d0f2ba3608279f63' 'SKIP') validpgpkeys=('0338C8D8D9FDA62CF9C421BD7EC2DBB6F4DBF434') # The libjpeg-turbo Project (Signing key for official binaries) @@ -68,7 +55,7 @@ build() { powerpc) cmake_options+=( -DWITH_SIMD=0 - -DWITH_JAVA=OFF + -DWITH_JAVA=ON ) ;; powerpc64|riscv64) @@ -88,13 +75,8 @@ build() { cmake "${cmake_options[@]}" cmake --build build -v - case "${CARCH}" in - powerpc) ;; - *) - # cmake creates non-reproducible jars: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/745 - strip-nondeterminism --timestamp "$SOURCE_DATE_EPOCH" build/java/turbojpeg.jar - ;; - esac + # cmake creates non-reproducible jars: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/745 + strip-nondeterminism --timestamp "$SOURCE_DATE_EPOCH" build/java/turbojpeg.jar } check() { @@ -106,7 +88,7 @@ package() { # header required by some dependents # https://bugs.archlinux.org/task/24787 - install -vDm 644 $pkgname-$pkgver/jpegint.h "$pkgdir/usr/include" + install -vDm 644 $pkgname-$pkgver/src/jpegint.h "$pkgdir/usr/include" install -vDm 644 $pkgname-$pkgver/LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname/" install -vDm 644 $pkgname-$pkgver/README.ijg -t "$pkgdir/usr/share/licenses/$pkgname/"