diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/libpng/APKBUILD | 21 | ||||
| -rw-r--r-- | main/libpng/libpng-fix-arm-neon.patch | 8 |
2 files changed, 12 insertions, 17 deletions
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD index 2c291abeba..109c7c25e1 100644 --- a/main/libpng/APKBUILD +++ b/main/libpng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpng -pkgver=1.6.31 +pkgver=1.6.32 pkgrel=0 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" @@ -19,8 +19,8 @@ builddir="$srcdir/$pkgname-$pkgver" prepare() { cd "$builddir" - gunzip -c "$srcdir"/$pkgname-$pkgver-apng.patch.gz | patch -p1 || return 1 - default_prepare || return 1 + gunzip -c "$srcdir"/$pkgname-$pkgver-apng.patch.gz | patch -p1 + default_prepare } build() { @@ -31,9 +31,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var \ - || return 1 - make || return 1 + --localstatedir=/var + make } check() { @@ -42,9 +41,9 @@ check() { package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install install -Dm644 LICENSE \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1 + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE rm -f "$pkgdir"/usr/lib/*.la } @@ -54,6 +53,6 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="9d76384e52f27f0ca984936fa813910cad04b3a0a0abb4d310a2765eda2eac42a082d719427d65fe6c88998dac0d844b4237e21310d2cf57f494f9f5f03b9a85 libpng-1.6.31.tar.gz -61373296f19ed35c2df6c3d1f80ed683763ccec7079df25b5ee0f70215f535566bb29a3026ff51c86b9dbcadaa2e9a53672caeec23af8d3132952d317f711088 libpng-1.6.31-apng.patch.gz -30c8389d075b90c0e30c0be8d7630cbf98c87c610f414c529485630dd0411cced28852d2fecc96bca72bc712f0f7e13358f9fc47b6d7b8c7806d34ebeef20514 libpng-fix-arm-neon.patch" +sha512sums="adf47cdfdf7d420ad9c6db5d3680d176ddf96824dc4be0fd6c198c9de24cdb35f063c4359cfad1c0e291077961226b3c683db804d30b164006d6dd6312030448 libpng-1.6.32.tar.gz +4a6e158f5a9d49e036bb4006b4bd8cf4c7563bc9c7e38a12dd4764dedb6891ca03a1b3ae46029017912e984434b67ee6b434e279e5bc22db4e627340e55ab59d libpng-1.6.32-apng.patch.gz +e3fae918f14bc34e7c126892f69527c6e1b4d72593835ece839d9a28cff55a886b2030f877cf9e29b2c97abf2e47bbb5ba54584828edd2a841c2556f330b9c7e libpng-fix-arm-neon.patch" diff --git a/main/libpng/libpng-fix-arm-neon.patch b/main/libpng/libpng-fix-arm-neon.patch index e424957ce2..2cd3f18c28 100644 --- a/main/libpng/libpng-fix-arm-neon.patch +++ b/main/libpng/libpng-fix-arm-neon.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index 4fb0778..930bf50 100644 --- a/configure.ac +++ b/configure.ac -@@ -283,17 +283,21 @@ AC_ARG_ENABLE([arm-neon], +@@ -364,17 +364,21 @@ [case "$enableval" in no|off) # disable the default enabling on __ARM_NEON__ systems: @@ -24,11 +22,9 @@ index 4fb0778..930bf50 100644 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 1997503..789206f 100644 --- a/pngpriv.h +++ b/pngpriv.h -@@ -125,7 +125,7 @@ +@@ -127,7 +127,7 @@ * associated assembler code, pass --enable-arm-neon=no to configure * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS. */ |