wok-next rev 19614

Provide apng support in libpng by default, remove libpng+apng packages.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Feb 04 15:31:54 2017 +0200 (2017-02-04)
parents e7e59838b371
children d99440f42774
files libpng+apng-dev/receipt libpng+apng/receipt libpng-dev/receipt libpng/receipt optipng/receipt
line diff
     1.1 --- a/libpng+apng-dev/receipt	Sat Feb 04 05:24:33 2017 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,19 +0,0 @@
     1.4 -# SliTaz package receipt.
     1.5 -
     1.6 -PACKAGE="libpng+apng-dev"
     1.7 -VERSION="1.6.28"
     1.8 -CATEGORY="development"
     1.9 -SHORT_DESC="Development files for libpng (with APNG support)"
    1.10 -MAINTAINER="al.bobylev@gmail.com"
    1.11 -LICENSE="zlib/libpng"
    1.12 -WEB_SITE="http://libpng.org/pub/png/libpng.html"
    1.13 -HOST_ARCH="i486 arm"
    1.14 -
    1.15 -WANTED="libpng+apng"
    1.16 -DEPENDS="libpng+apng"
    1.17 -
    1.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.19 -genpkg_rules()
    1.20 -{
    1.21 -	cook_copy_files libpng*-config *.h *.la *.pc
    1.22 -}
     2.1 --- a/libpng+apng/receipt	Sat Feb 04 05:24:33 2017 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,44 +0,0 @@
     2.4 -# SliTaz package receipt.
     2.5 -
     2.6 -PACKAGE="libpng+apng"
     2.7 -VERSION="1.6.28"
     2.8 -SERIES="libpng16"
     2.9 -CATEGORY="x-window"
    2.10 -SHORT_DESC="Loads and saves PNG files (with APNG support)"
    2.11 -MAINTAINER="al.bobylev@gmail.com"
    2.12 -LICENSE="zlib/libpng"
    2.13 -WEB_SITE="http://www.libpng.org/pub/png/libpng.html"
    2.14 -HOST_ARCH="i486 arm"
    2.15 -PROVIDE="libpng"
    2.16 -
    2.17 -TARBALL="libpng-$VERSION.tar.xz"
    2.18 -WGET_URL="$SF_MIRROR/libpng/$TARBALL"
    2.19 -
    2.20 -PATCH="libpng-$VERSION-apng.patch.gz"
    2.21 -PATCH_URL="$SF_MIRROR/apng/libpng/$SERIES/$PATCH"
    2.22 -
    2.23 -DEPENDS="zlib"
    2.24 -BUILD_DEPENDS="gawk zlib-dev"
    2.25 -
    2.26 -# Rules to configure and make the package.
    2.27 -compile_rules()
    2.28 -{
    2.29 -	[ -s "$SRC/$PATCH" ] || wget -O "$SRC/$PATCH" $PATCH_URL
    2.30 -	gzip -cd $SRC/$PATCH | patch -p0
    2.31 -
    2.32 -	./configure \
    2.33 -		--disable-static \
    2.34 -		$CONFIGURE_ARGS &&
    2.35 -	make && make install
    2.36 -
    2.37 -	# Misc png tools
    2.38 -	cd contrib/pngminus
    2.39 -	make PNGLIB="-L$DESTDIR/usr/lib -lpng" -f makefile.std png2pnm pnm2png
    2.40 -	cp -a png2pnm pnm2png $DESTDIR/usr/bin
    2.41 -}
    2.42 -
    2.43 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.44 -genpkg_rules()
    2.45 -{
    2.46 -	cook_copy_files png2pnm pnm2png pngfix png-fix-itxt *.so*
    2.47 -}
     3.1 --- a/libpng-dev/receipt	Sat Feb 04 05:24:33 2017 +0200
     3.2 +++ b/libpng-dev/receipt	Sat Feb 04 15:31:54 2017 +0200
     3.3 @@ -3,14 +3,14 @@
     3.4  PACKAGE="libpng-dev"
     3.5  VERSION="1.6.28"
     3.6  CATEGORY="development"
     3.7 -SHORT_DESC="PNG images library devel files."
     3.8 -MAINTAINER="pankso@slitaz.org"
     3.9 +SHORT_DESC="Development files for libpng (with APNG support)"
    3.10 +MAINTAINER="al.bobylev@gmail.com"
    3.11  LICENSE="zlib/libpng"
    3.12  WEB_SITE="http://libpng.org/pub/png/libpng.html"
    3.13  HOST_ARCH="i486 arm"
    3.14  
    3.15  WANTED="libpng"
    3.16 -DEPENDS="libpng zlib-dev"
    3.17 +DEPENDS="libpng"
    3.18  
    3.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.20  genpkg_rules()
     4.1 --- a/libpng/receipt	Sat Feb 04 05:24:33 2017 +0200
     4.2 +++ b/libpng/receipt	Sat Feb 04 15:31:54 2017 +0200
     4.3 @@ -2,33 +2,35 @@
     4.4  
     4.5  PACKAGE="libpng"
     4.6  VERSION="1.6.28"
     4.7 +SERIES="libpng16"
     4.8  CATEGORY="libs"
     4.9 -SHORT_DESC="PNG images library."
    4.10 -MAINTAINER="pankso@slitaz.org"
    4.11 +SHORT_DESC="PNG images library (with APNG support)"
    4.12 +MAINTAINER="al.bobylev@gmail.com"
    4.13  LICENSE="zlib/libpng"
    4.14 -WEB_SITE="http://libpng.org/pub/png/libpng.html"
    4.15 +WEB_SITE="http://www.libpng.org/pub/png/libpng.html"
    4.16  HOST_ARCH="i486 arm"
    4.17  
    4.18  TARBALL="$PACKAGE-$VERSION.tar.xz"
    4.19 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    4.20 +WGET_URL="$SF_MIRROR/libpng/$TARBALL"
    4.21 +
    4.22 +PATCH="$PACKAGE-$VERSION-apng.patch.gz"
    4.23 +PATCH_URL="$SF_MIRROR/apng/libpng/$SERIES/$PATCH"
    4.24  
    4.25  DEPENDS="zlib"
    4.26  BUILD_DEPENDS="gawk zlib-dev"
    4.27  
    4.28 -# Handle cross compilation.
    4.29 -case "$ARCH" in
    4.30 -	arm) BUILD_DEPENDS="" ;;
    4.31 -esac
    4.32 -
    4.33  # Rules to configure and make the package.
    4.34  compile_rules()
    4.35  {
    4.36 +	[ -s "$SRC/$PATCH" ] || wget -O "$SRC/$PATCH" $PATCH_URL
    4.37 +	gzip -cd $SRC/$PATCH | patch -p0
    4.38 +
    4.39  	./configure \
    4.40  		--disable-static \
    4.41  		$CONFIGURE_ARGS &&
    4.42 -	make &&
    4.43 -	make DESTDIR=$DESTDIR install
    4.44 +	make && make install
    4.45  
    4.46 +	# Misc png tools
    4.47  	cd contrib/pngminus
    4.48  	make PNGLIB="-L$DESTDIR/usr/lib -lpng" -f makefile.std png2pnm pnm2png
    4.49  	cp -a png2pnm pnm2png $DESTDIR/usr/bin
     5.1 --- a/optipng/receipt	Sat Feb 04 05:24:33 2017 +0200
     5.2 +++ b/optipng/receipt	Sat Feb 04 15:31:54 2017 +0200
     5.3 @@ -12,8 +12,8 @@
     5.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     5.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     5.6  
     5.7 -DEPENDS="libpng+apng"
     5.8 -BUILD_DEPENDS="libpng+apng-dev zlib-dev"
     5.9 +DEPENDS="libpng"
    5.10 +BUILD_DEPENDS="libpng-dev zlib-dev"
    5.11  
    5.12  # Rules to configure and make the package.
    5.13  compile_rules()