* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
@ 2016-12-29 13:14 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2016-12-29 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 77ebab9ca4ea7e38c8be262de22800ff2d68d972
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 23 16:10:17 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 13:11:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ebab9c
media-libs/netpbm: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3224
.../files/netpbm-10.51.00-pnmconvol-nooffset.patch | 83 ----------------------
.../files/netpbm-10.51.00-ppmtompeg-free.patch | 35 ---------
.../files/netpbm-10.51.00-underlinking.patch | 16 -----
3 files changed, 134 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch b/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
deleted file mode 100644
index 1eb5506..00000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-taken from upstream
-
-http://bugs.gentoo.org/338230
-
-Index: editor/pnmconvol.c
-===================================================================
---- editor/pnmconvol.c (revision 1297)
-+++ editor/pnmconvol.c (revision 1298)
-@@ -455,13 +455,13 @@ static void
- convKernelCreatePnm(struct pam * const cpamP,
- tuple * const * const ctuples,
- unsigned int const depth,
-- bool const offsetPgm,
-+ bool const offsetPnm,
- struct convKernel ** const convKernelPP) {
- /*----------------------------------------------------------------------------
-- Compute the convolution matrix in normalized form from the PGM
-- form. Each element of the output matrix is the actual weight we give an
-- input pixel -- i.e. the thing by which we multiple a value from the
-- input image.
-+ Compute the convolution matrix in normalized form from the PGM form
-+ 'ctuples'/'cpamP'. Each element of the output matrix is the actual weight
-+ we give an input pixel -- i.e. the thing by which we multiple a value from
-+ the input image.
-
- 'depth' is the required number of planes in the kernel. If 'ctuples' has
- fewer planes than that, we duplicate as necessary. E.g. if 'ctuples' is
-@@ -470,13 +470,13 @@ convKernelCreatePnm(struct pam *
- 'ctuples' has more planes than specified, we ignore the higher numbered
- ones.
-
-- 'offsetPgm' means the PGM convolution matrix is defined in offset form so
-+ 'offsetPnm' means the PNM convolution matrix is defined in offset form so
- that it can represent negative values. E.g. with maxval 100, 50 means
- 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
- and there are no negative weights.
- -----------------------------------------------------------------------------*/
-- double const scale = (offsetPgm ? 2.0 : 1.0) / cpamP->maxval;
-- double const offset = offsetPgm ? - 1.0 : 0.0;
-+ double const scale = (offsetPnm ? 2.0 : 1.0) / cpamP->maxval;
-+ double const offset = offsetPnm ? - 1.0 : 0.0;
- unsigned int const planes = MIN(3, depth);
-
- struct convKernel * convKernelP;
-@@ -579,9 +579,19 @@ normalizeKernel(struct convKernel * cons
- static void
- getKernelPnm(const char * const fileName,
- unsigned int const depth,
-- bool const nooffset,
-+ bool const offset,
- struct convKernel ** const convKernelPP) {
-+/*----------------------------------------------------------------------------
-+ Get the convolution kernel from the PNM file named 'fileName'.
-+ 'offset' means the PNM convolution matrix is defined in offset form so
-+ that it can represent negative values. E.g. with maxval 100, 50 means
-+ 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
-+ and there are no negative weights.
-+
-+ Make the kernel suitable for convolving an image of depth 'depth'.
-
-+ Return the kernel as *convKernelPP.
-+-----------------------------------------------------------------------------*/
- struct pam cpam;
- FILE * cifP;
- tuple ** ctuples;
-@@ -594,7 +604,7 @@ getKernelPnm(const char * const
-
- validateKernelDimensions(cpam.width, cpam.height);
-
-- convKernelCreatePnm(&cpam, ctuples, depth, nooffset, convKernelPP);
-+ convKernelCreatePnm(&cpam, ctuples, depth, offset, convKernelPP);
- }
-
-
-@@ -893,7 +903,7 @@ getKernel(struct cmdlineInfo const cmd
- struct convKernel * convKernelP;
-
- if (cmdline.pnmMatrixFileName)
-- getKernelPnm(cmdline.pnmMatrixFileName, depth, cmdline.nooffset,
-+ getKernelPnm(cmdline.pnmMatrixFileName, depth, !cmdline.nooffset,
- &convKernelP);
- else if (cmdline.matrixfile)
- convKernelCreateSimpleFile(cmdline.matrixfile, cmdline.normalize,
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
deleted file mode 100644
index 0c1e485..00000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-fix from upstream
-
-------------------------------------------------------------------------
-r1285 | giraffedata | 2010-09-18 16:13:39 -0400 (Sat, 18 Sep 2010) | 1 line
-
-Fix free of non-allocated memory
-
-Index: converter/ppm/ppmtompeg/param.c
-===================================================================
---- converter/ppm/ppmtompeg/param.c (revision 1284)
-+++ converter/ppm/ppmtompeg/param.c (revision 1285)
-@@ -283,8 +283,8 @@ GetFrameRate(const char * const p)
-
-
- static void
--mergeInputSource(struct inputSource * const baseSourceP,
-- struct inputSource * const addedSourceP) {
-+mergeInputSource(struct inputSource * const baseSourceP,
-+ const struct inputSource * const addedSourceP) {
-
- unsigned int i;
-
-@@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * co
- for (i = 0; i < addedSourceP->numInputFileEntries; ++i)
- baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] =
- addedSourceP->inputFileEntries[i];
--
-- free(addedSourceP);
-- /* Note the space allocated for the *addedSourceP input file
-- entries themselves is still allocated, and used by
-- *baseSourceP.
-- */
- }
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch b/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch
deleted file mode 100644
index e161242..00000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- converter/other/Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/converter/other/Makefile b/converter/other/Makefile
-index 1417cd3..c178101 100644
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -167,7 +167,7 @@ pngtopam: %: %.o pngx.o $(NETPBMLIB) $(LIBOPT)
- pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o pngx.o pngtxt.o \
- $(shell $(LIBOPT) $(NETPBMLIB)) \
-- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
-+ $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) -lz
-
- pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
@ 2020-09-27 0:14 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-09-27 0:14 UTC (permalink / raw
To: gentoo-commits
commit: 588356653cb057c8057e5bed87656bc9f24ab891
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 26 14:37:03 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 00:14:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58835665
media-libs/netpbm: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/17682
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../netpbm/files/netpbm-10.66-failing-tests.patch | 28 ------
.../netpbm/files/netpbm-10.66-jasper-hack.patch | 41 --------
media-libs/netpbm/files/netpbm-10.66-jbig-2.patch | 19 ----
.../netpbm/files/netpbm-10.66-jpeg-dirs.patch | 28 ------
.../netpbm/files/netpbm-10.66-options-case.patch | 105 ---------------------
.../files/netpbm-10.66-wordaccess_be_aligned.patch | 23 -----
6 files changed, 244 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch b/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
deleted file mode 100644
index 63260de2e49..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-punt failing tests; already notified upstream
-
---- a/test/Test-Order
-+++ b/test/Test-Order
-@@ -50,7 +50,6 @@ pamditherbw.test
- pbmclean.test
- pamcut.test
- pnmcat.test
--pamflip.test
- pamenlarge.test
- pnminvert.test
- pamchannel.test
-@@ -70,7 +69,6 @@ ppmmix.test
-
- # Symmetry test
-
--symmetry.test
-
- # Format converter tests
-
-@@ -87,7 +85,6 @@ ppmdfont.test
- pnm-plain-roundtrip.test
- pnm-pam-roundtrip.test
- pnminvert-roundtrip.test
--pamflip-roundtrip.test
- pamdepth-roundtrip.test
- pad-crop-roundtrip.test
- cut-paste-roundtrip.test
diff --git a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch b/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
deleted file mode 100644
index 285475dab06..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/513240
-
-the jasper headers are horribly broken and break things like stdbool.h.
-re-order the includes to work around this.
-
---- a/converter/other/jpeg2000/jpeg2ktopam.c
-+++ b/converter/other/jpeg2000/jpeg2ktopam.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include <string.h>
-
-+#include <jasper/jasper.h>
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
-
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
-
- enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
---- a/converter/other/jpeg2000/pamtojpeg2k.c
-+++ b/converter/other/jpeg2000/pamtojpeg2k.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include <string.h>
-
-+#include <jasper/jasper.h>
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
-
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch b/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
deleted file mode 100644
index f7e8cf80d6c..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-fix building w/jbig-2.x
-
---- a/converter/other/jbig/jbigtopnm.c
-+++ b/converter/other/jbig/jbigtopnm.c
-@@ -230,8 +230,12 @@ int main (int argc, char **argv)
- if (ferror(fin))
- pm_error("Problem while reading input file '%s", fnin);
- if (result != JBG_EOK && result != JBG_EOK_INTR)
-- pm_error("Problem with input file '%s': %s\n",
-- fnin, jbg_strerror(result, JBG_EN));
-+ pm_error("Problem with input file '%s': %s\n", fnin,
-+#ifdef JBG_EN
-+ jbg_strerror(result, JBG_EN));
-+#else
-+ jbg_strerror(result));
-+#endif
- if (plane >= 0 && jbg_dec_getplanes(&s) <= plane)
- pm_error("Image has only %d planes!\n", jbg_dec_getplanes(&s));
-
diff --git a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch b/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
deleted file mode 100644
index fcf98211ba0..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-use same -I style as converter/other/Makefile so people can disable these
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o
-
- EXTERN_INCLUDES =
- ifneq ($(JBIGHDR_DIR),NONE)
-- EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+ ifneq ($(JBIGHDR_DIR)x,x)
-+ EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+ endif
- endif
-
- ifneq ($(JBIGHDR_DIR),NONE)
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -11,7 +11,9 @@ include $(BUILDDIR)/config.mk
-
- EXTERN_INCLUDES =
- ifneq ($(JASPERHDR_DIR),NONE)
-- EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+ ifneq ($(JASPERHDR_DIR)x,x)
-+ EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+ endif
- endif
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.66-options-case.patch b/media-libs/netpbm/files/netpbm-10.66-options-case.patch
deleted file mode 100644
index a865bc1f451..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-options-case.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-r2175 | giraffedata | 2014-04-01 22:28:23 -0400 (Tue, 01 Apr 2014) | 1 line
-
-Fix bug: inconsistent use of upper and lower case Y and N in make file variables. Make it consistently upper case
-
---- buildtools/configure.pl (revision 2174)
-+++ buildtools/configure.pl (revision 2175)
-@@ -835,16 +835,16 @@ sub getLibTypes($$$$$$$$) {
- my $response = prompt("(y)es or (n)o", $default);
-
- if (uc($response) =~ /^(Y|YES)$/) {
-- $staticlib_too = "y";
-+ $staticlib_too = "Y";
- } elsif (uc($response) =~ /^(N|NO)$/) {
-- $staticlib_too = "n";
-+ $staticlib_too = "N";
- } else {
- print("'$response' isn't one of the choices. \n" .
- "You must choose 'yes' or 'no' (or 'y' or 'n').\n");
- exit 12;
- }
- } else {
-- $staticlib_too = "n";
-+ $staticlib_too = "N";
- }
- print("\n");
-
---- config.mk.in (revision 2174)
-+++ config.mk.in (revision 2175)
-@@ -503,7 +503,7 @@ LINUXSVGAHDR_DIR =
- #LINUXSVGALIB = /usr/lib/libvga.so
- #LINUXSVGAHDR_DIR = /usr/include/vgalib
-
--# If you don't want any network functions, set OMIT_NETWORK to "y".
-+# If you don't want any network functions, set OMIT_NETWORK to "Y".
- # The only thing that requires network functions is the option in
- # ppmtompeg to run it on multiple computers simultaneously. On some
- # systems network functions don't work or we haven't figured out how to
-@@ -512,11 +512,11 @@ OMIT_NETWORK =
- #DJGPP/Windows, Tru64:
- # (there's some minor header problem that prevents network functions from
- # building on Tru64 2000.10.06)
--#OMIT_NETWORK = y
-+#OMIT_NETWORK = Y
-
- # These are -l options to link in the network libraries. Often, these are
- # built into the standard C library, so this can be null. This is irrelevant
--# if OMIT_NETWORK is "y".
-+# if OMIT_NETWORK is "Y".
-
- NETWORKLD =
- # Solaris, SunOS:
-@@ -602,12 +602,12 @@ NETPBMLIBSUFFIX = so
- # Windows shared library:
- #NETPBMLIBSUFFIX = dll
-
--#STATICLIB_TOO is "y" to signify that you want a static library built
-+#STATICLIB_TOO is "Y" to signify that you want a static library built
- #and installed in addition to whatever library type you specified by
- #NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library,
- #STATICLIB_TOO simply has no effect.
--STATICLIB_TOO = y
--#STATICLIB_TOO = n
-+STATICLIB_TOO = Y
-+#STATICLIB_TOO = N
-
- #STATICLIBSUFFIX is the suffix that static libraries have. It's
- #meaningless if you aren't building static libraries.
---- GNUmakefile (revision 2174)
-+++ GNUmakefile (revision 2175)
-@@ -396,19 +396,19 @@ lib/install.hdr:
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \
- SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
-
--ifeq ($(STATICLIB_TOO),y)
--BUILD_STATIC = y
-+ifeq ($(STATICLIB_TOO),Y)
-+BUILD_STATIC = Y
- else
- ifeq ($(NETPBMLIBTYPE),unixstatic)
-- BUILD_STATIC = y
-+ BUILD_STATIC = Y
- else
-- BUILD_STATIC = n
-+ BUILD_STATIC = N
- endif
- endif
-
- .PHONY: install.staticlib
- install.staticlib:
--ifeq ($(BUILD_STATIC),y)
-+ifeq ($(BUILD_STATIC),Y)
- $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
- SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib
- endif
---- lib/Makefile (revision 2174)
-+++ lib/Makefile (revision 2175)
-@@ -175,7 +175,7 @@ else
- ifeq ($(STATICLIB_TOO),Y)
- BUILD_STATICLIB = Y
- else
-- BUILD_STATICLIB = n
-+ BUILD_STATICLIB = N
- endif
- endif
-
diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
deleted file mode 100644
index 0da719ae07d..00000000000
--- a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/547252
-
-------------------------------------------------------------------------
-r2395 | giraffedata | 2015-01-23 13:51:17 -0500 (Fri, 23 Jan 2015) | 1 line
-
-Fix syntax error
-
-build: fix compile failure in wordint_access_be.h with
-Bigendian target platforms.
-
-Index: trunk/lib/util/wordaccess_be_aligned.h
-===================================================================
---- trunk/lib/util/wordaccess_be_aligned.h (revision 2394)
-+++ trunk/lib/util/wordaccess_be_aligned.h (revision 2395)
-@@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) {
- static __inline__ void
- wordintToBytes(wordintBytes * const bytesP,
- wordint const wordInt) {
-- uint16_t const hi = ((wordInt >> 48) & 0xFF)
-+ uint16_t const hi = ((wordInt >> 48) & 0xFF);
- uint16_t const mh = ((wordInt >> 32) & 0xFF);
- uint16_t const ml = ((wordInt >> 24) & 0xFF);
- uint16_t const lo = ((wordInt >> 0) & 0xFF);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
@ 2021-04-18 16:29 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2021-04-18 16:29 UTC (permalink / raw
To: gentoo-commits
commit: ffff493f902d98593dae94a30e1bb1b62f5cbbd7
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 16:26:42 2021 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 16:29:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffff493f
media-libs/netpbm: refresh make-tarball.sh helper
Make it shellcheck clean too with a little bit of effort.
Closes: https://bugs.gentoo.org/504408
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
media-libs/netpbm/files/make-tarball.sh | 37 +++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
old mode 100644
new mode 100755
index 90a64ffb34d..29ad4b3d92e
--- a/media-libs/netpbm/files/make-tarball.sh
+++ b/media-libs/netpbm/files/make-tarball.sh
@@ -1,13 +1,23 @@
#!/bin/bash
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
-. /etc/init.d/functions.sh
+# Helper script for creating tarballs of netpbm releases since the netpbm
+# project refuses to do so themselves for "current" releases. Their process
+# is entirely contained in the svn repo.
+# http://netpbm.sourceforge.net/getting_netpbm.php
+# https://sourceforge.net/p/netpbm/code/HEAD/tree/
+
+. /lib/gentoo/functions.sh
PV=$1
SVN_ROOT=${2:-/usr/local/src}
+NETPBM="${SVN_ROOT}/netpbm"
+USERGUIDE="${NETPBM}/userguide"
if [[ $# -eq 0 ]] ; then
ebegin "Detecting latest version"
- cd "${SVN_ROOT}/netpbm/release_number"
+ cd "${NETPBM}/release_number" || die
svn up -q || die
PV=$(svn ls | sort -V | tail -1) || die
[[ -z ${PV} ]] && die
@@ -17,9 +27,14 @@ if [[ $# -eq 0 ]] ; then
if [[ ! -d ${PV} ]] ; then
ebegin "Checking out ${PV}"
- svn up -q ${PV}
+ svn up -q "${PV}"
eend || die
fi
+
+ ebegin "Updating userguide"
+ cd "${USERGUIDE}" || die
+ svn up -q || die
+ eend
fi
if [[ $# -gt 2 ]] ; then
@@ -32,28 +47,28 @@ P=${PN}-${PV}
T=/tmp
maint_pkg_create() {
- local base="/usr/local/src"
- local srcdir="${base}/netpbm/release_number"
- local htmldir="${base}/netpbm/userguide"
+ local base="${SVN_ROOT}"
+ local srcdir="${NETPBM}/release_number"
+ local htmldir="${USERGUIDE}"
if [[ -d ${srcdir} ]] ; then
cd "${T}" || die
- rm -rf ${P}
+ rm -rf "${P}"
ebegin "Exporting ${srcdir}/${PV} to ${P}"
- svn export -q "${srcdir}/${PV}" ${P}
+ svn export -q "${srcdir}/${PV}" "${P}"
eend $? || return 1
ebegin "Exporting ${htmldir} to ${P}/userguide"
- svn export -q "${htmldir}" ${P}/userguide
+ svn export -q "${htmldir}" "${P}"/userguide
eend $? || return 1
ebegin "Generating manpages from html"
- (cd "${P}/userguide" && ../buildtools/makeman *.html)
+ (cd "${P}/userguide" && ../buildtools/makeman ./*.html)
eend $? || return 1
ebegin "Creating ${P}.tar.xz"
- tar cf - ${P} | xz > ${P}.tar.xz
+ tar cf - "${P}" | xz > "${P}".tar.xz
eend $?
einfo "Tarball now ready at: ${T}/${P}.tar.xz"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
@ 2023-08-13 16:05 Viorel Munteanu
0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-08-13 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 81ee4692ebbf5e0356813456ea64a4c6b53908bb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:38:45 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 16:05:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ee4692
media-libs/netpbm: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32287
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../netpbm/files/netpbm-10.86.21-misc-deps.patch | 68 ----------------------
1 file changed, 68 deletions(-)
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
deleted file mode 100644
index 78c7670c9a8f..000000000000
--- a/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 3b128e02a3848b59805a2f132282c1bedd21c40a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:09:51 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b128e02
media-libs/netpbm: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/netpbm-11.5.2-fix-tests-musl.patch | 157 ---------------------
1 file changed, 157 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch b/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
deleted file mode 100644
index 4d8bd6c3b74d..000000000000
--- a/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Some tests are broken on musl.
-
-https://sourceforge.net/p/netpbm/code/4843/
-pnmindex, ppmtomitsu tests that don't use pnmcolormap
-
-So far, this only fixed ppmtomitsu.
-
-See also https://bugs.gentoo.org/907295
-
---- a/test/pnmindex.ok
-+++ b/test/pnmindex.ok
-@@ -7,12 +7,18 @@
- 3099638253 5290
- Test 4. Should print 1397700642 3160
- 1397700642 3160
--Test 5. Should print 2303488589 28514
--2303488589 28514
--Test 6. Should print 1706277976 100455
--1706277976 100455
--Test 7. Should print 801388440 100455
-+Test 5. Should print 243472565 28514
-+243472565 28514
-+Test 6. Should print 801388440 100455
- 801388440 100455
-+Test 7. Should print 256 twice
-+256
-+256
-+Test 8. Should print 100 twice
-+100
-+100
-+Test 9. Should print match
-+match
- Test Invalid
- Expected failure 1 (no output)
- Expected failure 2 (no output)
---- a/test/pnmindex.test
-+++ b/test/pnmindex.test
-@@ -3,6 +3,9 @@
- # Also requires: pamcat pamscale pbmtext pnmcolormap pnmindex
- # Also requires: pnminvert pnmquant pnmremap
-
-+tmpdir=${tmpdir:-/tmp}
-+pnmindex256_ppm=${tmpdir}/pnmindex256.ppm
-+
- echo "Test 1. Should print 3391481002 889"
- pnmindex maze.pbm | cksum
-
-@@ -17,18 +20,28 @@
- pnmindex -size 20 -across=3 testgrid.pbm testgrid.pbm testgrid.pbm \
- testgrid.pbm testgrid.pbm testgrid.pbm | cksum
-
--echo "Test 5. Should print 2303488589 28514"
--pnmindex testimg.ppm | cksum
-+echo "Test 5. Should print 243472565 28514"
-+pnmindex -noquant testimg.ppm | cksum
-
--echo "Test 6. Should print 1706277976 100455"
--pnmindex -size 50 -across=2 testimg.ppm testimg.ppm testimg.ppm \
-- testimg.ppm testimg.ppm testimg.ppm | cksum
--
--echo "Test 7. Should print 801388440 100455"
-+echo "Test 6. Should print 801388440 100455"
- pnmindex -size 50 -across=2 -noquant testimg.ppm testimg.ppm testimg.ppm \
-- testimg.ppm testimg.ppm testimg.ppm | cksum
-+ testimg.ppm testimg.ppm testimg.ppm | tee ${pnmindex256_ppm} | cksum
-
-+echo "Test 7. Should print 256 twice"
-+pnmindex testimg.ppm | ppmhist -nomap -noheader | wc -l
-+pnmindex -colors 256 testimg.ppm | ppmhist -nomap -noheader | wc -l
-
-+echo "Test 8. Should print 100 twice"
-+pnmindex -colors 100 testimg.ppm | ppmhist -nomap -noheader | wc -l
-+pnmindex -colors 100 testimg.ppm testimg.ppm | ppmhist -nomap -noheader | wc -l
-+
-+
-+echo "Test 9. Should print match"
-+pnmindex -size 50 -across=2 -quant -colors=256 testimg.ppm testimg.ppm testimg.ppm \
-+ testimg.ppm testimg.ppm testimg.ppm |\
-+ pnmpsnr -rgb -target1=41.31 -target2=40.76 -target3=40.71 ${pnmindex256_ppm} -
-+
-+
- echo "Test Invalid"
-
- . ${srcdir}/test-invalid.inc
---- a/test/ppmtomitsu.ok
-+++ b/test/ppmtomitsu.ok
-@@ -1,9 +1,9 @@
--Test 0. Should print 458455366 101484
--458455366 101484
-+Test 0. Should print 668243897 101532
-+668243897 101532
- Test 1. Should print 3110813682 101562
- 3110813682 101562
--Test 2. Should print 4168174994 34399
--4168174994 34399
-+Test 2. Should print 825518840 34209
-+825518840 34209
- Test 3. Should print 3201293405 310
- 3201293405 310
- Test 4. Should print 3354679572 752
-@@ -10,5 +10,5 @@
- 3354679572 752
- Test 5. Should print 3999654426 101549
- 3999654426 101549
--Test 6. Should print 4201246884 101549
--4201246884 101549
-+Test 6. Should print 3103038403 101549
-+3103038403 101549
---- a/test/ppmtomitsu.test
-+++ b/test/ppmtomitsu.test
-@@ -1,31 +1,31 @@
- #! /bin/sh
- # This script tests: ppmtomitsu
--# Also requires: pnmcolormap pnmremap
-+# Also requires: pamseq pamdepth
-
- tmpdir=${tmpdir:-/tmp}
--testimg100_ppm=${tmpdir}/testimg100.ppm
-+testimg216_ppm=${tmpdir}/testimg216.ppm
-
--echo "Test 0. Should print 458455366 101484"
--# equivalent to: Pnmquant 100 testimg.ppm
--pnmcolormap 100 testimg.ppm | pnmremap -nofloyd -mapfile=- testimg.ppm |\
-- tee ${testimg100_ppm} | cksum
-+echo "Test 0. Should print 668243897 101532"
-
-+pamseq 3 5 -tupletype=RGB | pamdepth 255 | pnmremap -nofloyd -mapfile=- testimg.ppm |\
-+ tee ${testimg216_ppm} | cksum
-+
- echo "Test 1. Should print 3110813682 101562"
--ppmtomitsu testimg.ppm | cksum
-+ppmtomitsu testimg.ppm | cksum
-
--echo "Test 2. Should print 4168174994 34399"
--ppmtomitsu ${testimg100_ppm} | cksum
-+echo "Test 2. Should print 825518840 34209"
-+ppmtomitsu ${testimg216_ppm} | cksum
-
- echo "Test 3. Should print 3201293405 310"
--ppmtomitsu testgrid.pbm | cksum
-+ppmtomitsu testgrid.pbm | cksum
-
- echo "Test 4. Should print 3354679572 752"
--ppmtomitsu -tiny testgrid.pbm | cksum
-+ppmtomitsu -tiny testgrid.pbm | cksum
-
- echo "Test 5. Should print 3999654426 101549"
--ppmtomitsu -tiny testimg.ppm | cksum
-+ppmtomitsu -tiny testimg.ppm | cksum
-
--echo "Test 6. Should print 4201246884 101549"
--ppmtomitsu -tiny ${testimg100_ppm} | cksum
-+echo "Test 6. Should print 3103038403 101549"
-+ppmtomitsu -tiny ${testimg216_ppm} | cksum
-
--rm ${testimg100_ppm}
-+rm ${testimg216_ppm}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-18 19:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-13 16:05 [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2024-04-18 19:32 Conrad Kostecki
2021-04-18 16:29 Mike Frysinger
2020-09-27 0:14 Conrad Kostecki
2016-12-29 13:14 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox