summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2023-01-04 13:09:37 +0000
committerZach van Rijn <me@zv.io>2023-01-04 13:09:37 +0000
commitaa91db8a4fba145b02ee44dc16664c615a3def77 (patch)
tree5e3c1229edcaeadf57dad4fbad9b3277c32210e6
parentb75332c999508e359ef1e031380dd80d81b396ae (diff)
downloadpackages-aa91db8a4fba145b02ee44dc16664c615a3def77.tar.gz
packages-aa91db8a4fba145b02ee44dc16664c615a3def77.tar.bz2
packages-aa91db8a4fba145b02ee44dc16664c615a3def77.tar.xz
packages-aa91db8a4fba145b02ee44dc16664c615a3def77.zip
user/libpng: bump { 1.6.37 --> 1.6.39 }. fixes #957.
-rw-r--r--user/libpng/APKBUILD12
-rw-r--r--user/libpng/libpng-fix-arm-neon.patch8
2 files changed, 12 insertions, 8 deletions
diff --git a/user/libpng/APKBUILD b/user/libpng/APKBUILD
index e22885dbd..0ff2b00d0 100644
--- a/user/libpng/APKBUILD
+++ b/user/libpng/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Maintainer: Zach van Rijn <me@zv.io>
pkgname=libpng
-pkgver=1.6.37
+pkgver=1.6.39
pkgrel=0
pkgdesc="Portable Network Graphics library"
-url="http://www.libpng.org/"
+url="http://www.libpng.org/pub/png/libpng.html"
arch="all"
license="Libpng"
depends=""
@@ -48,6 +48,6 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
}
-sha512sums="2ce2b855af307ca92a6e053f521f5d262c36eb836b4810cb53c809aa3ea2dcc08f834aee0ffd66137768a54397e28e92804534a74abb6fc9f6f3127f14c9c338 libpng-1.6.37.tar.gz
-226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b libpng-1.6.37-apng.patch.gz
-e3fae918f14bc34e7c126892f69527c6e1b4d72593835ece839d9a28cff55a886b2030f877cf9e29b2c97abf2e47bbb5ba54584828edd2a841c2556f330b9c7e libpng-fix-arm-neon.patch"
+sha512sums="19851afffbe2ffde62d918f7e9017dec778a7ce9c60c75cdc65072f086e6cdc9d9895eb7b207535a84cb5f4ead77ebc2aa9d80025f153662903023e1f7ab9bae libpng-1.6.39.tar.gz
+97a182da0b3b54aecf735e3655d8e8f1a569ae957b23fc3d7a9c8cc65dcdd26f34f173ce9f60af99b01d5347267b2afefaf787c500ce1005e86bf2810b3d0738 libpng-1.6.39-apng.patch.gz
+0a5efa609bda4c2a38f5110b7287020a5f9dc81583f2b05a951d897a18ce62ea80350baf52daa3d02f20dff51bbc177b3af317ab7bbc09eb23a3c252600414a5 libpng-fix-arm-neon.patch"
diff --git a/user/libpng/libpng-fix-arm-neon.patch b/user/libpng/libpng-fix-arm-neon.patch
index 2cd3f18c2..099083fd9 100644
--- a/user/libpng/libpng-fix-arm-neon.patch
+++ b/user/libpng/libpng-fix-arm-neon.patch
@@ -1,6 +1,8 @@
+diff --git a/configure.ac b/configure.ac
+index 7b6d5b9..d02e16d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -364,17 +364,21 @@
+@@ -357,17 +357,21 @@ AC_ARG_ENABLE([arm-neon],
[case "$enableval" in
no|off)
# disable the default enabling on __ARM_NEON__ systems:
@@ -8,7 +10,7 @@
AC_DEFINE([PNG_ARM_NEON_OPT], [0],
[Disable ARM Neon optimizations])
# Prevent inclusion of the assembler files below:
- enable_arm_neon=no;;
+ enable_arm_neon=no ;;
check)
+ AC_DEFINE([PNG_ARM_NEON], [], [ARM NEON support])
AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
@@ -22,6 +24,8 @@
AC_DEFINE([PNG_ARM_NEON_OPT], [2],
[Enable ARM Neon optimizations])
AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if]
+diff --git a/pngpriv.h b/pngpriv.h
+index 2e426cf..fb521cf 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -127,7 +127,7 @@