summaryrefslogtreecommitdiff
path: root/extra/libpng/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-05-09 16:24:38 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-05-09 16:24:38 +0200
commitcdbd7308d16cb249715cce9bedf8b809f2576804 (patch)
treebfdb3a816cf96988dc788e2678acdb294b032811 /extra/libpng/PKGBUILD
parenta86ff663185661ee304bb1f6d00d982102dd706d (diff)
parent648599b08776ea788a3ddb0365eb30fda03efe7b (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bwbar/PKGBUILD community/dosbox/PKGBUILD community/extremetuxracer/PKGBUILD community/fbgrab/PKGBUILD community/fbv/PKGBUILD community/flam3/PKGBUILD community/freedroidrpg/PKGBUILD community/gdk-pixbuf/PKGBUILD community/ghemical/PKGBUILD community/gmic/PKGBUILD community/gnash/PKGBUILD community/gnustep-base/PKGBUILD community/guvcview/PKGBUILD community/keepassx/PKGBUILD community/kvpnc/PKGBUILD community/libghemical/PKGBUILD community/liboglappth/PKGBUILD community/png2ico/PKGBUILD community/shapelib/PKGBUILD community/sloccount/PKGBUILD community/tmw/PKGBUILD community/xmoto/PKGBUILD core/links/PKGBUILD extra/amule/PKGBUILD extra/cairomm/PKGBUILD extra/calligra/PKGBUILD extra/evas/PKGBUILD extra/fltk/PKGBUILD extra/gd/PKGBUILD extra/gif2png/PKGBUILD extra/glhack/PKGBUILD extra/graphviz/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/imlib/PKGBUILD extra/imlib2/PKGBUILD extra/lbreakout2/PKGBUILD extra/libgdiplus/PKGBUILD extra/libkate/PKGBUILD extra/libpano13/PKGBUILD extra/libwebp/PKGBUILD extra/libwmf/PKGBUILD extra/libxslt/PKGBUILD extra/mjpegtools/PKGBUILD extra/ntp/PKGBUILD extra/nx/PKGBUILD extra/openjpeg/PKGBUILD extra/php/PKGBUILD extra/plotutils/PKGBUILD extra/poppler/PKGBUILD extra/qrencode/PKGBUILD extra/qt4/PKGBUILD extra/qt5/PKGBUILD extra/qtiplot/PKGBUILD extra/qtwebkit/PKGBUILD extra/samba/PKGBUILD extra/sdl_image/PKGBUILD extra/vice/PKGBUILD extra/vigra/PKGBUILD extra/vlc/PKGBUILD extra/webkitgtk/PKGBUILD extra/webkitgtk2/PKGBUILD extra/wv/PKGBUILD extra/wxgtk/PKGBUILD extra/xaos/PKGBUILD extra/xsane/PKGBUILD extra/zvbi/PKGBUILD
Diffstat (limited to 'extra/libpng/PKGBUILD')
-rw-r--r--extra/libpng/PKGBUILD33
1 files changed, 24 insertions, 9 deletions
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 90581e839..bf803f20e 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $
+# $Id: PKGBUILD 184406 2013-05-06 19:38:28Z foutrelis $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.5.15
-_apngver=1.5.15
-pkgrel=1
+pkgver=1.6.2
+_apngver=1.6.2
+pkgrel=3
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.libpng.org/pub/png/libpng.html"
@@ -15,16 +15,31 @@ license=('custom')
depends=('zlib' 'sh')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
- "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8'
- '3ae9ea7e4bd201f0b25e25cd6049b094')
+ "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz"
+ 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
+ 0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
+ adjust-apng-patch-for-libpng16-git-changes.patch)
+md5sums=('9d838f6fca9948a9f360a0cc1b516d5f'
+ '7d0c9f4b9a7f45dd5d1088e54b623c98'
+ '59b83234f60a7d1d179d9b0b6a0ebc01'
+ 'b1f7922b6678305bdb7c23d5bd1763f3'
+ 'f87704c3fb6d29f09b52178e89a42e2e')
-build() {
+prepare() {
cd $pkgname-$pkgver
+ # Add fixes from libpng16 branch
+ patch -Np1 -i ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
+ patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
+
# Add animated PNG (apng) support
# see http://sourceforge.net/projects/libpng-apng/
- patch -p1 -i ../libpng-$_apngver-apng.patch
+ patch -d .. -Np0 -i adjust-apng-patch-for-libpng16-git-changes.patch
+ patch -Np1 -i ../libpng-$_apngver-apng.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make