[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/

[David Seifert]

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 \