* update libjpeg-turbo to 3.0.0-1

This commit is contained in:
Alexander Baldeck 2023-08-25 20:29:22 +02:00
parent 1b54a88f4c
commit 7f43005533
3 changed files with 86 additions and 30 deletions

View File

@ -1,36 +1,52 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: David Runge <dvzrv@archlinux.org>
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
_name=libjpeg-turbo
pkgname=$_name
pkgver=2.1.5.1
pkgname=libjpeg-turbo
pkgver=3.0.0
pkgrel=1
pkgdesc="JPEG image codec with accelerated baseline compression and decompression"
url="https://libjpeg-turbo.org/"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
license=(BSD)
depends=(glibc)
makedepends=(cmake ninja 'java-environment=19')
makedepends_x86_64=(nasm)
optdepends=('java-runtime>=19: for TurboJPEG Java wrapper')
provides=(libjpeg libjpeg.so libturbojpeg.so)
source=(https://sourceforge.net/projects/$_name/files/$pkgver/$_name-$pkgver.tar.gz{,.sig}
libjpeg-turbo-2.1.5-jni-not-required.patch)
sha512sums=('86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6'
makedepends=(
cmake
ninja
)
makedepends_powerpc64le=(
'java-environment>=19'
)
makedepends_riscv64=(
'java-environment>=19'
)
makedepends_x86_64=(
'java-environment>=19'
nasm
)
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')
provides=(
libjpeg
libjpeg.so
libturbojpeg.so
)
source=(
https://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz{,.sig}
$pkgname-3.0.0-fix_test_concurrency.patch::https://github.com/libjpeg-turbo/libjpeg-turbo/commit/035ea386d1b6a99a8a1e2ab57cc1fc903569136c.patch
)
sha512sums=('2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4'
'SKIP'
'41e3d1bfa3ab154627afd20582e5ca6a95df5aa5b581d3a931a31ce921b0b895c2c3a1b0e02c6699180dc2219a60aa2abcf0ddaedccb50980790ee0bf17b22e0')
b2sums=('9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff'
'2a9fc2b42d0e88c1d9daa80e0e3a4ee0aa669c273b58a26eac0f4e6e95b464e6d76b2b22b0de36014713d8cd03b0196b345d39b93608d77a3972286f0f93c0a2')
b2sums=('9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285'
'SKIP'
'610a9b4fded44c55bc57aad645cc2118b125974f06f933d832a9b598cf340d24c20d76db67d5eeb375a90234efbae8dd46a075dff2ff022dba69ad9f399694b8')
'8e04da8af51c21cc461e8373dba6d48ae0c6a28f29f4de864afadf67224aa7d4ff794b2932d063b59b707430f20f3dd6578633f86ac97c3f383ff820763a7692')
validpgpkeys=('0338C8D8D9FDA62CF9C421BD7EC2DBB6F4DBF434') # The libjpeg-turbo Project (Signing key for official binaries) <information@libjpeg-turbo.org>
prepare() {
cd $_name-$pkgver
patch -Np1 -i ../libjpeg-turbo-2.1.5-jni-not-required.patch
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.0.0-fix_test_concurrency.patch
}
build() {
@ -40,14 +56,33 @@ build() {
-DCMAKE_INSTALL_LIBDIR=/usr/lib
-DCMAKE_BUILD_TYPE=None
-DENABLE_STATIC=OFF
-DWITH_JAVA=ON
-DJAVA_AWT_INCLUDE_PATH=/usr/lib/jvm/java-19-openjdk
-DWITH_JPEG8=ON
-G Ninja
-S $_name-$pkgver
-S $pkgname-$pkgver
-W no-dev
)
case "${CARCH}" in
powerpc)
cmake_options+=(
-DWITH_SIMD=0
-DWITH_JAVA=OFF
)
;;
powerpc64)
cmake_options+=(
-DWITH_SIMD=1
-DWITH_JAVA=OFF
)
;;
*)
cmake_options+=(
-DWITH_SIMD=1
-DWITH_JAVA=ON
)
;;
esac
CFLAGS+=" -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux" \
JAVA_HOME=/usr/lib/jvm/default/ \
cmake "${cmake_options[@]}"
@ -63,7 +98,7 @@ package() {
# header required by some dependents
# https://bugs.archlinux.org/task/24787
install -vDm 644 $_name-$pkgver/jpegint.h "$pkgdir/usr/include"
install -vDm 644 $pkgname-$pkgver/jpegint.h "$pkgdir/usr/include"
install -vDm 644 $_name-$pkgver/LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname"
install -vDm 644 $pkgname-$pkgver/LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname"
}

