diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-11-15 23:50:54 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-11-15 23:50:54 -0500 |
| commit | fe032ce65d9dd8ad43e6fe6043ada0b8ca8920df (patch) | |
| tree | 590538a3a85294e75364468096ac8969a7c4a350 /media-libs/netpbm/files | |
| parent | app-arch/cpio: mark 2.12-r1 arm64/m68k/s390/sh stable (diff) | |
| download | gentoo-fe032ce65d9dd8ad43e6fe6043ada0b8ca8920df.tar.gz gentoo-fe032ce65d9dd8ad43e6fe6043ada0b8ca8920df.tar.bz2 gentoo-fe032ce65d9dd8ad43e6fe6043ada0b8ca8920df.zip | |
media-libs/netpbm: version bump to 10.76.00
Diffstat (limited to 'media-libs/netpbm/files')
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.76.00-build.patch | 38 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.76.00-test.patch | 22 |
2 files changed, 60 insertions, 0 deletions
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch new file mode 100644 index 000000000000..231da5446719 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.76.00-build.patch @@ -0,0 +1,38 @@ +- Don't install libnetpbm.a and libnetpbm.so into a sep link dir +- Try to fix parallel building + +--- a/lib/Makefile ++++ b/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) +--- a/GNUmakefile ++++ b/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 + + # Parallel make (make --jobs) is not smart enough to coordinate builds + # between submakes, so a naive parallel make would cause certain diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch new file mode 100644 index 000000000000..65f30d57189a --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.76.00-test.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/450530 + +we disable fiascotopnm all the time, so delete the test too + +--- a/test/all-in-place.test ++++ b/test/all-in-place.test +@@ -53,7 +53,6 @@ ordinary_testprogs="\ + ddbugtopbm \ + escp2topbm \ + eyuvtoppm \ +- fiascotopnm \ + fitstopnm \ + fstopgm \ + g3topbm \ +--- a/test/Test-Order ++++ b/test/Test-Order +@@ -153,5 +153,4 @@ + + # Round-trip tests : lossy converters + +-fiasco-roundtrip.test + yuv-roundtrip.test |