* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2021-05-10 6:24 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-05-10 6:24 UTC (permalink / raw
To: gentoo-commits
commit: a9ca76213bf8ae926caac89806977e7b02523973
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Fri Apr 16 18:24:15 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 10 06:23:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ca7621
media-libs/netpbm: new version 10.86.21
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/netpbm/Manifest | 1 +
media-libs/netpbm/files/make-tarball.sh | 0
.../netpbm/files/netpbm-10.86.21-build.patch | 64 +++++++
.../netpbm/files/netpbm-10.86.21-misc-deps.patch | 68 +++++++
media-libs/netpbm/files/netpbm-10.86.21-test.patch | 10 +
media-libs/netpbm/netpbm-10.86.21.ebuild | 207 +++++++++++++++++++++
6 files changed, 350 insertions(+)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 5519fbb6b9d..be3d0a3dff3 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,2 +1,3 @@
DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
+DIST netpbm-10.86.21.tar.xz 3768736 BLAKE2B 19d641f3519f55d737aa6cd22f60847b2b241f71134bc7f9fa558e681cbffb1bff53f16e4d89e7a85b20b86e0bf0f4d9c341dde656ca07a7bc20adc94e811e36 SHA512 caa6c18039be72c47419b3ef60b64e0a04123752beb27bab178adcbb48e5311da05b422205f52c784149bb0636be1e3155e6bbf7703ec5c5775cb9981de1008e
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
old mode 100755
new mode 100644
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-build.patch b/media-libs/netpbm/files/netpbm-10.86.21-build.patch
new file mode 100644
index 00000000000..7995c6daaf4
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-build.patch
@@ -0,0 +1,64 @@
+- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
+- Try to fix parallel building
+
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -221,7 +221,7 @@
+ .PHONY: install.lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install a Unix-style shared library
+-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink
++install.lib: $(PKGDIR)/lib
+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
+ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
+@@ -263,29 +263,29 @@
+ $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
+
+ .PHONY: install.staticlib
+-install.staticlib: $(PKGDIR)/staticlink
++install.staticlib: $(PKGDIR)/lib
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
+- $(PKGDIR)/staticlink
++ $(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
+ .PHONY: install.sharedlibstub
+-install.sharedlibstub: $(PKGDIR)/sharedlink
++install.sharedlibstub: $(PKGDIR)/lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install the link-time (.so) links to the runtime libraries
+- cd $(PKGDIR)/sharedlink ; \
++ cd $(PKGDIR)/lib ; \
+ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
+- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+ libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \
+- $(PKGDIR)/sharedlink
++ $(PKGDIR)/lib
+ endif
+ ifeq ($(NETPBMLIBTYPE),dylib)
+- cd $(PKGDIR)/sharedlink/ ; \
++ cd $(PKGDIR)/lib/ ; \
+ rm -f libnetpbm.dylib; \
+- $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
++ $(SYMLINK) libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
+ endif
+
+ distclean clean: localclean
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -102,6 +102,9 @@
+ .PHONY: nonmerge
+ nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
+
++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
++converter/all analyzer/all editor/all generator/all other/all: lib/all
++
+ # Completely parallel make (make --jobs) does not work because there are
+ # multiple targets somewhere in the Netpbm build that depend upon pm_config.h
+ # and similar targets, and the threads building those multiple targets might
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch
new file mode 100644
index 00000000000..78c7670c9a8
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch
@@ -0,0 +1,68 @@
+do not autoprobe deps when we disabled them
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -75,7 +75,10 @@
+
+ PROG_SUBDIRS = converter analyzer editor generator other
+ PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
+-SUPPORT_SUBDIRS = urt icon buildtools test
++SUPPORT_SUBDIRS = icon buildtools test
++ifeq ($(URTLIB),$(BUNDLED_URTLIB))
++SUPPORT_SUBDIRS += urt
++endif
+
+ SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
+
+--- a/converter/other/Makefile
++++ b/converter/other/Makefile
+@@ -7,6 +7,7 @@
+
+ include $(BUILDDIR)/config.mk
+
++ifneq ($(XML2_LIBS),NONE)
+ TEST_PKGCONFIG_LIBXML2 = if $(PKG_CONFIG) libxml-2.0; then echo exists; fi
+
+ ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
+@@ -22,6 +23,7 @@
+ XML2_CFLAGS=$(shell xml2-config --cflags)
+ endif
+ endif
++endif
+
+ SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
+ ifneq ($(BUILD_FIASCO), N)
+@@ -34,6 +36,7 @@
+ endif
+ endif
+
++ifneq ($(PNGLIB),NONE)
+ TEST_PKGCONFIG_LIBPNG = if $(PKG_CONFIG) libpng$(PNGVER); then echo exists; fi
+
+ ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
+@@ -58,6 +61,7 @@
+ endif
+ endif
+ endif
++endif
+
+ ifneq ($(JPEGLIB),NONE)
+ ifneq ($(JPEGHDR_DIR)x,x)
+--- a/other/pamx/Makefile
++++ b/other/pamx/Makefile
+@@ -9,6 +9,7 @@
+
+ EXTERN_INCLUDE =
+
++ifneq ($(X11LIB),NONE)
+ ifeq ($(shell $(PKG_CONFIG) x11 --modversion --silence-errors),)
+ # Pkg-config has never heard of X11, or doesn't even exist
+
+@@ -23,6 +24,7 @@
+ X11LIB = $(shell $(PKG_CONFIG) x11 --libs)
+ EXTERN_INCLUDES += $(shell $(PKG_CONFIG) x11 --cflags)
+ endif
++endif
+
+ ifeq ($(HAVE_X11LIB),Y)
+ PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-test.patch b/media-libs/netpbm/files/netpbm-10.86.21-test.patch
new file mode 100644
index 00000000000..b7758fdbd61
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.21-test.patch
@@ -0,0 +1,10 @@
+`print ("got color map\n");` removed from `editor/pnmquantall` so remove from test
+Do this from the patch instead of ebuild because if upstream also fixes it the patch will fail, sed would not
+
+--- a/test/pnmquantall.ok
++++ b/test/pnmquantall.ok
+@@ -1,4 +1,3 @@
+-got color map
+ 2373957371 33838
+ 3892560659 33838
+ 1383839923 33838
diff --git a/media-libs/netpbm/netpbm-10.86.21.ebuild b/media-libs/netpbm/netpbm-10.86.21.ebuild
new file mode 100644
index 00000000000..4ce9a9ab909
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.86.21.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.21/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+
+BDEPEND="
+ app-arch/xz-utils
+ sys-devel/flex
+ virtual/pkgconfig
+"
+RDEPEND="jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ png? ( >=media-libs/libpng-1.4:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ 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}"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+ "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+)
+
+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() {
+ default
+
+ # make sure we use system libs
+ sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+ # 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
+ sed -i \
+ -e 's:pkg-config:$(PKG_CONFIG):' \
+ GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+ # The postscript knob is currently bound up with a fork test.
+ if ! use postscript ; then
+ sed -i \
+ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+ converter/other/Makefile generator/Makefile || die
+ sed -i -r \
+ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+ sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
+ fi
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -i -r \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i -e '/^$/d' test/all-in-place.ok || die
+
+ sed -i -r \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ test/legacy-names.{ok,test} || die
+ sed -i -e '/^$/d' test/legacy-names.ok || die
+ fi
+
+ # 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)
+ PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+ 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,data}
+ 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
+
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ # Remove cruft that we don't need, and move around stuff we want
+ rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+ dodir /usr/share
+ mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+ doman userguide/*.[0-9]
+ dodoc README
+
+ cd doc || die
+ dodoc HISTORY Netpbm.programming USERDOC
+ docinto html
+ dodoc -r *.html
+
+ use doc && dodoc -r ../userguide/*.html
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2024-11-25 8:12 Viorel Munteanu
0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-11-25 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 2f9fc8bf2054d8f9f81874a8929cc3a0f3303fc7
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 08:08:18 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 08:12:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9fc8bf
media-libs/netpbm: backport fix for gcc-15
Applied patch from upstream dev branch to 11.8.2 and backported it to
11.2.11.
The fix only works for gcc. clang -std=gnu23 is fixed on dev branch,
but the patch is too big, so let's just wait for it to reach
advanced and stable.
Closes: https://bugs.gentoo.org/943971
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../netpbm/files/netpbm-11.2.11-fix-C23.patch | 245 +++++++++++++++++++
media-libs/netpbm/netpbm-11.2.11-r1.ebuild | 267 +++++++++++++++++++++
2 files changed, 512 insertions(+)
diff --git a/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch
new file mode 100644
index 000000000000..8f4d82994564
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch
@@ -0,0 +1,245 @@
+https://sourceforge.net/p/netpbm/code/4969/
+https://bugs.gentoo.org/943971
+
+Backport files/netpbm-11.8.2-fix-C23.patch to 11.2.11
+
+--- a/buildtools/libopt.c
++++ b/buildtools/libopt.c
+@@ -85,18 +85,11 @@
+ # define SHLIBPREFIXLIST "lib"
+ #endif
+
++#include <stdbool.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+
+-typedef unsigned char bool;
+-#ifndef TRUE
+-#define TRUE (1)
+-#endif
+-#ifndef FALSE
+-#define FALSE (0)
+-#endif
+-
+ #ifdef DLLVERSTR
+ static const char * dllverstr = DLLVERSTR;
+ #else
+@@ -105,9 +98,9 @@ static const char * dllverstr = "";
+
+ bool const explicit =
+ #ifdef EXPLICIT
+-TRUE
++true
+ #else
+-FALSE
++false
+ #endif
+ ;
+
+@@ -131,17 +124,17 @@ parse_prefixlist(const char * const prefixlist,
+ there is guaranteed always to be one null string at the end of the
+ array.
+
+- In case of error, return *errorP == TRUE and don't allocate any
+- storage. Otherwise, return *errorP = FALSE.
++ In case of error, return *errorP == true and don't allocate any
++ storage. Otherwise, return *errorP = false.
+ -----------------------------------------------------------------------------*/
+ char * prlist;
+
+ prlist = strdup(prefixlist);
+ if (prlist == NULL)
+- *errorP = TRUE;
++ *errorP = true;
+ else {
+- if (strlen(prlist) <= 0)
+- *errorP = TRUE;
++ if (strlen(prlist) <= 0)
++ *errorP = true;
+ else {
+ /* NOTE: Mac OS X, at least, does not have strtok_r().
+ 2001.09.24
+@@ -155,18 +148,18 @@ parse_prefixlist(const char * const prefixlist,
+ }
+ num_tokens = 0;
+ token = strtok(prlist, " ");
+- *errorP = FALSE; /* initial value */
++ *errorP = false; /* initial value */
+ while (token != NULL && num_tokens < MAX_PREFIXES && !*errorP) {
+ parsed_prefixes[num_tokens] = strdup (token);
+- if (parsed_prefixes[num_tokens] == NULL)
+- *errorP = TRUE;
++ if (parsed_prefixes[num_tokens] == NULL)
++ *errorP = true;
+ num_tokens++;
+ token = strtok(NULL, " ");
+ }
+ for (i = num_tokens; i < MAX_PREFIXES + 1 && !*errorP; i++) {
+ parsed_prefixes[i] = strdup("");
+- if (parsed_prefixes[i] == NULL)
+- *errorP = TRUE;
++ if (parsed_prefixes[i] == NULL)
++ *errorP = true;
+ }
+ }
+ if (*errorP) {
+@@ -194,7 +187,7 @@ parse_prefix(const char * const filename,
+ (The prefix always starts at the beginning of the filename).
+
+ Iff we don't find a valid library name prefix, return *prefix_good_p
+- == FALSE.
++ == false.
+
+ The list of valid prefixes is compiled in as the blank-delimited
+ string which is the value of the SHLIBPREFIXLIST macro.
+@@ -231,7 +224,7 @@ parse_prefix(const char * const filename,
+ i = 0; /* start with the first entry in shlibprefixlist[] */
+ prefix_length = 0; /* initial value */
+ prefix = shlibprefixlist[i];
+- prefix_good = FALSE; /* initial value */
++ prefix_good = false; /* initial value */
+ while ( (*prefix != '\0' ) && !prefix_good ) {
+ /* stop condition: shlibprefixlist has MAX_PREFIXES+1 entries.
+ * we only ever put tokens in the 0..MAX_PREFIXES-1 positions.
+@@ -242,7 +235,7 @@ parse_prefix(const char * const filename,
+ */
+ prefix_length = strlen(prefix);
+ if (strncmp(filename, prefix, prefix_length) == 0) {
+- prefix_good = TRUE;
++ prefix_good = true;
+ /* at this point, prefix is pointing to the correct
+ * entry, and prefix_length has the correct value.
+ * When we bail out of the while loop because of the
+@@ -279,16 +272,16 @@ parse_filename(const char * const filename,
+
+ E.g. for "libxyz.so", return "xyz".
+
+- return *valid_library_p == TRUE iff 'filename' validly names a library
++ return *valid_library_p == true iff 'filename' validly names a library
+ that can be expressed in a -l linker option.
+
+- return *static_p == TRUE iff 'filename' indicates a static library.
+- (but undefined if *valid_library_p != TRUE).
++ return *static_p == true iff 'filename' indicates a static library.
++ (but undefined if *valid_library_p != true).
+
+- return *error_p == TRUE iff some error such as out of memory prevents
++ return *error_p == true iff some error such as out of memory prevents
+ parsing.
+
+- Do not allocate any memory if *error_p == TRUE or *valid_library_p == FALSE.
++ Do not allocate any memory if *error_p == true or *valid_library_p == false.
+ -----------------------------------------------------------------------------*/
+ char *lastdot;
+ /* Pointer to last period in 'filename'. Null if none */
+@@ -305,21 +298,21 @@ parse_filename(const char * const filename,
+ /* This filename doesn't have any suffix, so we don't understand
+ it as a library filename.
+ */
+- *valid_library_p = FALSE;
+- *error_p = FALSE;
++ *valid_library_p = false;
++ *error_p = false;
+ } else {
+ unsigned int prefix_length;
+ bool prefix_good;
+
+ if (strcmp(lastdot + 1, "a") == 0)
+- *static_p = TRUE;
++ *static_p = true;
+ else
+- *static_p = FALSE;
++ *static_p = false;
+
+ parse_prefix(filename, &prefix_good, &prefix_length, error_p);
+ if (!*error_p) {
+ if (!prefix_good) {
+- *valid_library_p = FALSE;
++ *valid_library_p = false;
+ } else {
+ /* Extract everything between <prefix> and "." as
+ the library name root.
+@@ -328,7 +321,7 @@ parse_filename(const char * const filename,
+
+ libname = strdup(filename + prefix_length);
+ if (libname == NULL)
+- *error_p = TRUE;
++ *error_p = true;
+ else {
+ libname[lastdot - filename - prefix_length] = '\0';
+ if (strlen(dllverstr) > 0) {
+@@ -341,10 +334,10 @@ parse_filename(const char * const filename,
+ }
+ }
+ if (strlen(libname) == 0) {
+- *valid_library_p = FALSE;
++ *valid_library_p = false;
+ strfree(libname);
+ } else
+- *valid_library_p = TRUE;
++ *valid_library_p = true;
+ }
+ *libname_p = libname;
+ }
+@@ -377,14 +370,14 @@ parse_filepath(const char * const filepath,
+ */
+ *filename_p = strdup(filepath);
+ if (*filename_p == NULL)
+- *error_p = TRUE;
++ *error_p = true;
+ else {
+ directory = strdup("");
+ if (directory == NULL) {
+- *error_p = TRUE;
++ *error_p = true;
+ strfree(*filename_p);
+ } else
+- *error_p = FALSE;
++ *error_p = false;
+ }
+ } else {
+ /* Split the string at the slash we just found, into filename and
+@@ -392,14 +385,14 @@ parse_filepath(const char * const filepath,
+ */
+ *filename_p = strdup(lastslash+1);
+ if (*filename_p == NULL)
+- *error_p = TRUE;
++ *error_p = true;
+ else {
+ directory = strdup(filepath);
+ if (directory == NULL) {
+- *error_p = TRUE;
++ *error_p = true;
+ strfree(*filename_p);
+ } else {
+- *error_p = FALSE;
++ *error_p = false;
+ directory[lastslash - filepath] = '\0';
+ }
+ }
+@@ -503,12 +496,12 @@ main(int argc, char **argv) {
+ char outputLine[1024];
+
+ strcpy(outputLine, ""); /* initial value */
+- runtime = FALSE; /* initial value */
+- error = FALSE; /* no error yet */
++ runtime = false; /* initial value */
++ error = false; /* no error yet */
+
+ for (arg = 1; arg < argc && !error; arg++) {
+ if (strcmp(argv[arg], "-runtime") == 0)
+- runtime = TRUE;
++ runtime = true;
+ else if (strcmp(argv[arg], "-quiet") == 0) {
+ /* Doesn't do anything today */
+ } else {
+@@ -518,7 +511,7 @@ main(int argc, char **argv) {
+ if (!error) {
+ if (strlen(outputLine) + strlen(options) + 1 + 1 >
+ sizeof(outputLine))
+- error = TRUE;
++ error = true;
+ else {
+ strcat(outputLine, " ");
+ strcat(outputLine, options);
diff --git a/media-libs/netpbm/netpbm-11.2.11-r1.ebuild b/media-libs/netpbm/netpbm-11.2.11-r1.ebuild
new file mode 100644
index 000000000000..2dda088e9c41
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.11-r1.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
+# They only provide a tarball for super stable, but super stable is a bit lagging.
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.8.yy) on SLOT "0/advanced".
+# The stable branch is stabilized according to usual Gentoo rules, while the
+# advanced branch will not be stabilized.
+# A detailed explanation is here https://netpbm.sourceforge.net/release.html
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="https://netpbm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
+SLOT="0/stable"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
+
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+# some installed programs are perl scripts
+RDEPEND="
+ dev-lang/perl
+ jbig? ( media-libs/jbigkit:= )
+ jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
+ png? (
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ )
+ postscript? (
+ app-text/ghostscript-gpl
+ sys-libs/zlib
+ )
+ rle? ( media-libs/urt:= )
+ svga? ( media-libs/svgalib )
+ tiff? ( >=media-libs/tiff-3.5.5:= )
+ xml? ( dev-libs/libxml2 )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ app-arch/xz-utils
+ app-alternatives/lex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
+ "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
+ "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
+ "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
+ "${FILESDIR}"/netpbm-11.7.2-lto.patch
+ "${FILESDIR}"/netpbm-11.2.11-fix-C23.patch
+)
+
+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_lib() {
+ usex ${1} -l${2:-$1} NONE
+}
+
+# for bug #828127
+netpbm_cflags_for_build() {
+ if is-flagq -fPIC; then
+ echo -fPIC
+ fi
+}
+
+src_prepare() {
+ default
+
+ # make sure we use system libs
+ sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+ # fix typo in a test
+ sed -i \
+ -e 's:^o#! /bin/sh:#! /bin/sh:' \
+ test/stdin-ppm3.test || die
+
+ # 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
+ sed -i \
+ -e 's:pkg-config:$(PKG_CONFIG):' \
+ GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+ # The postscript knob is currently bound up with a fork test.
+ if ! use postscript ; then
+ sed -i \
+ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+ converter/other/Makefile generator/Makefile || die
+ sed -i -r \
+ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i \
+ -e 's:lps-roundtrip.*::' \
+ -e 's:pbmtextps-dump.*::' \
+ -e 's:pbmtextps.*::' \
+ test/Test-Order || die
+ sed -i \
+ -e '/^$/d' \
+ test/all-in-place.ok || die
+ sed -i \
+ '2iexit 80' \
+ test/ps-{alt-,flate-,}roundtrip.test || die
+ fi
+
+ # the new postscript test needs +x
+ chmod +x test/lps-roundtrip.test || die
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -i -E \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i \
+ -e '/^$/d' \
+ test/all-in-place.ok || die
+
+ sed -i -E \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ test/legacy-names.{ok,test} || die
+ sed -i \
+ -e '/^$/d' \
+ test/legacy-names.ok || die
+ sed -i \
+ -e 's:png-roundtrip.*::' \
+ -e 's:winicon-roundtrip.*::' \
+ test/Test-Order || die
+ fi
+
+ # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+ # pbmtext-utf8 requires locale, not available on musl
+ # ppmpat-random is broken on musl
+ # bug #907295
+ if use elibc_musl; then
+ sed \
+ -e 's:pbmtext-iso88591.*::' \
+ -e 's:pbmtext-utf8.*::' \
+ -e 's:ppmpat-random.*::' \
+ -i test/Test-Order || die
+ fi
+}
+
+src_configure() {
+ cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed"
+ # Misc stuff
+ 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)
+ PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+ STRIPFLAG =
+ CFLAGS_SHLIB = -fPIC
+ CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
+
+ 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_lib tiff)
+ # Let tiff worry about its own dependencies #395753
+ TIFFLIB_NEEDS_JPEG = N
+ TIFFLIB_NEEDS_Z = N
+ JPEGLIB = $(netpbm_config_lib jpeg)
+ PNGLIB = $(netpbm_config_lib png)
+ ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+ LINUXSVGALIB = $(netpbm_config_lib svga vga)
+ XML2_LIBS = $(netpbm_config_lib xml xml2)
+ JBIGLIB = $(netpbm_config_lib jbig)
+ JBIGHDR_DIR =
+ JASPERLIB = NONE
+ JASPERHDR_DIR =
+ URTLIB = $(netpbm_config_lib rle)
+ URTHDR_DIR =
+ X11LIB = $(netpbm_config_lib X X11)
+ X11HDR_DIR =
+ EOF
+}
+
+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,data}
+ 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
+
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ # Remove cruft that we don't need, and move around stuff we want
+ rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+ dodir /usr/share
+ mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+ doman userguide/*.[0-9]
+ dodoc README
+
+ cd doc || die
+ dodoc HISTORY Netpbm.programming USERDOC
+ docinto html
+ dodoc -r ../userguide/*.html
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2024-11-24 11:21 Viorel Munteanu
0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-11-24 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 89ce343124c6a1dbc28e9d268af9e8912ddd5765
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 10:41:24 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 11:21:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ce3431
media-libs/netpbm: fix building with gcc-15
Bug: https://bugs.gentoo.org/943971
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch | 14 ++++++++++++++
.../{netpbm-11.8.1.ebuild => netpbm-11.8.1-r1.ebuild} | 1 +
2 files changed, 15 insertions(+)
diff --git a/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch
new file mode 100644
index 000000000000..a749ec434d31
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/943971
+
+--- a/buildtools/libopt.c
++++ b/buildtools/libopt.c
+@@ -89,7 +89,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++#if __STDC_VERSION__ < 202311L
+ typedef unsigned char bool;
++#endif
+ #ifndef TRUE
+ #define TRUE (1)
+ #endif
diff --git a/media-libs/netpbm/netpbm-11.8.1.ebuild b/media-libs/netpbm/netpbm-11.8.1-r1.ebuild
similarity index 99%
rename from media-libs/netpbm/netpbm-11.8.1.ebuild
rename to media-libs/netpbm/netpbm-11.8.1-r1.ebuild
index 31d10bb8169f..3626f909bb88 100644
--- a/media-libs/netpbm/netpbm-11.8.1.ebuild
+++ b/media-libs/netpbm/netpbm-11.8.1-r1.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
"${FILESDIR}"/netpbm-11.7.2-lto.patch
+ "${FILESDIR}"/netpbm-11.8.1-fix-C23.patch
)
netpbm_libtype() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2024-09-29 9:14 Viorel Munteanu
0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-09-29 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 312c0e88fabc8e8b9a28be23f871b8dcf01428df
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 08:36:19 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 09:13:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312c0e88
media-libs/netpbm: add 11.2.11, 11.7.2
Closes: https://bugs.gentoo.org/940328
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
media-libs/netpbm/Manifest | 2 +
media-libs/netpbm/files/netpbm-11.7.2-lto.patch | 58 ++++++
media-libs/netpbm/netpbm-11.2.11.ebuild | 266 ++++++++++++++++++++++++
media-libs/netpbm/netpbm-11.7.2.ebuild | 258 +++++++++++++++++++++++
4 files changed, 584 insertions(+)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index b0154e1071b7..5c8e3156d7df 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,5 @@
DIST netpbm-11.2.10.tar.xz 3782160 BLAKE2B 22dab865106f48a83992ff780a3a3cb26e7fd279b4e22f622a5f6459f90aecf70ce85ce65fd9f14ebe9a148a92ac2b0eb35ca95b0feb88dc0cbe24d11921e4d3 SHA512 baa12b1aa5d66967d900f3d92ebd9cdf2bc936389fd943b995ed863b9f57977bdb6c1e92588252b6219d26d06085b7ea5e3400f1d9be688cb538c807b84293bf
+DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b
DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
DIST netpbm-11.7.1.tar.xz 3805692 BLAKE2B af7d9374c0dbea1b77a02bb9ea371dd46faac4225cef179d5076ae3f41115b681728267a9cc84c8544f0217647206648242499043b15cf9e076f1c5e41c134ec SHA512 7a07a0d959944a95c51853d9a5392302de00ebd0c18a9039ceeaf4b398bf796c9079aa8c0c46865f4b19628c1bda29b60c9efec4ee7b7968db82ba3e83f5c079
+DIST netpbm-11.7.2.tar.xz 3805736 BLAKE2B 8b194c5c49d2422cb5101579716a0295bb364c80172e9a4eeb563e1cdbe44e681397e15207d117da7f0bb997cb90d3c4c8cb4299bc33ede74f9e845714448c1d SHA512 1a56118e89ce68caca09b59b05da7291e1ca706279862ea77e5266022aa939f32e49f9ea127065776f64faff3222ea3f24b6a385bcd6c34a60eb86207983a9b8
diff --git a/media-libs/netpbm/files/netpbm-11.7.2-lto.patch b/media-libs/netpbm/files/netpbm-11.7.2-lto.patch
new file mode 100644
index 000000000000..b3e47fbcdcd4
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.7.2-lto.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/940328
+
+--- a/converter/ppm/ppmtompeg/mpeg.c
++++ b/converter/ppm/ppmtompeg/mpeg.c
+@@ -97,7 +97,7 @@
+ /* important -- don't initialize anything here */
+ /* must be re-initted anyway in GenMPEGStream */
+
+-extern int IOtime;
++extern time_t IOtime;
+ extern boolean resizeFrame;
+ extern int outputWidth, outputHeight;
+ int gopSize = 100; /* default */
+@@ -431,7 +431,7 @@
+ boolean const childProcess,
+ boolean const remoteIO,
+ MpegFrame ** const bFramePP,
+- int * const IOtimeP,
++ time_t * const IOtimeP,
+ unsigned int * const framesReadP) {
+ /*----------------------------------------------------------------------------
+ Get Frame 'frameNum', which is a B frame related to previous reference
+@@ -480,7 +480,7 @@
+ struct inputSource * const inputSourceP,
+ boolean const remoteIo,
+ boolean const childProcess,
+- int * const IOtimeP,
++ time_t * const IOtimeP,
+ BitBucket * const wholeStreamBbP,
+ const char * const outputFileName,
+ unsigned int * const framesReadP,
+@@ -653,7 +653,7 @@
+ const char * const inputConversion,
+ MpegFrame * const pastRefFrameP,
+ unsigned int * const framesReadP,
+- int * const ioTimeP,
++ time_t * const ioTimeP,
+ bool * const endOfStreamP) {
+ /*----------------------------------------------------------------------------
+ Read the next frame from Standard Input and add it to the linked list
+@@ -804,7 +804,7 @@
+ const char * const inputConversion,
+ MpegFrame ** const framePP,
+ unsigned int * const framesReadP,
+- int * const ioTimeP) {
++ time_t * const ioTimeP) {
+
+ /* This needs to be modularized. It shouldn't issue messages about
+ encoding GOPs and B frames, since it knows nothing about those.
+@@ -913,7 +913,7 @@
+ const char * const slaveConversion,
+ const char * const inputConversion,
+ unsigned int * const framesReadP,
+- int * const ioTimeP) {
++ time_t * const ioTimeP) {
+ /*----------------------------------------------------------------------------
+ Get frame with number 'frameNumber' as *frameP.
+
diff --git a/media-libs/netpbm/netpbm-11.2.11.ebuild b/media-libs/netpbm/netpbm-11.2.11.ebuild
new file mode 100644
index 000000000000..9a28f7bcf4a0
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.11.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
+# They only provide a tarball for super stable, but super stable is a bit lagging.
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.7.yy) on SLOT "0/advanced".
+# The stable branch is stabilized according to usual Gentoo rules, while the
+# advanced branch will not be stabilized.
+# A detailed explanation is here https://netpbm.sourceforge.net/release.html
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="https://netpbm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
+SLOT="0/stable"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
+
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+# some installed programs are perl scripts
+RDEPEND="
+ dev-lang/perl
+ jbig? ( media-libs/jbigkit:= )
+ jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
+ png? (
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ )
+ postscript? (
+ app-text/ghostscript-gpl
+ sys-libs/zlib
+ )
+ rle? ( media-libs/urt:= )
+ svga? ( media-libs/svgalib )
+ tiff? ( >=media-libs/tiff-3.5.5:= )
+ xml? ( dev-libs/libxml2 )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ app-arch/xz-utils
+ app-alternatives/lex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
+ "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
+ "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
+ "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
+ "${FILESDIR}"/netpbm-11.7.2-lto.patch
+)
+
+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_lib() {
+ usex ${1} -l${2:-$1} NONE
+}
+
+# for bug #828127
+netpbm_cflags_for_build() {
+ if is-flagq -fPIC; then
+ echo -fPIC
+ fi
+}
+
+src_prepare() {
+ default
+
+ # make sure we use system libs
+ sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+ # fix typo in a test
+ sed -i \
+ -e 's:^o#! /bin/sh:#! /bin/sh:' \
+ test/stdin-ppm3.test || die
+
+ # 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
+ sed -i \
+ -e 's:pkg-config:$(PKG_CONFIG):' \
+ GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+ # The postscript knob is currently bound up with a fork test.
+ if ! use postscript ; then
+ sed -i \
+ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+ converter/other/Makefile generator/Makefile || die
+ sed -i -r \
+ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i \
+ -e 's:lps-roundtrip.*::' \
+ -e 's:pbmtextps-dump.*::' \
+ -e 's:pbmtextps.*::' \
+ test/Test-Order || die
+ sed -i \
+ -e '/^$/d' \
+ test/all-in-place.ok || die
+ sed -i \
+ '2iexit 80' \
+ test/ps-{alt-,flate-,}roundtrip.test || die
+ fi
+
+ # the new postscript test needs +x
+ chmod +x test/lps-roundtrip.test || die
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -i -E \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ test/all-in-place.{ok,test} || die
+ sed -i \
+ -e '/^$/d' \
+ test/all-in-place.ok || die
+
+ sed -i -E \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ test/legacy-names.{ok,test} || die
+ sed -i \
+ -e '/^$/d' \
+ test/legacy-names.ok || die
+ sed -i \
+ -e 's:png-roundtrip.*::' \
+ -e 's:winicon-roundtrip.*::' \
+ test/Test-Order || die
+ fi
+
+ # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+ # pbmtext-utf8 requires locale, not available on musl
+ # ppmpat-random is broken on musl
+ # bug #907295
+ if use elibc_musl; then
+ sed \
+ -e 's:pbmtext-iso88591.*::' \
+ -e 's:pbmtext-utf8.*::' \
+ -e 's:ppmpat-random.*::' \
+ -i test/Test-Order || die
+ fi
+}
+
+src_configure() {
+ cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed"
+ # Misc stuff
+ 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)
+ PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+ STRIPFLAG =
+ CFLAGS_SHLIB = -fPIC
+ CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
+
+ 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_lib tiff)
+ # Let tiff worry about its own dependencies #395753
+ TIFFLIB_NEEDS_JPEG = N
+ TIFFLIB_NEEDS_Z = N
+ JPEGLIB = $(netpbm_config_lib jpeg)
+ PNGLIB = $(netpbm_config_lib png)
+ ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+ LINUXSVGALIB = $(netpbm_config_lib svga vga)
+ XML2_LIBS = $(netpbm_config_lib xml xml2)
+ JBIGLIB = $(netpbm_config_lib jbig)
+ JBIGHDR_DIR =
+ JASPERLIB = NONE
+ JASPERHDR_DIR =
+ URTLIB = $(netpbm_config_lib rle)
+ URTHDR_DIR =
+ X11LIB = $(netpbm_config_lib X X11)
+ X11HDR_DIR =
+ EOF
+}
+
+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,data}
+ 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
+
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ # Remove cruft that we don't need, and move around stuff we want
+ rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+ dodir /usr/share
+ mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+ doman userguide/*.[0-9]
+ dodoc README
+
+ cd doc || die
+ dodoc HISTORY Netpbm.programming USERDOC
+ docinto html
+ dodoc -r ../userguide/*.html
+}
diff --git a/media-libs/netpbm/netpbm-11.7.2.ebuild b/media-libs/netpbm/netpbm-11.7.2.ebuild
new file mode 100644
index 000000000000..7d8bd8900ea6
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.7.2.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
+# They only provide a tarball for super stable, but super stable is a bit lagging.
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.7.yy) on SLOT "0/advanced".
+# The stable branch is stabilized according to usual Gentoo rules, while the
+# advanced branch will not be stabilized.
+# A detailed explanation is here https://netpbm.sourceforge.net/release.html
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="https://netpbm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
+SLOT="0/advanced"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
+
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+# some installed programs are perl scripts
+RDEPEND="
+ dev-lang/perl
+ jbig? ( media-libs/jbigkit:= )
+ jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
+ png? (
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ )
+ postscript? (
+ app-text/ghostscript-gpl
+ sys-libs/zlib
+ )
+ rle? ( media-libs/urt:= )
+ svga? ( media-libs/svgalib )
+ tiff? ( >=media-libs/tiff-3.5.5:= )
+ xml? ( dev-libs/libxml2 )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ app-arch/xz-utils
+ app-alternatives/lex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.86.21-build.patch
+ "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
+ "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
+ "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
+ "${FILESDIR}"/netpbm-11.7.2-lto.patch
+)
+
+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_lib() {
+ usex ${1} -l${2:-$1} NONE
+}
+
+# for bug #828127
+netpbm_cflags_for_build() {
+ if is-flagq -fPIC; then
+ echo -fPIC
+ fi
+}
+
+src_prepare() {
+ default
+
+ # make sure we use system libs
+ sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+ # 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 \
+ -e '/^importinc:/s|^|importinc:\nmanual_|' \
+ -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+ -i common.mk || die
+ sed \
+ -e '/%.c/s: importinc$::' \
+ -i common.mk lib/Makefile lib/util/Makefile || die
+ sed \
+ -e 's:pkg-config:$(PKG_CONFIG):' \
+ -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+ # The postscript knob is currently bound up with a fork test.
+ if ! use postscript ; then
+ sed \
+ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+ -i converter/other/Makefile generator/Makefile || die
+ sed -r \
+ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+ -i test/all-in-place.{ok,test} || die
+ sed \
+ -e 's:lps-roundtrip.*::' \
+ -e 's:pbmtextps-dump.*::' \
+ -e 's:pbmtextps.*::' \
+ -i test/Test-Order || die
+ sed \
+ -e '/^$/d' \
+ -i test/all-in-place.ok || die
+ sed \
+ '2iexit 80' \
+ -i test/ps-{alt-,flate-,}roundtrip.test || die
+ fi
+
+ # Do not test png if not built
+ if ! use png ; then
+ sed -E \
+ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+ -i test/all-in-place.{ok,test} || die
+ sed \
+ -e '/^$/d' \
+ -i test/all-in-place.ok || die
+
+ sed -E \
+ -e 's:(pamrgbatopng|pngtopnm).*::' \
+ -i test/legacy-names.{ok,test} || die
+ sed \
+ -e '/^$/d' \
+ -i test/legacy-names.ok || die
+ sed \
+ -e 's:png-roundtrip.*::' \
+ -e 's:winicon-roundtrip.*::' \
+ -i test/Test-Order || die
+ fi
+
+ # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+ # pbmtext-utf8 requires locale, not available on musl
+ # ppmpat-random and pnmindex are broken on musl
+ # bug #907295
+ if use elibc_musl; then
+ sed \
+ -e 's:pbmtext-iso88591.*::' \
+ -e 's:pbmtext-utf8.*::' \
+ -e 's:ppmpat-random.*::' \
+ -e 's:pnmindex.*::' \
+ -i test/Test-Order || die
+ fi
+}
+
+src_configure() {
+ cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed"
+ # Misc stuff
+ 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)
+ PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+ STRIPFLAG =
+ CFLAGS_SHLIB = -fPIC
+ CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
+
+ 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_lib tiff)
+ # Let tiff worry about its own dependencies #395753
+ TIFFLIB_NEEDS_JPEG = N
+ TIFFLIB_NEEDS_Z = N
+ JPEGLIB = $(netpbm_config_lib jpeg)
+ PNGLIB = $(netpbm_config_lib png)
+ ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+ LINUXSVGALIB = $(netpbm_config_lib svga vga)
+ XML2_LIBS = $(netpbm_config_lib xml xml2)
+ JBIGLIB = $(netpbm_config_lib jbig)
+ JBIGHDR_DIR =
+ JASPERLIB = NONE
+ JASPERHDR_DIR =
+ URTLIB = $(netpbm_config_lib rle)
+ URTHDR_DIR =
+ X11LIB = $(netpbm_config_lib X X11)
+ X11HDR_DIR =
+ EOF
+}
+
+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,data}
+ 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
+
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ # Remove cruft that we don't need, and move around stuff we want
+ rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+ dodir /usr/share
+ mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+ doman userguide/*.[0-9]
+ dodoc README
+
+ cd doc || die
+ dodoc HISTORY USERDOC
+ docinto html
+ dodoc -r ../userguide/*.html
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2024-04-12 10:04 Viorel Munteanu
0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2024-04-12 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 767b1858b6e42a550309b1daff116f1dda1ba4f4
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 10:01:01 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 10:04:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767b1858
media-libs/netpbm: fix build with gcc-14
Closes: https://bugs.gentoo.org/929019
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../files/netpbm-11.6.1-incompatible-pointer-types.patch | 13 +++++++++++++
.../{netpbm-11.2.9.ebuild => netpbm-11.2.9-r1.ebuild} | 1 +
.../{netpbm-11.6.1.ebuild => netpbm-11.6.1-r1.ebuild} | 1 +
3 files changed, 15 insertions(+)
diff --git a/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..785ca247719c
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/929019
+
+--- a/converter/other/pnmtorle.c
++++ b/converter/other/pnmtorle.c
+@@ -374,7 +374,7 @@
+ if (cmdline.header) {
+ skipData(ifP, width, height, maxval, format);
+ } else {
+- rle_addhist(argv, NULL, &hdr);
++ rle_addhist((char**)argv, NULL, &hdr);
+ writeRleHeader(cmdline.alpha, format, width, height, &hdr);
+ writeRleData(verbose, cmdline.alpha, ifP, &hdr,
+ width, height, maxval, format);
diff --git a/media-libs/netpbm/netpbm-11.2.9.ebuild b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
similarity index 99%
rename from media-libs/netpbm/netpbm-11.2.9.ebuild
rename to media-libs/netpbm/netpbm-11.2.9-r1.ebuild
index ed27be399d6c..042c3ac90c65 100644
--- a/media-libs/netpbm/netpbm-11.2.9.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
"${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
+ "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
)
netpbm_libtype() {
diff --git a/media-libs/netpbm/netpbm-11.6.1.ebuild b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild
similarity index 99%
rename from media-libs/netpbm/netpbm-11.6.1.ebuild
rename to media-libs/netpbm/netpbm-11.6.1-r1.ebuild
index 56896f092bd3..b63b5a302d37 100644
--- a/media-libs/netpbm/netpbm-11.6.1.ebuild
+++ b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-10.86.21-build.patch
"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
+ "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
)
netpbm_libtype() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2021-12-03 0:12 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-12-03 0:12 UTC (permalink / raw
To: gentoo-commits
commit: f1c236fa0be5b0f37a749b03edba06a23d73690f
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Wed Dec 1 16:47:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 00:01:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c236fa
media-libs/netpbm: drop v10.70.00
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/netpbm/Manifest | 1 -
media-libs/netpbm/files/netpbm-10.31-build.patch | 50 -----
media-libs/netpbm/files/netpbm-10.66-test.patch | 17 --
.../netpbm/files/netpbm-10.70-system-libs.patch | 40 ----
media-libs/netpbm/netpbm-10.70.00.ebuild | 205 ---------------------
5 files changed, 313 deletions(-)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index acb659885fd9..c1b2c7ff12b3 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,2 @@
-DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index 281f8ee928f7..000000000000
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-
---- 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
-
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
---- a/buildtools/libopt.c
-+++ b/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)
diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch
deleted file mode 100644
index 7c80648bafab..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-@@ -387,10 +387,6 @@ for i in $ordinary_testprogs
-
-
-
--# Test fiascotopnm, which has a unique -v flag.
--
--${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null
-- testExitStatus fiascotopnm 2 $?
-
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
deleted file mode 100644
index efe9fd8dd3c4..000000000000
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-when we disable the bundled libs, make sure we don't try to run install in them
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jbig
- VPATH=.:$(SRCDIR)/$(SUBDIR)
-
--SUBDIRS = libjbig
-+SUBDIRS =
-
- include $(BUILDDIR)/config.mk
-
-@@ -35,6 +35,7 @@ SCRIPTS =
-
- ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
- JBIGLIB_DEP = $(JBIGLIB)
-+ SUBDIRS += libjbig
- else
- # It's not our internal version; user's on his own to make sure it's built
- endif
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jpeg2000
- VPATH=.:$(SRCDIR)/$(SUBDIR)
-
--SUBDIRS = libjasper
-+SUBDIRS =
-
- include $(BUILDDIR)/config.mk
-
-@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)
- # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
- # be relative to the current directory.
- MERGE_OBJECTS += $(JASPERLIB)
-+ SUBDIRS += libjasper
- endif
- MERGEBINARIES = $(BINARIES)
-
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
deleted file mode 100644
index 595ad00ef034..000000000000
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-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"
-
-BDEPEND="app-arch/xz-utils
- sys-devel/flex"
-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}"
-
-PATCHES=(
- "${FILESDIR}"/netpbm-10.31-build.patch
- "${FILESDIR}"/netpbm-10.66-test.patch #450530
- "${FILESDIR}"/netpbm-10.70-system-libs.patch
-)
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo "${suffix//\.}" || die
-}
-
-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 || die
- fi
-}
-
-src_prepare() {
- default
-
- # make sure we use system libs
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || 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 jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
- $(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
-
- if [[ $(get_libdir) != "lib" ]] ; then
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
- fi
-
- # 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]
- dodoc README
-
- cd doc || die
- dodoc HISTORY Netpbm.programming USERDOC
-
- docinto html
- dodoc -r *.html
- use doc && dodoc -r ../userguide/*.html
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2021-11-29 23:46 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-11-29 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 6f29361e96643e51495cdf55ab0f42d2c34c97a0
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Nov 28 14:59:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 23:43:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f29361e
media-libs/netpbm: fix test failing on ppc64
Closes: https://bugs.gentoo.org/827338
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23100
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/netpbm-10.86.24-fix-test-ppc64.patch | 22 ++++++++++++++++++++++
...m-10.86.26.ebuild => netpbm-10.86.24-r1.ebuild} | 5 +++--
...m-10.86.26.ebuild => netpbm-10.86.26-r1.ebuild} | 1 +
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
new file mode 100644
index 000000000000..e1b558d59117
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
@@ -0,0 +1,22 @@
+char is unsigned by default on ppc64
+
+--- a/converter/other/pnmtopalm/palmtopnm.c
++++ b/converter/other/pnmtopalm/palmtopnm.c
+@@ -823,7 +823,7 @@
+ unsigned int j;
+
+ for (j = 0; j < bytesPerRow; ) {
+- char incount;
++ signed char incount;
+ pm_readchar(ifP, &incount);
+ if (incount < 0) {
+ /* How do we handle incount == -128 ? */
+@@ -865,7 +865,7 @@
+ unsigned int j;
+
+ for (j = 0; j < bytesPerRow; ) {
+- char incount;
++ signed char incount;
+ pm_readchar(ifP, &incount);
+ if (incount < 0) {
+ /* How do we handle incount == -128 ? */
diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
similarity index 96%
copy from media-libs/netpbm/netpbm-10.86.26.ebuild
copy to media-libs/netpbm/netpbm-10.86.24-r1.ebuild
index a4bc1a21670d..9a257b98e32a 100644
--- a/media-libs/netpbm/netpbm-10.86.26.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
# zlib USE flag is no longer used, enabled by default.
# cannot remove it yet because of #801445
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+ "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
)
netpbm_libtype() {
@@ -166,7 +167,7 @@ src_configure() {
TIFFLIB_NEEDS_Z = N
JPEGLIB = $(netpbm_config jpeg)
PNGLIB = $(netpbm_config png)
- ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+ ZLIB = -lz
LINUXSVGALIB = $(netpbm_config svga vga)
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
similarity index 98%
rename from media-libs/netpbm/netpbm-10.86.26.ebuild
rename to media-libs/netpbm/netpbm-10.86.26-r1.ebuild
index a4bc1a21670d..39873d62dbfd 100644
--- a/media-libs/netpbm/netpbm-10.86.26.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+ "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
)
netpbm_libtype() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2021-11-28 2:09 Ionen Wolkens
0 siblings, 0 replies; 11+ messages in thread
From: Ionen Wolkens @ 2021-11-28 2:09 UTC (permalink / raw
To: gentoo-commits
commit: 3ad19a84552b64107365fbcd64ac457b84800d80
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Thu Nov 25 08:04:33 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 02:08:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad19a84
media-libs/netpbm: drop v10.76.00
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23073
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-libs/netpbm/Manifest | 1 -
.../netpbm/files/netpbm-10.76.00-build.patch | 38 ----
.../netpbm/files/netpbm-10.76.00-misc-deps.patch | 68 ------
.../files/netpbm-10.76.00-pbmtext-test.patch | 22 --
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 248 ---------------------
media-libs/netpbm/netpbm-10.76.00.ebuild | 199 -----------------
6 files changed, 576 deletions(-)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 6f839ad5e36d..6ffd36b4ff2d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,4 +1,3 @@
DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
DIST netpbm-10.86.26.tar.xz 3699572 BLAKE2B d0b3fccfecea20a7979a6b29dac670dc33616a6cdd6f985af76cbd0d8125b887ad2dfc193e5e59f47014f685887cadeebcdce0da8db0a219457bb88caf42ba62 SHA512 23ca6125827c61648e0a475880efade7b83f87cfc884361c1f706f0a69ac70b5a7a2ae4699c77e21eda1c73241768b1bd7e595d5d533eeb10b7f69a79c7ae69d
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da5446719..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- 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-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index bd894bfb3159..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
-
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
-
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
-
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
-
- include $(BUILDDIR)/config.mk
-
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
- XML2_CFLAGS=$(shell xml2-config --cflags)
- endif
- endif
-+endif
-
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
- endif
- endif
-
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
- endif
- endif
- endif
-+endif
-
- ifneq ($(JPEGLIB),NONE)
- ifneq ($(JPEGHDR_DIR)x,x)
---- a/other/pamx/Makefile
-+++ b/other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
-
- EXTERN_INCLUDE =
-
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
- # Pkg-config has never heard of X11, or doesn't even exist
-
-@@ -23,6 +24,7 @@ else
- X11LIB = $(shell pkg-config x11 --libs)
- EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
-
- ifeq ($(HAVE_X11LIB),Y)
- PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index 717c86a72ac5..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates. force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- a/test/pbmtext.test
-+++ b/test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
-
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
- for (i=160;i<=255;++i) printf("%c",i); }' | \
- pbmtext -builtin bdf | cksum
-
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
- for (i=160;i<=255;++i) printf("%c\n",i); }' | \
- pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 8bb1b17e15fa..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
-
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+ BUILDDIR=$(BUILDDIR) \
-+ RGBDEF=$(RGBDEF) \
-+ BUILD_FIASCO=$(BUILD_FIASCO) \
-+ JASPERLIB="$(JASPERLIB)" \
-+ JBIGLIB="$(JBIGLIB)" \
-+ JPEGLIB="$(JPEGLIB)" \
-+ PNGLIB="$(PNGLIB)" \
-+ TIFFLIB="$(TIFFLIB)" \
-+ URTLIB="$(URTLIB)" \
-+ X11LIB="$(X11LIB)" \
-+ XML2_LIBS="$(XML2_LIBS)" \
-+ ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
-
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
-
- check-tree: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=tree \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
-
- check-package: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=package \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=install \
-- BUILDDIR=$(BUILDDIR) \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
- zeisstopnm \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ fiascotopnm|\
-+ pnmtofiasco)
-+ [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+ jpeg2ktopam|\
-+ pamtojpeg2k)
-+ [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+ jbigtopnm|\
-+ pnmtojbig)
-+ [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+ jpegtopnm|\
-+ pnmtojpeg|\
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamtopng|\
-+ pngtopam|\
-+ pnmtopng)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ svgtopam)
-+ [ "${PNGLIB}" = "NONE" ] && return 1
-+ [ "${XML2_LIBS}" = "NONE" ] && return 1
-+ ;;
-+
-+ pamtotiff|\
-+ pnmtotiffcmyk|\
-+ tifftopnm)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtorle|\
-+ rletopnm)
-+ [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamx)
-+ [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
-
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v -e fiascotopnm -e \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/fiasco-roundtrip.test
-+++ b/test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
-
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+ exit 80
-+fi
-+
- # Should print 215556145 102615
-
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- a/test/jbig-roundtrip.test
-+++ b/test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Test 1. Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- a/test/legacy-names.test
-+++ b/test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
- ppmtouil \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamrgbatopng|\
-+ pngtopnm)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtotiff)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/png-roundtrip.test
-+++ b/test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 18 times
- for flags in "" -interlace \
- -gamma=.45 \
---- a/test/png-roundtrip2.test
-+++ b/test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
- do
---- a/test/ps-roundtrip.test
-+++ b/test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
-
-+if [ "${ZLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
-
- # pstopnm does not use libnetpbm functions for output.
---- a/test/tiff-roundtrip.test
-+++ b/test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
-
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- a/test/utahrle-roundtrip.test
-+++ b/test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${URTLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- #Test 1. Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
deleted file mode 100644
index b27af756a539..000000000000
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-BDEPEND="
- app-arch/xz-utils
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.4:0 )
- postscript? ( app-text/ghostscript-gpl )
- 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}"
-
-PATCHES=(
- "${FILESDIR}"/netpbm-10.76.00-build.patch
- "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
- "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
- "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
-)
-
-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() {
- default
-
- # make sure we use system libs
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
- # 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
- sed -i \
- -e 's:pkg-config:$(PKG_CONFIG):' \
- GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
- # The postscript knob is currently bound up with a fork test.
- if ! use postscript ; then
- sed -i \
- -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
- converter/other/Makefile generator/Makefile || die
- sed -i -r \
- -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
- test/all-in-place.{ok,test} || die
- sed -i -e '/^$/d' test/all-in-place.ok || die
- sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die
- fi
-
- # 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)
- PKG_CONFIG = $(tc-getPKG_CONFIG)
-
- 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,data}
- 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
-
- if [[ $(get_libdir) != "lib" ]] ; then
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
- fi
-
- # 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]
- dodoc README
-
- cd doc || die
- dodoc HISTORY Netpbm.programming USERDOC
- docinto html
- dodoc -r *.html
-
- use doc && dodoc -r ../userguide/*.html
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2020-10-25 19:47 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2020-10-25 19:47 UTC (permalink / raw
To: gentoo-commits
commit: f6c3d4788f168af4ff06302bf3fc10503d5d328f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 19:39:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 19:47:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c3d478
media-libs/netpbm: port to EAPI 7
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/netpbm/files/make-tarball.sh | 0
media-libs/netpbm/files/netpbm-10.31-build.patch | 12 ++---
.../netpbm/files/netpbm-10.70-system-libs.patch | 8 +--
.../netpbm/files/netpbm-10.76.00-misc-deps.patch | 12 ++---
.../files/netpbm-10.76.00-pbmtext-test.patch | 4 +-
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 40 +++++++--------
media-libs/netpbm/netpbm-10.70.00.ebuild | 59 ++++++++++++++--------
media-libs/netpbm/netpbm-10.76.00.ebuild | 48 +++++++++++-------
8 files changed, 106 insertions(+), 77 deletions(-)
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
old mode 100755
new mode 100644
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
index cd744743636..281f8ee928f 100644
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ b/media-libs/netpbm/files/netpbm-10.31-build.patch
@@ -2,8 +2,8 @@
- Try to fix parallel building
- Make the libopt tool less 'helpful'
---- lib/Makefile
-+++ lib/Makefile
+--- a/lib/Makefile
++++ b/lib/Makefile
@@ -249,7 +249,7 @@
.PHONY: install.staticlib
install.staticlib: $(PKGDIR)/link
@@ -25,8 +25,8 @@
libnetpbm.$(NETPBMLIBSUFFIX)
endif
ifeq ($(NETPBMLIBTYPE),dll)
---- GNUmakefile
-+++ GNUmakefile
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -87,6 +87,9 @@
.PHONY: nonmerge
@@ -37,8 +37,8 @@
OMIT_CONFIG_RULE = 1
include $(SRCDIR)/Makefile.common
---- buildtools/libopt.c
-+++ buildtools/libopt.c
+--- a/buildtools/libopt.c
++++ b/buildtools/libopt.c
@@ -502,7 +502,7 @@
strcpy(outputLine, ""); /* initial value */
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
index ef50ff2435d..efe9fd8dd3c 100644
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
@@ -1,7 +1,7 @@
when we disable the bundled libs, make sure we don't try to run install in them
---- converter/other/jbig/Makefile
-+++ converter/other/jbig/Makefile
+--- a/converter/other/jbig/Makefile
++++ b/converter/other/jbig/Makefile
@@ -5,7 +5,7 @@ endif
SUBDIR = converter/other/jbig
VPATH=.:$(SRCDIR)/$(SUBDIR)
@@ -19,8 +19,8 @@ when we disable the bundled libs, make sure we don't try to run install in them
else
# It's not our internal version; user's on his own to make sure it's built
endif
---- converter/other/jpeg2000/Makefile
-+++ converter/other/jpeg2000/Makefile
+--- a/converter/other/jpeg2000/Makefile
++++ b/converter/other/jpeg2000/Makefile
@@ -5,7 +5,7 @@ endif
SUBDIR = converter/other/jpeg2000
VPATH=.:$(SRCDIR)/$(SUBDIR)
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
index 392eae0f40e..bd894bfb315 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
@@ -1,7 +1,7 @@
do not autoprobe deps when we disabled them
---- GNUmakefile
-+++ GNUmakefile
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
PROG_SUBDIRS = converter analyzer editor generator other
@@ -14,8 +14,8 @@ do not autoprobe deps when we disabled them
SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
---- converter/other/Makefile
-+++ converter/other/Makefile
+--- a/converter/other/Makefile
++++ b/converter/other/Makefile
@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/config.mk
@@ -48,8 +48,8 @@ do not autoprobe deps when we disabled them
ifneq ($(JPEGLIB),NONE)
ifneq ($(JPEGHDR_DIR)x,x)
---- other/pamx/Makefile
-+++ other/pamx/Makefile
+--- a/other/pamx/Makefile
++++ b/other/pamx/Makefile
@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
EXTERN_INCLUDE =
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
index cdc075e5293..717c86a72ac 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
@@ -3,8 +3,8 @@ what awk generates. force it to C/ASCII to avoid that.
https://bugs.gentoo.org/601012
---- test/pbmtext.test
-+++ test/pbmtext.test
+--- a/test/pbmtext.test
++++ b/test/pbmtext.test
@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
# One long row
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
index 870998bc98a..8bb1b17e15f 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
@@ -1,7 +1,7 @@
automatically skip tests of disabled tools
---- GNUmakefile
-+++ GNUmakefile
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -455,6 +458,21 @@ deb:
.PHONY: check-package
.PHONY: check-install
@@ -60,8 +60,8 @@ automatically skip tests of disabled tools
$(SRCDIR)/test/Execute-Tests 2>&1
---- test/all-in-place.test
-+++ test/all-in-place.test
+--- a/test/all-in-place.test
++++ b/test/all-in-place.test
@@ -367,11 +367,62 @@ ordinary_testprogs="\
zeisstopnm \
"
@@ -125,8 +125,8 @@ automatically skip tests of disabled tools
$i --version 2>&1 | \
egrep -v -e fiascotopnm -e \
"(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- test/fiasco-roundtrip.test
-+++ test/fiasco-roundtrip.test
+--- a/test/fiasco-roundtrip.test
++++ b/test/fiasco-roundtrip.test
@@ -2,6 +2,10 @@
# This script tests: pnmtofiasco fiascotopnm
# Also requires: pnmpad
@@ -138,8 +138,8 @@ automatically skip tests of disabled tools
# Should print 215556145 102615
pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- test/jbig-roundtrip.test
-+++ test/jbig-roundtrip.test
+--- a/test/jbig-roundtrip.test
++++ b/test/jbig-roundtrip.test
@@ -2,6 +2,9 @@
# This script tests: pnmtojbig jbigtopnm
# Also requires: pamchannel pamtopnm
@@ -150,8 +150,8 @@ automatically skip tests of disabled tools
# Test 1. Should print 2425386270 41
pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- test/legacy-names.test
-+++ test/legacy-names.test
+--- a/test/legacy-names.test
++++ b/test/legacy-names.test
@@ -94,8 +94,30 @@ ordinary_testprogs="\
ppmtouil \
"
@@ -183,8 +183,8 @@ automatically skip tests of disabled tools
$i --version 2>&1 | \
egrep -v \
"(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- test/png-roundtrip.test
-+++ test/png-roundtrip.test
+--- a/test/png-roundtrip.test
++++ b/test/png-roundtrip.test
@@ -6,6 +6,10 @@
## If this test fails and pnm-roundtrip2.test succeeds, it indicates
## some problem with pnmtopng.
@@ -196,8 +196,8 @@ automatically skip tests of disabled tools
# Test 1. Should print 1926073387 101484 18 times
for flags in "" -interlace \
-gamma=.45 \
---- test/png-roundtrip2.test
-+++ test/png-roundtrip2.test
+--- a/test/png-roundtrip2.test
++++ b/test/png-roundtrip2.test
@@ -9,6 +9,10 @@
## If both tests fail, the likely cause is a problem with pngtopam.
## It is also possible that there is some problem in libpng.
@@ -209,8 +209,8 @@ automatically skip tests of disabled tools
# Test 1. Should print 1926073387 101484 twice
for flags in "" -gamma=.45
do
---- test/ps-roundtrip.test
-+++ test/ps-roundtrip.test
+--- a/test/ps-roundtrip.test
++++ b/test/ps-roundtrip.test
@@ -8,6 +8,10 @@
## (1) zlib was not linked.
## (2) ghostscript is not available.
@@ -222,8 +222,8 @@ automatically skip tests of disabled tools
tmpdir=${tmpdir:-/tmp}
# pstopnm does not use libnetpbm functions for output.
---- test/tiff-roundtrip.test
-+++ test/tiff-roundtrip.test
+--- a/test/tiff-roundtrip.test
++++ b/test/tiff-roundtrip.test
@@ -2,6 +2,9 @@
# This script tests: pamtotiff tifftopnm
# Also requires:
@@ -234,8 +234,8 @@ automatically skip tests of disabled tools
# Failure message
## Second test fails if Netpbm was built without the flate library
---- test/utahrle-roundtrip.test
-+++ test/utahrle-roundtrip.test
+--- a/test/utahrle-roundtrip.test
++++ b/test/utahrle-roundtrip.test
@@ -2,6 +2,9 @@
# This script tests: pnmtorle rletopnm
# Also requires: pamchannel pamtopnm
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 9819f53b3fc..1824974a3ee 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
HOMEPAGE="http://netpbm.sourceforge.net/"
@@ -14,6 +14,8 @@ 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"
+BDEPEND="app-arch/xz-utils
+ sys-devel/flex"
RDEPEND="jbig? ( media-libs/jbigkit )
jpeg? ( virtual/jpeg:0 )
png? ( >=media-libs/libpng-1.4:0 )
@@ -23,38 +25,43 @@ RDEPEND="jbig? ( media-libs/jbigkit )
xml? ( dev-libs/libxml2 )
zlib? ( sys-libs/zlib )
X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.31-build.patch
+ "${FILESDIR}"/netpbm-10.66-test.patch #450530
+ "${FILESDIR}"/netpbm-10.70-system-libs.patch
+)
netpbm_libtype() {
case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
+ *-darwin*) echo dylib;;
+ *) echo unixshared;;
esac
}
+
netpbm_libsuffix() {
local suffix=$(get_libname)
- echo ${suffix//\.}
+ echo "${suffix//\.}" || die
}
+
netpbm_ldshlib() {
case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+ *-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
+ echo NONE || die
fi
}
src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.31-build.patch
- epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530
- epatch "${FILESDIR}"/netpbm-10.70-system-libs.patch
+ default
# make sure we use system libs
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
@@ -66,9 +73,11 @@ src_prepare() {
$(usex rle '' 'utahrle-roundtrip')
$(usex tiff '' 'tiff-roundtrip')
)
- if [[ ${#del[@]} -gt 0 ]] ; then
+
+ 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 jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
@@ -77,7 +86,8 @@ src_prepare() {
$(usex rle '' 'pnmtorle rletopnm')
$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
)
- if [[ ${#del[@]} -gt 0 ]] ; then
+
+ 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
@@ -88,6 +98,7 @@ src_prepare() {
-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
@@ -149,7 +160,7 @@ src_configure() {
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"
+ [[ $? -eq 0 ]] || die "writing config.mk failed"
}
src_compile() {
@@ -168,21 +179,27 @@ src_install() {
# without any actual dependencies, thus the -j1.
emake -j1 package pkgdir="${ED}"/usr
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
# 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
+
+ cd doc || die
dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
+
+ docinto html
+ dodoc -r *.html
+ use doc && dodoc -r ../userguide/*.html
}
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 77c99fa54c2..32f9f2ae5d2 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
HOMEPAGE="http://netpbm.sourceforge.net/"
@@ -14,6 +14,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+BDEPEND="app-arch/xz-utils
+ sys-devel/flex"
RDEPEND="jbig? ( media-libs/jbigkit )
jpeg? ( virtual/jpeg:0 )
png? ( >=media-libs/libpng-1.4:0 )
@@ -24,24 +26,31 @@ RDEPEND="jbig? ( media-libs/jbigkit )
xml? ( dev-libs/libxml2 )
zlib? ( sys-libs/zlib )
X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/netpbm-10.76.00-build.patch
+ "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
+ "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
+ "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
+)
netpbm_libtype() {
case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
+ *-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)';;
+ *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+ *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
esac
}
netpbm_config() {
@@ -53,10 +62,7 @@ netpbm_config() {
}
src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.76.00-build.patch
- epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
- epatch "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
- epatch "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
+ default
# make sure we use system libs
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
@@ -145,7 +151,7 @@ src_configure() {
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"
+ [[ $? -eq 0 ]] || die "writing config.mk failed"
}
src_compile() {
@@ -164,21 +170,27 @@ src_install() {
# without any actual dependencies, thus the -j1.
emake -j1 package pkgdir="${ED}"/usr
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
+ if [[ $(get_libdir) != "lib" ]] ; then
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+ fi
# 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
+
+ cd doc || die
dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
+ docinto html
+ dodoc -r *.html
+
+ use doc && dodoc -r ../userguide/*.html
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2016-11-27 3:27 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2016-11-27 3:27 UTC (permalink / raw
To: gentoo-commits
commit: 40ba0e169581d2998fa43b3462a397e21bea6cec
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 03:26:00 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 03:26:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ba0e16
media-libs/netpbm: rework how we skip tests of disabled tools
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 179 ++++++++++++++++++---
media-libs/netpbm/netpbm-10.76.00.ebuild | 23 ---
2 files changed, 158 insertions(+), 44 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
index 65f30d5..868358c 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
@@ -1,22 +1,159 @@
-https://bugs.gentoo.org/450530
+automatically skip tests of disabled tools
-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
+--- GNUmakefile
++++ GNUmakefile
+@@ -455,6 +455,17 @@ deb:
+ .PHONY: check-package
+ .PHONY: check-install
+
++# Variables from the make env we pass down to the test scripts.
++CHECK_VARS = \
++ BUILDDIR=$(BUILDDIR) \
++ RGBDEF=$(RGBDEF) \
++ BUILD_FIASCO=$(BUILD_FIASCO) \
++ JASPERLIB="$(JASPERLIB)" \
++ JBIGLIB="$(JBIGLIB)" \
++ JPEGLIB="$(JPEGLIB)" \
++ TIFFLIB="$(TIFFLIB)" \
++ URTLIB="$(URTLIB)"
++
+ # Test files in source tree.
+
+ check-tree : BUILDBINDIRS :=./analyzer \
+@@ -525,10 +536,10 @@ resultdir-backup: FORCE
+
+ check-tree: $(TESTRANDOM) resultdir-backup
+ cd $(RESULTDIR); \
++ $(CHECK_VARS) \
+ CHECK_TYPE=tree \
+- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
++ PBM_TEST_PATH=$(PBM_TEST_PATH) \
+ LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
+- RGBDEF=$(RGBDEF) \
+ $(SRCDIR)/test/Execute-Tests 2>&1
+
+ # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
+@@ -545,19 +556,18 @@ check: check-package
+
+ check-package: $(TESTRANDOM) resultdir-backup
+ cd $(RESULTDIR); \
++ $(CHECK_VARS) \
+ CHECK_TYPE=package \
+- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
++ PBM_TEST_PATH=$(PBM_TEST_PATH) \
+ LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
+- RGBDEF=$(RGBDEF) \
+ $(SRCDIR)/test/Execute-Tests 2>&1
+
+
+ # Check after install
+ check-install: $(TESTRANDOM) resultdir-backup
+ cd $(RESULTDIR); \
++ $(CHECK_VARS) \
+ CHECK_TYPE=install \
+- BUILDDIR=$(BUILDDIR) \
+- RGBDEF=$(RGBDEF) \
+ $(SRCDIR)/test/Execute-Tests 2>&1
+
+
+--- test/all-in-place.test
++++ test/all-in-place.test
+@@ -367,11 +367,49 @@ ordinary_testprogs="\
+ zeisstopnm \
+ "
+
++enabled_testprog() {
++ case $1 in
++ fiascotopnm|\
++ pnmtofiasco)
++ [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
++
++ jpeg2ktopam|\
++ pamtojpeg2k)
++ [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
++
++ jbigtopnm|\
++ pnmtojbig)
++ [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
++
++ jpegtopnm|\
++ pnmtojpeg|\
++ ppmtojpeg)
++ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
++
++ pamtotiff|\
++ pnmtotiffcmyk|\
++ tifftopnm)
++ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
++
++ pnmtorle|\
++ rletopnm)
++ [ "${URTLIB}" = "NONE" ] && return 1 ;;
++ esac
++
++ return 0
++}
++
+ # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
+ # has a slightly different version report format.
+
+ for i in $ordinary_testprogs
+ do
++ # Stub out programs that aren't built.
++ if ! enabled_testprog "$i"; then
++ echo "$i: ok"
++ continue
++ fi
++
+ $i --version 2>&1 | \
+ egrep -v -e fiascotopnm -e \
+ "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
+--- test/fiasco-roundtrip.test
++++ test/fiasco-roundtrip.test
+@@ -2,6 +2,10 @@
+ # This script tests: pnmtofiasco fiascotopnm
+ # Also requires: pnmpad
+
++if [ "${BUILD_FIASCO}" = "N" ]; then
++ exit 80
++fi
++
+ # Should print 215556145 102615
+
+ pnmpad --black --bottom 1 --left 1 testimg.ppm | \
+--- test/jbig-roundtrip.test
++++ test/jbig-roundtrip.test
+@@ -2,6 +2,9 @@
+ # This script tests: pnmtojbig jbigtopnm
+ # Also requires: pamchannel pamtopnm
+
++if [ "${JBIGLIB}" = "NONE" ]; then
++ exit 80
++fi
+
+ # Test 1. Should print 2425386270 41
+ pnmtojbig testgrid.pbm | jbigtopnm | cksum
+--- test/tiff-roundtrip.test
++++ test/tiff-roundtrip.test
+@@ -2,6 +2,9 @@
+ # This script tests: pamtotiff tifftopnm
+ # Also requires:
+
++if [ "${TIFFLIB}" = "NONE" ]; then
++ exit 80
++fi
+
+ # Failure message
+ ## Second test fails if Netpbm was built without the flate library
+--- test/utahrle-roundtrip.test
++++ test/utahrle-roundtrip.test
+@@ -2,6 +2,9 @@
+ # This script tests: pnmtorle rletopnm
+ # Also requires: pamchannel pamtopnm
+
++if [ "${URTLIB}" = "NONE" ]; then
++ exit 80
++fi
+
+ #Test 1. Should produce 1571496937 33838, cksum of testimg.red
+ pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 225eb63..a63466f 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -60,29 +60,6 @@ src_prepare() {
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || 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 jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
- $(usex jbig '' 'jbigtopnm pnmtojbig')
- $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
- $(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,legacy-names}.{ok,test} || die
- sed -i '/^$/d' test/{all-in-place,legacy-names}.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 \
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2016-11-16 4:51 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2016-11-16 4:51 UTC (permalink / raw
To: gentoo-commits
commit: fe032ce65d9dd8ad43e6fe6043ada0b8ca8920df
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 04:50:54 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 04:50:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe032ce6
media-libs/netpbm: version bump to 10.76.00
media-libs/netpbm/Manifest | 1 +
.../netpbm/files/netpbm-10.76.00-build.patch | 38 +++++
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 22 +++
media-libs/netpbm/netpbm-10.76.00.ebuild | 187 +++++++++++++++++++++
4 files changed, 248 insertions(+)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 1fda332..2e5f5b2 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,2 +1,3 @@
DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf
DIST netpbm-10.70.00.tar.xz 2621612 SHA256 1268cb6801790619f6d057b964305355011dfe66247f2b71fe9978cdd7af7d93 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 WHIRLPOOL 8810a2e8d4ed6a834d6fbc2861079b4e2664f85ff2548d00f95a9c26f92d02dcebcb8d1b9c26226caba067accc41eabbe1211322607de77d61827b34a8b4c82a
+DIST netpbm-10.76.00.tar.xz 2657184 SHA256 b7fce2b1f43dcc821c3928ccc32dbee89e2d75cf22a76c38bc9c9ab4d91ea27a SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 WHIRLPOOL 9082df9e257e247f3dd49119f925a11a0082905a78d3c57259328e13ba231608b81bfa2f1f1bcb9518ad94d8326aed82b7fff78a6b4f3befc00a34a2c2b0e70c
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 00000000..231da54
--- /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 00000000..65f30d5
--- /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
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
new file mode 100644
index 00000000..c940abf
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+
+RDEPEND="jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper )
+ 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.76.00-build.patch
+ epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
+
+ # make sure we use system libs
+ sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+ rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || 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')
+ $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+ $(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 = $(netpbm_config jpeg2k jasper)
+ 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,data}
+ 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 .
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-11-25 8:12 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-10 6:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 8:12 Viorel Munteanu
2024-11-24 11:21 Viorel Munteanu
2024-09-29 9:14 Viorel Munteanu
2024-04-12 10:04 Viorel Munteanu
2021-12-03 0:12 Sam James
2021-11-29 23:46 Sam James
2021-11-28 2:09 Ionen Wolkens
2020-10-25 19:47 Sam James
2016-11-27 3:27 Mike Frysinger
2016-11-16 4:51 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox