[gccsdk] Patch to update libpng to the latest version

Index: browser/firefox2/depends
===================================================================
--- browser/firefox2/depends (revision 7206)
+++ browser/firefox2/depends (working copy)
@@ -6,5 +6,5 @@
libexpat1
libidl
libjpeg8
-libpng12-0
+libpng16-16
zlib1g
Index: browser/firefox2-riscpc/depends
===================================================================
--- browser/firefox2-riscpc/depends (revision 7206)
+++ browser/firefox2-riscpc/depends (working copy)
@@ -6,5 +6,5 @@
libexpat1
libidl
libjpeg8
-libpng12-0
+libpng16-16
zlib1g
Index: browser/otterbrowser/setvars
===================================================================
--- browser/otterbrowser/setvars (revision 7206)
+++ browser/otterbrowser/setvars (working copy)
@@ -30,7 +30,7 @@

$AB_HOME/add-riscpkg -copyrightfile COPYING -package otter-browser -name Otter-browser \
-depends SharedLibs-C++2 -depends Qt5Webkit \
- -depends Qt5Svg -depends Qt5XmlPatterns -depends LibPNG12-0 \
+ -depends Qt5Svg -depends Qt5XmlPatterns -depends LibPNG16-16 \
-depends ZLib1g -depends LibJPEG8 -depends LibSQLite3 -depends LibPcre3 \
-depends LibFontConfig1 -depends LibFreeType6 -depends LibExpat1 -depends LibGCrypt20 \
-depends LibGPG-Error -depends LibICU52 -depends LibSSL -depver 1.0.2d-2 -depends LibLevelDB \
Index: browser/qupzilla/setvars
===================================================================
--- browser/qupzilla/setvars (revision 7206)
+++ browser/qupzilla/setvars (working copy)
@@ -36,7 +36,7 @@

$AB_HOME/add-riscpkg -copyrightfile COPYRIGHT -package qupzilla -name QupZilla \
-depends SharedLibs-C++2 -depends Qt5Webkit \
- -depends Qt5Svg -depends Qt5XmlPatterns -depends LibPNG12-0 \
+ -depends Qt5Svg -depends Qt5XmlPatterns -depends LibPNG16-16 \
-depends ZLib1g -depends LibJPEG8 -depends LibSQLite3 -depends LibPcre3 \
-depends LibFontConfig1 -depends LibFreeType6 -depends LibExpat1 \
-depends LibICU52 -depends LibSSL -depver 1.0.2d-2 -depends LibLevelDB \
Index: games/neverball/depends
===================================================================
--- games/neverball/depends (revision 7206)
+++ games/neverball/depends (working copy)
@@ -1,5 +1,5 @@
gettext
libsdl2
-libpng12-0
+libpng16-16
libsdl2-ttf
libvorbis0a
Index: graphics/gnuplot/depends
===================================================================
--- graphics/gnuplot/depends (revision 7206)
+++ graphics/gnuplot/depends (working copy)
@@ -1,4 +1,4 @@
libgd2
-libpng12-0
+libpng16-16
zlib1g
oslib
\ No newline at end of file
Index: libraries/Qt/Qt5Base/ReadMe
===================================================================
--- libraries/Qt/Qt5Base/ReadMe (revision 7206)
+++ libraries/Qt/Qt5Base/ReadMe (working copy)
@@ -8,7 +8,7 @@
Library dependencies:

libz
-libpng12
+libpng16
icu (libicui18n, libicuuc, libicudata)
libfontconfig
libfreetype
Index: libraries/Qt/Qt5Base/depends
===================================================================
--- libraries/Qt/Qt5Base/depends (revision 7206)
+++ libraries/Qt/Qt5Base/depends (working copy)
@@ -1,4 +1,4 @@
-libpng12-0
+libpng16-16
oslib
libjpeg8
libsqlite3-0
Index: libraries/Qt/Qt5Base/mkspecs.arm-riscos-clang.qmake.conf
===================================================================
--- libraries/Qt/Qt5Base/mkspecs.arm-riscos-clang.qmake.conf (revision 7206)
+++ libraries/Qt/Qt5Base/mkspecs.arm-riscos-clang.qmake.conf (working copy)
@@ -13,7 +13,7 @@
QMAKE_INCDIR = $(GCCSDK_INSTALL_ENV)/include
QMAKE_LIBDIR = $(GCCSDK_INSTALL_ENV)/lib

-QMAKE_LIBS = -ldl -lz -lpng12 -lOSLib32
+QMAKE_LIBS = -ldl -lz -lpng16 -lOSLib32

