X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e9b466845ea1fe7889c5aaaf1cf460bde428e458..ec8d78e9017baa586881bac7588aa12459765b9f:/packages/netpbm/build.sh?ds=sidebyside

diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh
index 7142b935..c7e7c442 100644
--- a/packages/netpbm/build.sh
+++ b/packages/netpbm/build.sh
@@ -4,15 +4,11 @@ TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images, including co
 # and are divided among (1) Development, (2) Advanced, (3) Stable and (4) Super Stable.
 # Only Super Stable is distributed as a tar ball, but is outdated and does not compile with modern libpng.
 # So use revisions from http://svn.code.sf.net/p/netpbm/code/advanced for packages.
-_SVN_REVISION=2643
-TERMUX_PKG_VERSION=${_SVN_REVISION}
+TERMUX_PKG_VERSION=2935
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=8a09acbc8438dc44ffb3f7a6482dd390f8c17fc55ba61cb7531ca16f9bc54530
 TERMUX_PKG_DEPENDS="libpng, libxml2"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_MAKE_PROCESSES=1
-
-termux_step_extract_package () {
-	svn co -r $_SVN_REVISION http://svn.code.sf.net/p/netpbm/code/advanced $TERMUX_PKG_SRCDIR
-}
 
 termux_step_configure () {
 	# Put the android libpng-config script in the path (before the host one):
@@ -21,7 +17,6 @@ termux_step_configure () {
 	cp $TERMUX_PREFIX/bin/libpng-config $TERMUX_PKG_LIBPNG_CONFIG_DIR/
 	export PATH=$TERMUX_PKG_LIBPNG_CONFIG_DIR:$PATH
 
-
 	# See $SRC/doc/INSTALL about netpbm build system. For automatic builds it recommends just copying config.mk.in
 	cd $TERMUX_PKG_SRCDIR
 	cp config.mk.in config.mk
@@ -29,6 +24,7 @@ termux_step_configure () {
 	echo "RANLIB = $RANLIB" >> config.mk
 	echo "CC = $CC" >> config.mk
 	echo "CFLAGS = $CFLAGS" >> config.mk
+	echo "CFLAGS_SHLIB = -fPIC" >> config.mk
 	echo "LDFLAGS = $LDFLAGS" >> config.mk
 	echo "STATICLIB_TOO = n" >> config.mk
 	echo "INTTYPES_H = <inttypes.h>" >> config.mk
@@ -38,6 +34,8 @@ termux_step_configure () {
 	echo "LD_FOR_BUILD = cc" >> config.mk
 	echo "CFLAGS_FOR_BUILD = " >> config.mk
 	echo "LDFLAGS_FOR_BUILD = " >> config.mk
+
+	cp $TERMUX_PKG_BUILDER_DIR/standardppmdfont.c lib/
 }
 
 termux_step_make_install () {