Browse Source

Update netpbm from r2523 to r2592

android-5
Fredrik Fornwall 10 years ago
parent
commit
2e7a831805
  1. BIN
      packages/netpbm/.build.sh.swo
  2. 2
      packages/netpbm/build.sh
  3. 17
      packages/netpbm/buildtools-Makefile.patch

BIN
packages/netpbm/.build.sh.swo

Binary file not shown.

2
packages/netpbm/build.sh

@ -4,7 +4,7 @@ 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=2523
_SVN_REVISION=2592
TERMUX_PKG_VERSION=r${_SVN_REVISION}
TERMUX_PKG_DEPENDS="libpng, libxml2"
TERMUX_PKG_BUILD_IN_SRC=yes

17
packages/netpbm/buildtools-Makefile.patch

@ -1,19 +1,12 @@
diff -u -r ../advanced/buildtools/Makefile ./buildtools/Makefile
--- ../advanced/buildtools/Makefile 2014-12-29 02:10:39.856106335 -0500
+++ ./buildtools/Makefile 2014-12-29 02:22:26.036106824 -0500
@@ -27,13 +27,13 @@
diff -u -r ../src-orig/buildtools/Makefile ./buildtools/Makefile
--- ../src-orig/buildtools/Makefile 2015-06-28 19:14:14.522452203 -0400
+++ ./buildtools/Makefile 2015-06-28 19:14:28.146229128 -0400
@@ -27,7 +27,7 @@
$(CC_FOR_BUILD) -c -o $@ $(CFLAGS_FOR_BUILD) \
-DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \
$(STRIP_DLL_VERSION) $(EXPLICIT) \
- $(CFLAGS_PERSONAL) $(CFLAGS) $(CADD) \
+ $(CFLAGS_PERSONAL) $(CFLAGS_FOR_BUILD) $(CADD) \
+ $(CFLAGS_PERSONAL) $(CADD) \
$<
typegen.o endiangen.o:%.o:%.c
$(CC_FOR_BUILD) -c -o $@ $(CFLAGS_FOR_BUILD) $<
-$(BUILDPROGS):%:%.o
+$(PROGS):%:%.o
$(LD_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $<
distclean clean: cleanlocal

Loading…
Cancel
Save