QMAKE_CFLAGS_STATIC_LIB =
QMAKE_CFLAGS_APP =
Index: libraries/Qt/Qt5Base/mkspecs.arm-riscos-g++.qmake.conf
===================================================================
--- libraries/Qt/Qt5Base/mkspecs.arm-riscos-g++.qmake.conf (revision 7206)
+++ libraries/Qt/Qt5Base/mkspecs.arm-riscos-g++.qmake.conf (working copy)
@@ -13,7 +13,7 @@
QMAKE_INCDIR = $(GCCSDK_INSTALL_ENV)/include
QMAKE_LIBDIR = $(GCCSDK_INSTALL_ENV)/lib

-QMAKE_LIBS = -ldl -lz -lpng12 -lOSLib32 -Wl,-rpath-link,$(GCCSDK_INSTALL_ENV)/lib
+QMAKE_LIBS = -ldl -lz -lpng16 -lOSLib32 -Wl,-rpath-link,$(GCCSDK_INSTALL_ENV)/lib

QMAKE_CFLAGS_STATIC_LIB =
QMAKE_CFLAGS_APP =
Index: libraries/Qt/Qt5Base/mkspecs.arm-riscos-vfp-g++.qmake.conf
===================================================================
--- libraries/Qt/Qt5Base/mkspecs.arm-riscos-vfp-g++.qmake.conf (revision 7206)
+++ libraries/Qt/Qt5Base/mkspecs.arm-riscos-vfp-g++.qmake.conf (working copy)
@@ -14,7 +14,7 @@
QMAKE_INCDIR = $(GCCSDK_INSTALL_ENV)/vfp/include $(GCCSDK_INSTALL_ENV)/include
QMAKE_LIBDIR = $(GCCSDK_INSTALL_ENV)/vfp/lib $(GCCSDK_INSTALL_ENV)/lib

-#QMAKE_LIBS = -ldl -lz -lpng12
+#QMAKE_LIBS = -ldl -lz -lpng16
QMAKE_LFLAGS += -mfpu=vfp

QMAKE_RPATHLINKDIR += :$(GCCSDK_INSTALL_ENV)/vfp/lib:$(GCCSDK_INSTALL_ENV)/lib
Index: libraries/Qt/Qt5Base/setvars
===================================================================
--- libraries/Qt/Qt5Base/setvars (revision 7206)
+++ libraries/Qt/Qt5Base/setvars (working copy)
@@ -197,7 +197,7 @@

AB_COMPONENTS=""
$AB_HOME/add-riscpkg -package qt5base -name Qt5Base \
- -depends SharedLibs -depends LibPNG12-0 -depends ZLib1g \
+ -depends SharedLibs -depends LibPNG16-16 -depends ZLib1g \
-depends LibJPEG8 -depends LibSQLite3 -depends LibPcre3 \
-depends LibFontConfig1 -depends LibFreeType6 -depends LibExpat1 \
-depends LibICU52 -depends LibSSL \
Index: libraries/Qt/Qt5Webkit/!QtTestBrowser/!ReadMe
===================================================================
--- libraries/Qt/Qt5Webkit/!QtTestBrowser/!ReadMe (revision 7206)
+++ libraries/Qt/Qt5Webkit/!QtTestBrowser/!ReadMe (working copy)
@@ -16,7 +16,7 @@
Qt5Base
LevelDB
libz
-libpng12
+libpng16
icu (libicui18n, libicuuc, libicudata)
libfontconfig
libfreetype
Index: libraries/graphics/libpng16-16/!LibPNG/!Boot,feb
===================================================================
--- libraries/graphics/libpng16-16/!LibPNG/!Boot,feb (nonexistent)
+++ libraries/graphics/libpng16-16/!LibPNG/!Boot,feb (working copy)
@@ -0,0 +1,6 @@
+| Boot file for LibPNG
+|
+If "<LibPNG$Dir>" = "" Then Set LibPNG$Dir <Obey$Dir>
+If "<LibPNG$Path>" = "" Then Set LibPNG$Path <Obey$Dir>.,<Obey$Dir>.libpng16.
+
+IconSprites <LibPNG$Dir>.!Sprites
Index: libraries/graphics/libpng16-16/!LibPNG/!Help
===================================================================
--- libraries/graphics/libpng16-16/!LibPNG/!Help (nonexistent)
+++ libraries/graphics/libpng16-16/!LibPNG/!Help (working copy)
@@ -0,0 +1,19 @@
+LibPNG - Portable Network Graphics Library
+
+This RISC OS version was created by the GCCSDK
+Autobuilder.
+
+See the "doc" and "man" subdirectories for more documentation.
+
+To include in your C programs:
+
+#include "png.h"
+
+and add the include flag
+ -ILibPNG:
+
+Link with:
+ -LLibPNG: -lpng
+
+This library requires also requires a version
+of the ZLib1g library.
Index: libraries/graphics/libpng16-16/!LibPNG/!Run,feb
===================================================================
--- libraries/graphics/libpng16-16/!LibPNG/!Run,feb (nonexistent)
+++ libraries/graphics/libpng16-16/!LibPNG/!Run,feb (working copy)
@@ -0,0 +1,6 @@
+| Run file for LibPNG
+
+IconSprites <Obey$Dir>.!Sprites
+
+Set LibPNG$Dir <Obey$Dir>
+Set LibPNG$Path <Obey$Dir>.,<Obey$Dir>.libpng16.
Index: libraries/graphics/libpng16-16/!LibPNG/!Sprites,ff9
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libraries/graphics/libpng16-16/!LibPNG/!Sprites,ff9
===================================================================
--- libraries/graphics/libpng16-16/!LibPNG/!Sprites,ff9 (nonexistent)
+++ libraries/graphics/libpng16-16/!LibPNG/!Sprites,ff9 (working copy)

