diff --git a/common/shlibs b/common/shlibs index 50aad637b21..4a1f65f71e7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -107,6 +107,7 @@ libX11.so.6 libX11-1.2_1 libexpat.so.1 expat-2.0.0_1 libjpeg.so.8 jpeg-8_1 libpng14.so.14 libpng-1.4.2_1 +libpng15.so.15 libpng-1.5.10_1 libXrender.so.1 libXrender-0.9.4_1 libXrandr.so.2 libXrandr-1.3.0_1 libGLU.so.1 libGLU-7.11_1 diff --git a/srcpkgs/libpng/libpng-devel.template b/srcpkgs/libpng/libpng-devel.template index 07cb78007cb..c502c014a3d 100644 --- a/srcpkgs/libpng/libpng-devel.template +++ b/srcpkgs/libpng/libpng-devel.template @@ -1,18 +1,15 @@ # Template file for 'libpng-devel'. # -depends="zlib-devel libpng>=1.4.9" +depends="zlib-devel libpng>=$version" short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - - do_install() { vmove usr/bin usr vmove usr/include usr vmove "usr/lib/*.a" usr/lib vmove usr/lib/pkgconfig usr/lib vmove usr/share/man/man3 usr/share/man - rm -f ${SRCPKGDESTDIR}/usr/lib/*.la } diff --git a/srcpkgs/libpng/patches/libpng-1.4.7-apng.patch.gz b/srcpkgs/libpng/patches/libpng-1.4.7-apng.patch.gz deleted file mode 100644 index e6c89103cd0..00000000000 Binary files a/srcpkgs/libpng/patches/libpng-1.4.7-apng.patch.gz and /dev/null differ diff --git a/srcpkgs/libpng/patches/libpng-1.5.10-apng-v3.patch.gz b/srcpkgs/libpng/patches/libpng-1.5.10-apng-v3.patch.gz new file mode 100644 index 00000000000..43b0073a99d Binary files /dev/null and b/srcpkgs/libpng/patches/libpng-1.5.10-apng-v3.patch.gz differ diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template index 75b59089b70..c0d2d70fcb0 100644 --- a/srcpkgs/libpng/template +++ b/srcpkgs/libpng/template @@ -1,16 +1,17 @@ # Template build file for 'libpng'. pkgname=libpng -version=1.4.9 -revision=2 +version=1.5.10 +revision=1 patch_args="-Np1" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" build_style=gnu-configure makedepends="zlib-devel" +subpackages="$pkgname-devel" short_desc="Library for manipulating PNG images" maintainer="Juan RP " homepage="http://www.libpng.org/pub/png/libpng.html" license="zlib" -checksum=a4210ef5947f969fb01e66f40052824d9dadd84fc67c528abc30b5ba81b2b4dc +distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" +checksum=4d044852d3fbe5c0fad51f80f3f9bd519a6d5e1997079b165aa2292bd706cd5d long_desc=" Libpng was written as a companion to the PNG specification, as a way to reduce the amount of time and effort it takes to support @@ -21,8 +22,6 @@ long_desc=" keeping the code easy to understand. Currently, this library only supports C. Support for other languages is being considered." -subpackages="$pkgname-devel" - post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} }