From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- media-libs/netpbm/Manifest | 8 - .../netpbm/files/netpbm-10.66-failing-tests.patch | 28 --- .../netpbm/files/netpbm-10.66-jasper-hack.patch | 41 ----- media-libs/netpbm/files/netpbm-10.66-jbig-2.patch | 19 -- .../netpbm/files/netpbm-10.66-jpeg-dirs.patch | 28 --- .../netpbm/files/netpbm-10.66-options-case.patch | 105 ----------- .../files/netpbm-10.66-wordaccess_be_aligned.patch | 23 --- media-libs/netpbm/netpbm-10.66.00.ebuild | 195 --------------------- 8 files changed, 447 deletions(-) delete mode 100644 media-libs/netpbm/files/netpbm-10.66-failing-tests.patch delete mode 100644 media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch delete mode 100644 media-libs/netpbm/files/netpbm-10.66-jbig-2.patch delete mode 100644 media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch delete mode 100644 media-libs/netpbm/files/netpbm-10.66-options-case.patch delete mode 100644 media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch delete mode 100644 media-libs/netpbm/netpbm-10.66.00.ebuild (limited to 'media-libs/netpbm') diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index c884831a90f6..72f977d884af 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,21 +1,13 @@ AUX make-tarball.sh 1364 BLAKE2B 40001ac396b0ff26bb8e5d1a1a160b1467b4f9453d930394cf66dbc5e60b9d1e04c419801ca4ea2cbcb930797fe07df305549b7d5155e3cac3ce099a4dddbfbf SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7 AUX netpbm-10.31-build.patch 1629 BLAKE2B 26d46715ac933420fe5a9a0209edad51a754ad4f030cddd39d08f1d41418cb20ac8b0b9cc3dbaa847d6406a6778cff1b55618dee45a4a112c89a5d61be50efb3 SHA512 53e88bd1c85aa04d60ca2de7a32e5d00d9f959f3443e0c951c0694c814f6956708d8d12427a0fa8a8f76a1613d2982c3aa9b0c6ddd12b9cad3419ced1e5bb59e -AUX netpbm-10.66-failing-tests.patch 535 BLAKE2B ef4e1b2486d7aac82d8527571fbfd97819ceb2a5d8c31760ebbfe9c6411fd8fd7df7f1a21b1d17715337f16c23eea481d0e94ad59ed66bac1485f41ae260d020 SHA512 33101e745fdeb9159da48393622edf9163c85f2c133951ba33d48f80758179f18ce36e60e3357bb978c101a7a0e1688aa6dbbc1a1c646782089760908dfe2b04 -AUX netpbm-10.66-jasper-hack.patch 924 BLAKE2B c7a80010e4c61e22f0beb88f5800875a098f47fefd4b830f9d0e1b986a8def55cb1dde3ce0ec902dc2bfb922350228af08aa208268130c08aab210546c568861 SHA512 e58a5f6800e2ab511080d505e9286e4831cb498f9a02cd5823bd52bb8e267c780f4b792388ccc29023afe18005c753b6ea32a3e277b8b1e3ceb8e4b997afe359 -AUX netpbm-10.66-jbig-2.patch 725 BLAKE2B 6d8562ad0d9595b048c3e0afbd7ba0c829583aa9f9b42b47dd7c10b9bddf2e4f206b7de5efb793529ea38972d6b5a2a465a85fe4b937c8e98c0c17f0c47f1359 SHA512 5d7a90c982c67c17b37dc91b7b4668ddcbd67434873cfde86e04bac7d057d6e6cd8ace52c3fc6e0ce36f767333bb00bdfc4fb3f29f54427285214cbd2f41c42f -AUX netpbm-10.66-jpeg-dirs.patch 722 BLAKE2B e05df77a7c027263a21e5da60d9b224f31b4bc1766367503178350d8a79c2e5dd129da65fde7ae9963072a3e82c864a0ec68992237f6719e26b46ed0b0a81bdf SHA512 95a4ab08702faa3d25c75b71329ea28e5eb5f4f0b200d34d7350633e9a999160fe58e8f57fadab30e273c61a06c8d148fdebecbffa5c0b5023c59647f6d4c3ae -AUX netpbm-10.66-options-case.patch 3417 BLAKE2B adabb59db1fb2a5057aaa36bf76eaa227ac6caafeab35c377d883c509c7d800d512e8bfabe18ba202574016670a6440a381070e1539c2d095aead2daca7ba3fe SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23 AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 -AUX netpbm-10.66-wordaccess_be_aligned.patch 942 BLAKE2B b109ea0dc1aa0fca67c6f2b80d66d929918445124b4cf82b017d15897e4099cf5ca1661b968639809b0f902bfcda3f33d5e61653d7ba21e3005e50261295a71d SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 AUX netpbm-10.70-system-libs.patch 1016 BLAKE2B 84a9b4bb4552f98f0cc8b653c84e1efa437624f1895bd321ec0ef415284c93b59785ef451b9116a4e470394c43670b5c1d1028198931cce81ad166d573aca10d SHA512 156e668ff209ca42dc3bf7e9b89232065d1f5ed3284885beeb67c8c9728eb7f142aceb98898c8d8e2c2a90dd9fab927a698b4372f2f3bcbf06f6df44d1a81629 AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663466e8be04acbf52d30ca1ff50dae40dc24b0714cb50b00667f2d560c7f2ab5c7d457c90e8b31f322ca85498c3ba3d SHA512 db1d0593db6987933d7c937beeac65716866adaa079fb5329f8597b208c7dea9f6dd40b803f9dc4b3ef6cf61189c45dde9e139435b7d8e224bb83e037a7f076b AUX netpbm-10.76.00-misc-deps.patch 1665 BLAKE2B b4e87fa86fee8d66a354999ee6731cfad4238fc0c56015a5db17bcc058ca13849cd1ed2efc8d9f4bc370ac255528fc28bca30e9c82152f64000249e3eed9458e SHA512 81afe7189ac0d3cf24ec691eee89dc8fa1a1f6503c9d2e530dcdbbcf1c67c6a834b6b205c99ef633461e090baf6e8b4179954482c09b68370bea9eceabd1d3bd AUX netpbm-10.76.00-pbmtext-test.patch 707 BLAKE2B 42cbda583198a173a8210e0e6dd65392a9f138af6ee8f0271196841dd3adba65a34c59698eb5897982d5297500f8e456fa1de6e17d546f6957adf5b68237ae2e SHA512 d43a59bd92bbe7ebb8fcf60bf13fb4095beb546cb964108da740dd23c564beb2f97422535067189d49255a2ce8b7a89c01f8f98c807e6e37bfadf32e01f30bde AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc49687516cbd6fc12b00aef785877365503778b8c20226b07cf0f798eadf2da27ed5a6b9ce25ad4419358ccc88ebe8ea SHA512 49ee2306173e9cf39052e567aedf313ca7c7dd31a090defcd838a08a062d26e1320573a0ad6555e752edc8d0e8fd2e071016e2b075b20ac7e61ee3d60a3b7f14 -DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 -EBUILD netpbm-10.66.00.ebuild 5551 BLAKE2B 286f8f86ba048e3f24bd2c82e929e495481d2887d225f64ffdbae8e52b25d10977b26f3cec9fde5821419f03800d5e7beadb394aa2183565f04cf2da711eb97d SHA512 8e4ab18e164e50ecf5cc79f12bf5c5d4ce09b1ceffe82d278dd91acb664a934cf5f5c1ab6316976370745345ccccdaa22bcafaf40a803c4161bfdb640f2323f4 EBUILD netpbm-10.70.00.ebuild 5291 BLAKE2B 44d1e0f2a83811ad87ccbedc12787fd9ad45e8379ffe3901c8314515654c1dc5059a2c155e8730785287712f74d6ef5599943dc4add93458cb855b4675050c3f SHA512 1e0fd672914d2b607204a9ac7da290bc3b858395135a062218567879b110ecdbc8f24b63e06e60b1724aaf9bdf846473d9aa23705e8e11fcbf3732ab55eb8f7f EBUILD netpbm-10.76.00.ebuild 5181 BLAKE2B b0c32184934b4640f21f727ea579f9dc59c2f7e5562f346c3b61d5d3537cc18d19b2be3ee710b467b53ba342989fec56af6015213e666b52a56bca0c6b268361 SHA512 ba51a645c80128e8589a0c1f3193df358533e7f2da3e642c682e1d3e8d0596fcda6009540149c79bae0005f9fe7e5e229e431870cfd2d9560b8493b868a38957 MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b diff --git a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch b/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch deleted file mode 100644 index 63260de2e490..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -punt failing tests; already notified upstream - ---- a/test/Test-Order -+++ b/test/Test-Order -@@ -50,7 +50,6 @@ pamditherbw.test - pbmclean.test - pamcut.test - pnmcat.test --pamflip.test - pamenlarge.test - pnminvert.test - pamchannel.test -@@ -70,7 +69,6 @@ ppmmix.test - - # Symmetry test - --symmetry.test - - # Format converter tests - -@@ -87,7 +85,6 @@ ppmdfont.test - pnm-plain-roundtrip.test - pnm-pam-roundtrip.test - pnminvert-roundtrip.test --pamflip-roundtrip.test - pamdepth-roundtrip.test - pad-crop-roundtrip.test - cut-paste-roundtrip.test diff --git a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch b/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch deleted file mode 100644 index 285475dab062..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/513240 - -the jasper headers are horribly broken and break things like stdbool.h. -re-order the includes to work around this. - ---- a/converter/other/jpeg2000/jpeg2ktopam.c -+++ b/converter/other/jpeg2000/jpeg2ktopam.c -@@ -13,13 +13,14 @@ - #define _XOPEN_SOURCE 600 - #include - -+#include -+ - #include "pm_c_util.h" - #include "pam.h" - #include "shhopt.h" - #include "nstring.h" - #include "mallocvar.h" - --#include - #include "libjasper_compat.h" - - enum compmode {COMPMODE_INTEGER, COMPMODE_REAL}; ---- a/converter/other/jpeg2000/pamtojpeg2k.c -+++ b/converter/other/jpeg2000/pamtojpeg2k.c -@@ -13,13 +13,14 @@ - #define _XOPEN_SOURCE 600 - #include - -+#include -+ - #include "pm_c_util.h" - #include "pam.h" - #include "shhopt.h" - #include "nstring.h" - #include "mallocvar.h" - --#include - #include "libjasper_compat.h" - - diff --git a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch b/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch deleted file mode 100644 index f7e8cf80d6c4..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch +++ /dev/null @@ -1,19 +0,0 @@ -fix building w/jbig-2.x - ---- a/converter/other/jbig/jbigtopnm.c -+++ b/converter/other/jbig/jbigtopnm.c -@@ -230,8 +230,12 @@ int main (int argc, char **argv) - if (ferror(fin)) - pm_error("Problem while reading input file '%s", fnin); - if (result != JBG_EOK && result != JBG_EOK_INTR) -- pm_error("Problem with input file '%s': %s\n", -- fnin, jbg_strerror(result, JBG_EN)); -+ pm_error("Problem with input file '%s': %s\n", fnin, -+#ifdef JBG_EN -+ jbg_strerror(result, JBG_EN)); -+#else -+ jbg_strerror(result)); -+#endif - if (plane >= 0 && jbg_dec_getplanes(&s) <= plane) - pm_error("Image has only %d planes!\n", jbg_dec_getplanes(&s)); - diff --git a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch b/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch deleted file mode 100644 index fcf98211ba01..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -use same -I style as converter/other/Makefile so people can disable these - ---- a/converter/other/jbig/Makefile -+++ b/converter/other/jbig/Makefile -@@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o - - EXTERN_INCLUDES = - ifneq ($(JBIGHDR_DIR),NONE) -- EXTERN_INCLUDES += -I$(JBIGHDR_DIR) -+ ifneq ($(JBIGHDR_DIR)x,x) -+ EXTERN_INCLUDES += -I$(JBIGHDR_DIR) -+ endif - endif - - ifneq ($(JBIGHDR_DIR),NONE) ---- a/converter/other/jpeg2000/Makefile -+++ b/converter/other/jpeg2000/Makefile -@@ -11,7 +11,9 @@ include $(BUILDDIR)/config.mk - - EXTERN_INCLUDES = - ifneq ($(JASPERHDR_DIR),NONE) -- EXTERN_INCLUDES += -I$(JASPERHDR_DIR) -+ ifneq ($(JASPERHDR_DIR)x,x) -+ EXTERN_INCLUDES += -I$(JASPERHDR_DIR) -+ endif - endif - - diff --git a/media-libs/netpbm/files/netpbm-10.66-options-case.patch b/media-libs/netpbm/files/netpbm-10.66-options-case.patch deleted file mode 100644 index a865bc1f4514..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-options-case.patch +++ /dev/null @@ -1,105 +0,0 @@ -r2175 | giraffedata | 2014-04-01 22:28:23 -0400 (Tue, 01 Apr 2014) | 1 line - -Fix bug: inconsistent use of upper and lower case Y and N in make file variables. Make it consistently upper case - ---- buildtools/configure.pl (revision 2174) -+++ buildtools/configure.pl (revision 2175) -@@ -835,16 +835,16 @@ sub getLibTypes($$$$$$$$) { - my $response = prompt("(y)es or (n)o", $default); - - if (uc($response) =~ /^(Y|YES)$/) { -- $staticlib_too = "y"; -+ $staticlib_too = "Y"; - } elsif (uc($response) =~ /^(N|NO)$/) { -- $staticlib_too = "n"; -+ $staticlib_too = "N"; - } else { - print("'$response' isn't one of the choices. \n" . - "You must choose 'yes' or 'no' (or 'y' or 'n').\n"); - exit 12; - } - } else { -- $staticlib_too = "n"; -+ $staticlib_too = "N"; - } - print("\n"); - ---- config.mk.in (revision 2174) -+++ config.mk.in (revision 2175) -@@ -503,7 +503,7 @@ LINUXSVGAHDR_DIR = - #LINUXSVGALIB = /usr/lib/libvga.so - #LINUXSVGAHDR_DIR = /usr/include/vgalib - --# If you don't want any network functions, set OMIT_NETWORK to "y". -+# If you don't want any network functions, set OMIT_NETWORK to "Y". - # The only thing that requires network functions is the option in - # ppmtompeg to run it on multiple computers simultaneously. On some - # systems network functions don't work or we haven't figured out how to -@@ -512,11 +512,11 @@ OMIT_NETWORK = - #DJGPP/Windows, Tru64: - # (there's some minor header problem that prevents network functions from - # building on Tru64 2000.10.06) --#OMIT_NETWORK = y -+#OMIT_NETWORK = Y - - # These are -l options to link in the network libraries. Often, these are - # built into the standard C library, so this can be null. This is irrelevant --# if OMIT_NETWORK is "y". -+# if OMIT_NETWORK is "Y". - - NETWORKLD = - # Solaris, SunOS: -@@ -602,12 +602,12 @@ NETPBMLIBSUFFIX = so - # Windows shared library: - #NETPBMLIBSUFFIX = dll - --#STATICLIB_TOO is "y" to signify that you want a static library built -+#STATICLIB_TOO is "Y" to signify that you want a static library built - #and installed in addition to whatever library type you specified by - #NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, - #STATICLIB_TOO simply has no effect. --STATICLIB_TOO = y --#STATICLIB_TOO = n -+STATICLIB_TOO = Y -+#STATICLIB_TOO = N - - #STATICLIBSUFFIX is the suffix that static libraries have. It's - #meaningless if you aren't building static libraries. ---- GNUmakefile (revision 2174) -+++ GNUmakefile (revision 2175) -@@ -396,19 +396,19 @@ lib/install.hdr: - $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \ - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) - --ifeq ($(STATICLIB_TOO),y) --BUILD_STATIC = y -+ifeq ($(STATICLIB_TOO),Y) -+BUILD_STATIC = Y - else - ifeq ($(NETPBMLIBTYPE),unixstatic) -- BUILD_STATIC = y -+ BUILD_STATIC = Y - else -- BUILD_STATIC = n -+ BUILD_STATIC = N - endif - endif - - .PHONY: install.staticlib - install.staticlib: --ifeq ($(BUILD_STATIC),y) -+ifeq ($(BUILD_STATIC),Y) - $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \ - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib - endif ---- lib/Makefile (revision 2174) -+++ lib/Makefile (revision 2175) -@@ -175,7 +175,7 @@ else - ifeq ($(STATICLIB_TOO),Y) - BUILD_STATICLIB = Y - else -- BUILD_STATICLIB = n -+ BUILD_STATICLIB = N - endif - endif - diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch deleted file mode 100644 index 0da719ae07d4..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/547252 - ------------------------------------------------------------------------- -r2395 | giraffedata | 2015-01-23 13:51:17 -0500 (Fri, 23 Jan 2015) | 1 line - -Fix syntax error - -build: fix compile failure in wordint_access_be.h with -Bigendian target platforms. - -Index: trunk/lib/util/wordaccess_be_aligned.h -=================================================================== ---- trunk/lib/util/wordaccess_be_aligned.h (revision 2394) -+++ trunk/lib/util/wordaccess_be_aligned.h (revision 2395) -@@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) { - static __inline__ void - wordintToBytes(wordintBytes * const bytesP, - wordint const wordInt) { -- uint16_t const hi = ((wordInt >> 48) & 0xFF) -+ uint16_t const hi = ((wordInt >> 48) & 0xFF); - uint16_t const mh = ((wordInt >> 32) & 0xFF); - uint16_t const ml = ((wordInt >> 24) & 0xFF); - uint16_t const lo = ((wordInt >> 0) & 0xFF); diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild deleted file mode 100644 index 3091275a3a1b..000000000000 --- a/media-libs/netpbm/netpbm-10.66.00.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit toolchain-funcs eutils multilib - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" - -RDEPEND="jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - png? ( >=media-libs/libpng-1.4:0 ) - rle? ( media-libs/urt ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:0 ) - xml? ( dev-libs/libxml2 ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex" - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} -netpbm_config() { - if use $1 ; then - [[ $2 != "!" ]] && echo -l${2:-$1} - else - echo NONE - fi -} - -src_prepare() { - epatch "${FILESDIR}"/netpbm-10.31-build.patch - epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530 - epatch "${FILESDIR}"/netpbm-10.66-jasper-hack.patch #513240 - epatch "${FILESDIR}"/netpbm-10.66-options-case.patch - epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch - epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch - epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch - epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252 - - # make sure we use system urt - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -rf urt - - # avoid mixing the local copy of jbig with the system - rm converter/other/jbig/jbig.h || die - - # disable certain tests based on active USE flags - local del=( - $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip') - $(usex rle '' 'utahrle-roundtrip') - $(usex tiff '' 'tiff-roundtrip') - ) - if [[ ${#del[@]} -gt 0 ]] ; then - sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die - fi - del=( - pnmtofiasco fiascotopnm # We always disable fiasco - $(usex jbig '' 'jbigtopnm pnmtojbig') - jpeg2ktopam pamtojpeg2k # jasper has been removed - $(usex rle '' 'pnmtorle rletopnm') - $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') - ) - if [[ ${#del[@]} -gt 0 ]] ; then - sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die - sed -i '/^$/d' test/all-in-place.ok || die - fi - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - - # avoid ugly depend.mk warnings - touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF - # Misc crap - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config jpeg) - PNGLIB = $(netpbm_config png) - ZLIB = $(netpbm_config zlib z) - LINUXSVGALIB = $(netpbm_config svga vga) - XML2_LIBS = $(netpbm_config xml xml2) - JBIGLIB = $(netpbm_config jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config rle) - URTHDR_DIR = - X11LIB = $(netpbm_config X X11) - X11HDR_DIR = - EOF - # cannot chain the die with the heredoc above as bash-3 - # has a parser bug in that setup #282902 - [ $? -eq 0 ] || die "writing config.mk failed" -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/bin/{doc.url,manweb} || die - rm -r "${ED}"/usr/man/web || die - rm -r "${ED}"/usr/link || die - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - dodir /usr/share - mv "${ED}"/usr/man "${ED}"/usr/share/ || die - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - use doc && dohtml -r userguide - dodoc README - cd doc - dodoc HISTORY Netpbm.programming USERDOC - dohtml -r . -} -- cgit v1.2.3