View File

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBF+tkd4BEADFFp/owDcrHfGDEfxJfaDaUlHaxs2F5jWvhyThimpJbuDdrtZ0
6dAw7CJ+LY/53Xo1ogZJZb1UuJ9qFunkA601WmbKeOOxSj4UNdQM+T8oMxJklnQh
3iNTb4DeLh6+eS2jVO/q4lEGYC3XwuinuhpqMsvAFfbDkgSp3nm0rI2hEOysm+UB
p/xyBISPzUYKzZGC24MKt8NzoevKq86JfVUMkvgb756fWoRrbBkGn3tZEDr3EClM
TiQSyxdKdVpwa9EtEuezXptgbQcjXV5HHhh8XEF9zbnkY7VYaCn/Cd0ETjscPRig
9H2IFjSyF5tmAfezGB5D5kCRu60ufCnFG1YXIuD2Mc0o9msHfEwD7Uy7jRgxpglj
MeaQhRG2tcwd1fW34vNOBd5spRNULGkdlbzAOczd6RTNrD1024xE5OHve2t1+Qc9
TyJz8mjAk2bbbeFNYjKTMbKIrxfBEL+kYpUD9mr1xl7lM3qZKrwFvu/CRp1rohvW
9M7JZLusYthyA8Cv/OL8bQkTYc1Cpod1QCtN1OKt33cyjEKkO5B5EKay0x1vz85X
ATXUbEUeeFe6TLICylK18FxM6i6D7aKJcw0cu1nigvWFrnBhc84xz0d6PwhXGFYV
kvMIPFBXR98rWMJi6Aryby1oQModVyjgefMEl167NNGFUVfjmTZSJP4ywwARAQAB
tF1UaGUgbGlianBlZy10dXJibyBQcm9qZWN0IChTaWduaW5nIGtleSBmb3Igb2Zm
aWNpYWwgYmluYXJpZXMpIDxpbmZvcm1hdGlvbkBsaWJqcGVnLXR1cmJvLm9yZz6J
AjYEEwECACAFAl+tkd4CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRB+wtu2
9Nv0NEBcEACbJw1RHP2T622KVvO5oq2RW5vRn4Rv+hOyJgZHsgNkchP+6QqxgVPd
xl3N7la286KfDblFGsqvNt7sce873Qlh/KuMcJ+3mBbmO8v74mRbG9aLk/M0UdlZ
BTnGs9D26jpXfyOGOXVeiFW621ghKq7WbdpXa75rK4afpVP9VFvgvw51Ms9ZoAI8
1+rnp+H2Kkmo328i+HZcIaGo2K/F6rRvhdEz24PwFA9o8xHmSIHiBUYv/oOrlqM3
VFXcAGwU7zAIATUSmPgmdmcrxlKI75wwAm4tCxk5Vo1BPxCQEP7rjblPDkqLhTjh
wphhSu0SNfpLopiIB4IH8iaM02DhC7SNILhCyKcTyTLdiDQLbY1tCEfYdu90kmD7
lLBR+Ek0exOec3QLZR8bajj7gmABfL1gkw0UJWST/H+crmTYV2Iu6T96zQo/37xg
0XeWKQUsRQv85dK0qyvUxBAp964ey07DuFz/eLJbX9FzeHhEWS+QRMHntrn211Bz
hSm7BPWx79wmmyQ8xhof29Z+DsfluS5XyDnwA9KaZ4g77Ig9sub8RNJxJfVrXns2
tTBnVLsysNbdIMT0M42NPk3QWCGcNhCwoyri7fu31AGjeo7bg1mqP4xFZVxsx7CW
imFPBemClj+R94c7URT1I5IEK7Q+HxkML49Ou3IF2+aEXKJPgeTXZw==
=7ZPq
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,8 +0,0 @@
--- libjpeg-turbo-2.1.5/java/CMakeLists.txt.orig 2023-02-13 15:26:52.731536402 +0100
+++ libjpeg-turbo-2.1.5/java/CMakeLists.txt 2023-02-13 15:26:57.807011815 +0100
@@ -1,5 +1,4 @@
find_package(Java REQUIRED)
-find_package(JNI REQUIRED)
# Allow the Java compiler flags to be set using an environment variable
if(NOT DEFINED CMAKE_JAVA_COMPILE_FLAGS AND DEFINED ENV{JAVAFLAGS})