Property changes on: libraries/graphics/libpng16-16/!LibPNG/!Sprites,ff9
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: libraries/graphics/libpng16-16/depends
===================================================================
--- libraries/graphics/libpng16-16/depends (nonexistent)
+++ libraries/graphics/libpng16-16/depends (working copy)
@@ -0,0 +1 @@
+zlib1g
Index: libraries/graphics/libpng16-16/preprocess
===================================================================
--- libraries/graphics/libpng16-16/preprocess (nonexistent)
+++ libraries/graphics/libpng16-16/preprocess (working copy)
@@ -0,0 +1,2 @@
+png_version=$(echo $AB_FULLNAME | sed -e s#$AB_PACKAGE-## -e "s/[^-]*-//" -e "s/~//")
+wget -qO- https://sourceforge.net/projects/libpng-apng/files/libpng16/$png_version/libpng-$png_version-apng.patch.gz/download | gzip -d | patch -p1
Index: libraries/graphics/libpng16-16/scripts.makefile.gcc.gccsdk-3.4.6.p
===================================================================
--- libraries/graphics/libpng16-16/scripts.makefile.gcc.gccsdk-3.4.6.p (nonexistent)
+++ libraries/graphics/libpng16-16/scripts.makefile.gcc.gccsdk-3.4.6.p (working copy)
@@ -0,0 +1,28 @@
+--- scripts/makefile.gcc.orig 2008-05-28 04:12:37.000000000 +0200
++++ scripts/makefile.gcc 2008-05-28 04:14:03.000000000 +0200
+@@ -4,8 +4,8 @@
+ # For conditions of distribution and use, see copyright notice in png.h
+
+ # Location of the zlib library and include files
+-ZLIBINC = ../zlib
+-ZLIBLIB = ../zlib
++ZLIBINC = $(GCCSDK_INSTALL_ENV)/include
++ZLIBLIB = $(GCCSDK_INSTALL_ENV)/lib
+
+ # Compiler, linker, lib and other tools
+ CC = gcc
+@@ -51,6 +51,14 @@
+ $(AR_RC) $@ $(OBJS)
+ $(RANLIB) $@
+
++install:
++ mkdir -p $(GCCSDK_INSTALL_ENV)/lib/pkgconfig
++ cp libpng$(A) $(GCCSDK_INSTALL_ENV)/lib
++ cp libpng.pc $(GCCSDK_INSTALL_ENV)/lib/pkgconfig
++ mkdir -p $(GCCSDK_INSTALL_ENV)/include/libpng16
++ cp png.h pngconf.h $(GCCSDK_INSTALL_ENV)/include/libpng16
++ cp png.h pngconf.h $(GCCSDK_INSTALL_ENV)/include
++
+ test: pngtest$(EXEEXT)
+ ./pngtest$(EXEEXT)
+
Index: libraries/graphics/libpng16-16/setvars
===================================================================
--- libraries/graphics/libpng16-16/setvars (nonexistent)
+++ libraries/graphics/libpng16-16/setvars (working copy)
@@ -0,0 +1,51 @@
+AB_ROVERSION=3
+AB_INSTALL=yes
+
+export ECHO=echo
+
+ab_make() {
+ if [ "$AB_ELFBUILD" != "yes" ] ; then
+ # GCCSDK 3.4.6 support
+ cp scripts/makefile.gcc Makefile
+ fi
+ $AB_MAKE
+}
+
+ab_package() {
+ ab_create_app LibPNG Apps/Library libpng16-dev
+
+ cat $S/libpng-manual.txt >> $A/\!Help,fff
+
+ HERE=`pwd`
+ cd $A
+
+ unzip $AB_OUTPUTLIB/$RO_PKG.zip
+
+ mv include/libpng16 libpng16
+ rm -rf include
+
+ mv lib/*.a .
+ rm -rf lib
+
+ cd doc
+ docdir=`echo *`
+ mv $docdir/* .
+ rm -rf $docdir
+
+ rm -rf bin
+
+ cd $HERE
+
+ # Downloaded version can include a character that is invalid
+ # for a riscpkg version number so replace it
+ AB_PVERSION=`echo "$AB_PVERSION" | sed "s/~/-/"`
+
+ $AB_HOME/add-riscpkg -unixlib -name LibPNG16-Dev -depends "ZLib1g-Dev"
+
+ if [ "$RO_SHAREDLIBS" == "yes" ] ; then
+ ab_create_sharedlib_skeleton libpng16-16
+ ab_add_sharedlib $S/.libs libpng16.so.16
+
+ $AB_HOME/add-riscpkg -package libpng16-16 -name LibPNG16-16 -depends "ZLib1g"
+ fi
+}
Index: libraries/gtk/cairo-gtk2/depends
===================================================================
--- libraries/gtk/cairo-gtk2/depends (revision 7206)
+++ libraries/gtk/cairo-gtk2/depends (working copy)
@@ -2,6 +2,6 @@
libfontconfig1
zlib1g
libxrender1
-libpng12-0
+libpng16-16
libpixman-1-0
libexpat1
Index: libraries/gtk/harfbuzz/depends
===================================================================
--- libraries/gtk/harfbuzz/depends (revision 7206)
+++ libraries/gtk/harfbuzz/depends (working copy)
@@ -1,5 +1,5 @@
zlib1g
-libpng12-0
+libpng16-16
libfreetype6
libglib2.0-0
libpcre3
Index: libraries/gtk/libcairo2/depends
===================================================================
--- libraries/gtk/libcairo2/depends (revision 7206)
+++ libraries/gtk/libcairo2/depends (working copy)
@@ -1,5 +1,5 @@
zlib1g
-libpng12-0
+libpng16-16
libpixman-1-0
gdk-pixbuf
fontconfig
Index: libraries/gtk/libcairo2/setvars
===================================================================
--- libraries/gtk/libcairo2/setvars (revision 7206)
+++ libraries/gtk/libcairo2/setvars (working copy)
@@ -53,7 +53,7 @@

$AB_HOME/add-riscpkg -package "libcairo2" -name LibCairo2 \
-depends SharedLibs -depends LibFontConfig1 -depends LibFreeType6 \
- -depends LibPixman-1-0 -depends LibPNG12-0 -suggests UnixFont
+ -depends LibPixman-1-0 -depends LibPNG16-16 -suggests UnixFont

# Don't overwrite the original !SharedLibs.!Boot.
fi
Index: libraries/gtk/libpango1.0-0/depends
===================================================================
--- libraries/gtk/libpango1.0-0/depends (revision 7206)
+++ libraries/gtk/libpango1.0-0/depends (working copy)
@@ -6,6 +6,6 @@
libffi5
gettext
libpixman-1-0
-libpng12-0
+libpng16-16
zlib1g
harfbuzz
Index: libraries/libfreetype6/depends
===================================================================
--- libraries/libfreetype6/depends (revision 7206)
+++ libraries/libfreetype6/depends (working copy)
@@ -1,3 +1,3 @@
-libpng12-0
+libpng16-16
libbz2-1.0
zlib1g
Index: libraries/libfreetype6/setvars
===================================================================
--- libraries/libfreetype6/setvars (revision 7206)
+++ libraries/libfreetype6/setvars (working copy)
@@ -50,7 +50,8 @@
cd $HERE

$AB_HOME/add-riscpkg -package libfreetype6-dev -name LibFreeType6-Dev -unixlib \
- -depends "ZLib1g-Dev" -depends "LibBZ2-Dev" -copyrightfile $S/docs/GPLv2.TXT
+ -depends "ZLib1g-Dev" -depends "LibBZ2-Dev" -depends "LibPNG16-Dev" \
+ -copyrightfile $S/docs/GPLv2.TXT

if [ "$RO_SHAREDLIBS" == "yes" ] ; then
ab_create_sharedlib_skeleton libfreetype6
@@ -57,7 +58,7 @@
ab_add_sharedlib $S/objs/.libs libfreetype.so.6

$AB_HOME/add-riscpkg -package libfreetype6 -name LibFreeType6 -section Library \
- -depends ZLib1g -depends LibBZ2-1.0 -depends LibPNG12-0 -copyrightfile $S/docs/GPLv2.TXT
+ -depends ZLib1g -depends LibBZ2-1.0 -depends LibPNG16-16 -copyrightfile $S/docs/GPLv2.TXT
fi

}
Index: libraries/libharu/depends
===================================================================
--- libraries/libharu/depends (revision 7206)
+++ libraries/libharu/depends (working copy)
@@ -1,3 +1,3 @@
zlib1g
-libpng12-0
+libpng16-16

Index: libraries/riscos/netsurf-libraries/depends
===================================================================
--- libraries/riscos/netsurf-libraries/depends (revision 7206)
+++ libraries/riscos/netsurf-libraries/depends (working copy)
@@ -3,11 +3,10 @@
libssl1.0.2
libcurl3
libjpeg8
-libpng12-0
+libpng16-16
libmng1
libexpat1
oslib
-buildsystem
libnsbmp
libnsgif
libwapcaplet
Index: libraries/sdl/libsdl-image1.2/setvars
===================================================================
--- libraries/sdl/libsdl-image1.2/setvars (revision 7206)
+++ libraries/sdl/libsdl-image1.2/setvars (working copy)
@@ -30,6 +30,6 @@
cp $S/showimage$AB_EXEEXT $A

$AB_HOME/add-riscpkg -unixlib -name LibSDLImage1.2-Dev \
- -depends "LibJPEG8-Dev" -depends "LibPNG12-Dev" \
+ -depends "LibJPEG8-Dev" -depends "LibPNG16-Dev" \
-depends "LibTIFF5-Dev" -depends "LibSDL1.2-Dev"
}
Index: libraries/sdl/libsdl-ttf2.0-0/depends
===================================================================
--- libraries/sdl/libsdl-ttf2.0-0/depends (revision 7206)
+++ libraries/sdl/libsdl-ttf2.0-0/depends (working copy)
@@ -1,5 +1,5 @@
libfreetype6
libsdl1.2debian
-libpng12-0
+libpng16-16
libjpeg8
libtiff5
Index: libraries/sdl/libsdl1.2debian/depends
===================================================================
--- libraries/sdl/libsdl1.2debian/depends (revision 7206)
+++ libraries/sdl/libsdl1.2debian/depends (working copy)
@@ -1,4 +1,4 @@
libjpeg8
libtiff5
-libpng12-0
+libpng16-16
zlib1g
Index: libraries/sdl/libsdl2-ttf/depends
===================================================================
--- libraries/sdl/libsdl2-ttf/depends (revision 7206)
+++ libraries/sdl/libsdl2-ttf/depends (working copy)
@@ -1,4 +1,4 @@
libsdl2
-libpng12-0
+libpng16-16
libfreetype6
zlib1g
Index: libraries/sdl/libsdl2-ttf/setvars
===================================================================
--- libraries/sdl/libsdl2-ttf/setvars (revision 7206)
+++ libraries/sdl/libsdl2-ttf/setvars (working copy)
@@ -20,7 +20,7 @@
AB_COMPONENTS=""
$AB_HOME/add-riscpkg -name LibSDL2-ttf -section Library -package libsdl2-ttf \
-depends LibSDL2 -depends SharedLibs-C2 -depends LibFreeType6 \
- -depends LibPNG12-0 -depends ZLib1g
+ -depends LibPNG16-16 -depends ZLib1g
fi

ab_create_app LibSDL2-ttf-Dev Apps/Library libsdl2-ttf-dev
Index: network/thunderbird2/depends
===================================================================
--- network/thunderbird2/depends (revision 7206)
+++ network/thunderbird2/depends (working copy)
@@ -6,5 +6,5 @@
libexpat1
libidl
libjpeg8
-libpng12-0
+libpng16-16
zlib1g

Hi

Attached is a patch to update libpng to the latest version. To simplify the patch, this adds a separate recipe for the new version, rather than attempting to rename the old recipe. I haven't tested every program that requires libpng, however, I've been using this patch for several months now and haven't encountered any problems, so this should hopefully be fine.

Best regards

Cameron