# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1486215114 -7200
# Node ID 18b7cffacced4411586317a1cdf8f8dfb61a9680
# Parent  e7e59838b371a340ecccf0ec015b4f2075e3d37a
Provide apng support in libpng by default, remove libpng+apng packages.

diff -r e7e59838b371 -r 18b7cffacced libpng+apng-dev/receipt
--- a/libpng+apng-dev/receipt	Sat Feb 04 05:24:33 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libpng+apng-dev"
-VERSION="1.6.28"
-CATEGORY="development"
-SHORT_DESC="Development files for libpng (with APNG support)"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="zlib/libpng"
-WEB_SITE="http://libpng.org/pub/png/libpng.html"
-HOST_ARCH="i486 arm"
-
-WANTED="libpng+apng"
-DEPENDS="libpng+apng"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files libpng*-config *.h *.la *.pc
-}
diff -r e7e59838b371 -r 18b7cffacced libpng+apng/receipt
--- a/libpng+apng/receipt	Sat Feb 04 05:24:33 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libpng+apng"
-VERSION="1.6.28"
-SERIES="libpng16"
-CATEGORY="x-window"
-SHORT_DESC="Loads and saves PNG files (with APNG support)"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="zlib/libpng"
-WEB_SITE="http://www.libpng.org/pub/png/libpng.html"
-HOST_ARCH="i486 arm"
-PROVIDE="libpng"
-
-TARBALL="libpng-$VERSION.tar.xz"
-WGET_URL="$SF_MIRROR/libpng/$TARBALL"
-
-PATCH="libpng-$VERSION-apng.patch.gz"
-PATCH_URL="$SF_MIRROR/apng/libpng/$SERIES/$PATCH"
-
-DEPENDS="zlib"
-BUILD_DEPENDS="gawk zlib-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	[ -s "$SRC/$PATCH" ] || wget -O "$SRC/$PATCH" $PATCH_URL
-	gzip -cd $SRC/$PATCH | patch -p0
-
-	./configure \
-		--disable-static \
-		$CONFIGURE_ARGS &&
-	make && make install
-
-	# Misc png tools
-	cd contrib/pngminus
-	make PNGLIB="-L$DESTDIR/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-	cp -a png2pnm pnm2png $DESTDIR/usr/bin
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files png2pnm pnm2png pngfix png-fix-itxt *.so*
-}
diff -r e7e59838b371 -r 18b7cffacced libpng-dev/receipt
--- a/libpng-dev/receipt	Sat Feb 04 05:24:33 2017 +0200
+++ b/libpng-dev/receipt	Sat Feb 04 15:31:54 2017 +0200
@@ -3,14 +3,14 @@
 PACKAGE="libpng-dev"
 VERSION="1.6.28"
 CATEGORY="development"
-SHORT_DESC="PNG images library devel files."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Development files for libpng (with APNG support)"
+MAINTAINER="al.bobylev@gmail.com"
 LICENSE="zlib/libpng"
 WEB_SITE="http://libpng.org/pub/png/libpng.html"
 HOST_ARCH="i486 arm"
 
 WANTED="libpng"
-DEPENDS="libpng zlib-dev"
+DEPENDS="libpng"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r e7e59838b371 -r 18b7cffacced libpng/receipt
--- a/libpng/receipt	Sat Feb 04 05:24:33 2017 +0200
+++ b/libpng/receipt	Sat Feb 04 15:31:54 2017 +0200
@@ -2,33 +2,35 @@
 
 PACKAGE="libpng"
 VERSION="1.6.28"
+SERIES="libpng16"
 CATEGORY="libs"
-SHORT_DESC="PNG images library."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="PNG images library (with APNG support)"
+MAINTAINER="al.bobylev@gmail.com"
 LICENSE="zlib/libpng"
-WEB_SITE="http://libpng.org/pub/png/libpng.html"
+WEB_SITE="http://www.libpng.org/pub/png/libpng.html"
 HOST_ARCH="i486 arm"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+WGET_URL="$SF_MIRROR/libpng/$TARBALL"
+
+PATCH="$PACKAGE-$VERSION-apng.patch.gz"
+PATCH_URL="$SF_MIRROR/apng/libpng/$SERIES/$PATCH"
 
 DEPENDS="zlib"
 BUILD_DEPENDS="gawk zlib-dev"
 
-# Handle cross compilation.
-case "$ARCH" in
-	arm) BUILD_DEPENDS="" ;;
-esac
-
 # Rules to configure and make the package.
 compile_rules()
 {
+	[ -s "$SRC/$PATCH" ] || wget -O "$SRC/$PATCH" $PATCH_URL
+	gzip -cd $SRC/$PATCH | patch -p0
+
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	make && make install
 
+	# Misc png tools
 	cd contrib/pngminus
 	make PNGLIB="-L$DESTDIR/usr/lib -lpng" -f makefile.std png2pnm pnm2png
 	cp -a png2pnm pnm2png $DESTDIR/usr/bin
diff -r e7e59838b371 -r 18b7cffacced optipng/receipt
--- a/optipng/receipt	Sat Feb 04 05:24:33 2017 +0200
+++ b/optipng/receipt	Sat Feb 04 15:31:54 2017 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libpng+apng"
-BUILD_DEPENDS="libpng+apng-dev zlib-dev"
+DEPENDS="libpng"
+BUILD_DEPENDS="libpng-dev zlib-dev"
 
 # Rules to configure and make the package.
 compile_rules()