add netpbm with lzma-utils support for arm

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1803 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2010-01-05 17:04:22 +00:00
parent 815129ddb3
commit 3ca436bb33
7 changed files with 1277 additions and 0 deletions

View File

@@ -0,0 +1,50 @@
- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
- Try to fix parallel building
- Make the libopt tool less 'helpful'
--- lib/Makefile
+++ lib/Makefile
@@ -249,7 +249,7 @@
.PHONY: install.staticlib
install.staticlib: $(PKGDIR)/link
$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
- $(PKGDIR)/link
+ $(PKGDIR)/lib
# Install a shared library stub -- the ".so" file used at link time to
# prepare a program for dynamically linking a library at run time
@@ -257,9 +257,9 @@
install.sharedlibstub: $(PKGDIR)/link
ifeq ($(NETPBMLIBTYPE),unixshared)
# install the link-time (.so) links to the runtime libraries
- cd $(PKGDIR)/link ; \
+ cd $(PKGDIR)/lib ; \
rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
libnetpbm.$(NETPBMLIBSUFFIX)
endif
ifeq ($(NETPBMLIBTYPE),dll)
--- GNUmakefile
+++ GNUmakefile
@@ -87,6 +87,9 @@
.PHONY: nonmerge
nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
+
+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
+converter/all analyzer/all editor/all generator/all other/all: lib/all
OMIT_CONFIG_RULE = 1
include $(SRCDIR)/Makefile.common
--- buildtools/libopt.c
+++ buildtools/libopt.c
@@ -502,7 +502,7 @@
strcpy(outputLine, ""); /* initial value */
runtime = FALSE; /* initial value */
- quiet = FALSE; /* initial value */
+ quiet = TRUE; /* initial value */
error = FALSE; /* no error yet */
for (arg = 1; arg < argc && !error; arg++) {
if (strcmp(argv[arg], "-runtime") == 0)

View File

@@ -0,0 +1,51 @@
http://bugs.gentoo.org/287725
fix from upstream
--- netpbm/converter/other/pngx.c (revision 1021)
+++ netpbm/converter/other/pngx.c (revision 1022)
@@ -69,6 +69,7 @@
else
*pngxPP = pngxP;
}
+ pngxP->rw = rw;
}
}
@@ -77,7 +78,14 @@
void
pngx_destroy(struct pngx * const pngxP) {
- png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr);
+ switch(pngxP->rw) {
+ case PNGX_READ:
+ png_destroy_read_struct(&pngxP->png_ptr, &pngxP->info_ptr, NULL);
+ break;
+ case PNGX_WRITE:
+ png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr);
+ break;
+ }
free(pngxP);
}
--- netpbm/converter/other/pngx.h (revision 1021)
+++ netpbm/converter/other/pngx.h (revision 1022)
@@ -5,14 +5,14 @@
the PNG library easier and cleaner.
*/
+typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw;
+
struct pngx {
png_structp png_ptr;
- png_infop info_ptr;
+ png_infop info_ptr;
+ pngx_rw rw;
};
-typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw;
-
-
void
pngx_create(struct pngx ** const pngxPP,
pngx_rw const rw,

View File

@@ -0,0 +1,12 @@
http://bugs.gentoo.org/291987
--- netpbm/converter/other/Makefile
+++ netbpm/converter/other/Makefile
@@ -159,6 +156,7 @@
$(shell $(LIBOPT) $(NETPBMLIB)) \
$(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself
pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
$(LD) -o $@ $@.o pngtxt.o \
$(shell $(LIBOPT) $(NETPBMLIB)) \