1 |
commit: ada12d3b1aa803e6f53604c31c21ef7457027257 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 6 12:04:19 2021 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 6 12:04:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ada12d3b |
7 |
|
8 |
media-libs/netpbm: drop package from Prefix |
9 |
|
10 |
it is so old it cannot even be installed any more, so it is used by noone |
11 |
|
12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
13 |
|
14 |
media-libs/netpbm/Manifest | 5 - |
15 |
media-libs/netpbm/files/netpbm-10.31-build.patch | 50 ----- |
16 |
.../files/netpbm-10.35.0-pnmtopng-zlib.patch | 12 - |
17 |
media-libs/netpbm/files/netpbm-10.35.0-xml2.patch | 38 ---- |
18 |
.../netpbm/files/netpbm-10.41.0-interix.patch | 26 --- |
19 |
media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch | 16 -- |
20 |
.../netpbm/files/netpbm-10.42.0-interix.patch | 26 --- |
21 |
.../netpbm/files/netpbm-10.44.00-fontdir.patch | 50 ----- |
22 |
.../netpbm/files/netpbm-10.46.00-darwin.patch | 15 -- |
23 |
.../netpbm-10.46.00-min_DCT_v_scaled_size.patch | 35 --- |
24 |
.../netpbm/files/netpbm-10.46.00-solaris.patch | 17 -- |
25 |
.../netpbm/files/netpbm-10.48.00-interix.patch | 10 - |
26 |
media-libs/netpbm/files/netpbm-10.48.00-pngx.patch | 51 ----- |
27 |
.../files/netpbm-10.48.00-pnmtopng-zlib.patch | 12 - |
28 |
.../netpbm/files/netpbm-10.48.00-solaris.patch | 22 -- |
29 |
.../files/netpbm-10.49.00-darwin-signals.patch | 16 -- |
30 |
.../netpbm/files/netpbm-10.49.00-sigpower.patch | 23 -- |
31 |
.../files/netpbm-10.51.00-pnmconvol-nooffset.patch | 83 ------- |
32 |
.../files/netpbm-10.51.00-ppmtompeg-free.patch | 35 --- |
33 |
.../netpbm/files/netpbm-10.51.00-solaris.patch | 16 -- |
34 |
.../files/netpbm-10.51.00-underlinking.patch | 16 -- |
35 |
.../netpbm-10.57.00-solaris-xopensource.patch | 22 -- |
36 |
.../netpbm-10.60.01-strcaseeq-strcasecmp.patch | 13 -- |
37 |
.../netpbm/files/netpbm-10.76.00-build.patch | 38 ---- |
38 |
.../netpbm/files/netpbm-10.76.00-misc-deps.patch | 68 ------ |
39 |
.../files/netpbm-10.76.00-pbmtext-test.patch | 22 -- |
40 |
.../netpbm/files/netpbm-10.76.00-solaris.patch | 24 -- |
41 |
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 248 --------------------- |
42 |
media-libs/netpbm/files/netpbm-prefix.patch | 56 ----- |
43 |
media-libs/netpbm/metadata.xml | 14 -- |
44 |
media-libs/netpbm/netpbm-10.51.00-r2.ebuild | 194 ---------------- |
45 |
media-libs/netpbm/netpbm-10.57.00.ebuild | 166 -------------- |
46 |
media-libs/netpbm/netpbm-10.59.00.ebuild | 169 -------------- |
47 |
media-libs/netpbm/netpbm-10.76.00.ebuild | 195 ---------------- |
48 |
34 files changed, 1803 deletions(-) |
49 |
|
50 |
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest |
51 |
deleted file mode 100644 |
52 |
index 3a5dd5f2e2..0000000000 |
53 |
--- a/media-libs/netpbm/Manifest |
54 |
+++ /dev/null |
55 |
@@ -1,5 +0,0 @@ |
56 |
-DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 BLAKE2B 47b9e3f85f2d959ca56dd4ff893c590379cfc3b4cc3dc5de9008220dda8fc04effd8df8b860d4afe7a00720728deff0d53b848a2783c5975c2141342fadfca88 SHA512 3bebffb798e72e5ff872b482d43dffbd174496d1ca46e88bcb3c19f2b94cdfe2037aa1f19a22a40996503ccc03929bd28570722874a0c74265b083fbc66b24c4 |
57 |
-DIST netpbm-10.51.00.tar.xz 1834148 BLAKE2B 07a038c139407f5b5929464ee0e607091f809c70e858105e0b279673167cd22f2500c9c16a03dc80ce62bebde70464bf0f3add4bd44161cb9d25f5baa687b399 SHA512 07b621bfebbd051a80eff09886bc2b3b4f82b01fa9087d6a76ed70a042493b69fb3295d471640a4576101ba19352a57eadf69c5721d9cc416d25ff563ee07c76 |
58 |
-DIST netpbm-10.57.00.tar.xz 1884452 BLAKE2B 9a1f1ccd860aae9a29510dbe79bfbf35001bd3325a0eb671c2bec5ab1af4e1ff9eee1e3c623c55f87640fd7ca602302deceab9c268b8a3fadf4dd8ec76af98a3 SHA512 24dea478599b189d7ed845d62f4b4de5a6c18e3cdf00c35edeb71f179a68a69233a7ce43d6a1be50c218dd32cedbe546e2344f2201e335f9d6d64475510dbb30 |
59 |
-DIST netpbm-10.59.00.tar.xz 2526328 BLAKE2B 7afe992d00ba7b09c483fde157dc25cdc2df592a6b20e83c3b74c2151f2dc86536b24d9678b19fcb115c22df00147fb52b044ae56f754b849cba4dbed5d253d0 SHA512 789095667b0adaaf4ae768dbc52226106caf35dc7fd01a3d352c88dfb699f90e74c5f0a6c002768acb673bcf9e36830b1f2951bfbe27a0159c1c73453b74efc5 |
60 |
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 |
61 |
|
62 |
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch |
63 |
deleted file mode 100644 |
64 |
index cd74474363..0000000000 |
65 |
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch |
66 |
+++ /dev/null |
67 |
@@ -1,50 +0,0 @@ |
68 |
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir |
69 |
-- Try to fix parallel building |
70 |
-- Make the libopt tool less 'helpful' |
71 |
- |
72 |
---- lib/Makefile |
73 |
-+++ lib/Makefile |
74 |
-@@ -249,7 +249,7 @@ |
75 |
- .PHONY: install.staticlib |
76 |
- install.staticlib: $(PKGDIR)/link |
77 |
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ |
78 |
-- $(PKGDIR)/link |
79 |
-+ $(PKGDIR)/lib |
80 |
- |
81 |
- # Install a shared library stub -- the ".so" file used at link time to |
82 |
- # prepare a program for dynamically linking a library at run time |
83 |
-@@ -257,9 +257,9 @@ |
84 |
- install.sharedlibstub: $(PKGDIR)/link |
85 |
- ifeq ($(NETPBMLIBTYPE),unixshared) |
86 |
- # install the link-time (.so) links to the runtime libraries |
87 |
-- cd $(PKGDIR)/link ; \ |
88 |
-+ cd $(PKGDIR)/lib ; \ |
89 |
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ |
90 |
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ |
91 |
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ |
92 |
- libnetpbm.$(NETPBMLIBSUFFIX) |
93 |
- endif |
94 |
- ifeq ($(NETPBMLIBTYPE),dll) |
95 |
---- GNUmakefile |
96 |
-+++ GNUmakefile |
97 |
-@@ -87,6 +87,9 @@ |
98 |
- |
99 |
- .PHONY: nonmerge |
100 |
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all) |
101 |
-+ |
102 |
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all |
103 |
-+converter/all analyzer/all editor/all generator/all other/all: lib/all |
104 |
- |
105 |
- OMIT_CONFIG_RULE = 1 |
106 |
- include $(SRCDIR)/Makefile.common |
107 |
---- buildtools/libopt.c |
108 |
-+++ buildtools/libopt.c |
109 |
-@@ -502,7 +502,7 @@ |
110 |
- |
111 |
- strcpy(outputLine, ""); /* initial value */ |
112 |
- runtime = FALSE; /* initial value */ |
113 |
-- quiet = FALSE; /* initial value */ |
114 |
-+ quiet = TRUE; /* initial value */ |
115 |
- error = FALSE; /* no error yet */ |
116 |
- for (arg = 1; arg < argc && !error; arg++) { |
117 |
- if (strcmp(argv[arg], "-runtime") == 0) |
118 |
|
119 |
diff --git a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch |
120 |
deleted file mode 100644 |
121 |
index ff66768744..0000000000 |
122 |
--- a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch |
123 |
+++ /dev/null |
124 |
@@ -1,12 +0,0 @@ |
125 |
-http://bugs.gentoo.org/291987 |
126 |
- |
127 |
---- netpbm/converter/other/Makefile |
128 |
-+++ netbpm/converter/other/Makefile |
129 |
-@@ -159,6 +156,7 @@ |
130 |
- $(shell $(LIBOPT) $(NETPBMLIB)) \ |
131 |
- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) |
132 |
- |
133 |
-+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself |
134 |
- pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) |
135 |
- $(LD) -o $@ $@.o pngtxt.o \ |
136 |
- $(shell $(LIBOPT) $(NETPBMLIB)) \ |
137 |
|
138 |
diff --git a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch b/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch |
139 |
deleted file mode 100644 |
140 |
index 2dcc74fc6b..0000000000 |
141 |
--- a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch |
142 |
+++ /dev/null |
143 |
@@ -1,38 +0,0 @@ |
144 |
-http://bugs.gentoo.org/137871 |
145 |
- |
146 |
---- converter/other/Makefile |
147 |
-+++ converter/other/Makefile |
148 |
-@@ -7,14 +7,6 @@ |
149 |
- |
150 |
- include $(BUILDDIR)/Makefile.config |
151 |
- |
152 |
--ifeq ($(shell xml2-config --version),) |
153 |
-- XML2_LIBS=NONE |
154 |
-- XML2_CFLAGS=NONE |
155 |
--else |
156 |
-- XML2_LIBS=$(shell xml2-config --libs) |
157 |
-- XML2_CFLAGS=$(shell xml2-config --cflags) |
158 |
--endif |
159 |
-- |
160 |
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg |
161 |
- ifneq ($(BUILD_FIASCO), N) |
162 |
- SUBDIRS += fiasco |
163 |
---- Makefile.config.in |
164 |
-+++ Makefile.config.in |
165 |
-@@ -419,6 +419,16 @@ |
166 |
- ZHDR_DIR = |
167 |
- #ZLIB = libz.so |
168 |
- |
169 |
-+# The XML2 library |
170 |
-+ |
171 |
-+ifeq ($(shell xml2-config --version),) |
172 |
-+ XML2_LIBS=NONE |
173 |
-+ XML2_CFLAGS=NONE |
174 |
-+else |
175 |
-+ XML2_LIBS=$(shell xml2-config --libs) |
176 |
-+ XML2_CFLAGS=$(shell xml2-config --cflags) |
177 |
-+endif |
178 |
-+ |
179 |
- # The JBIG lossless image compression library (aka JBIG-KIT): |
180 |
- |
181 |
- JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a |
182 |
|
183 |
diff --git a/media-libs/netpbm/files/netpbm-10.41.0-interix.patch b/media-libs/netpbm/files/netpbm-10.41.0-interix.patch |
184 |
deleted file mode 100644 |
185 |
index 619acfbd39..0000000000 |
186 |
--- a/media-libs/netpbm/files/netpbm-10.41.0-interix.patch |
187 |
+++ /dev/null |
188 |
@@ -1,26 +0,0 @@ |
189 |
-diff -ru netpbm-10.41.0.orig/editor/pamthreshold.c netpbm-10.41.0/editor/pamthreshold.c |
190 |
---- netpbm-10.41.0.orig/editor/pamthreshold.c 2008-03-11 08:52:44 +0100 |
191 |
-+++ netpbm-10.41.0/editor/pamthreshold.c 2008-03-11 08:53:20 +0100 |
192 |
-@@ -23,6 +23,10 @@ |
193 |
- #include <stdlib.h> |
194 |
- #include <string.h> |
195 |
- |
196 |
-+#ifdef __INTERIX |
197 |
-+# include <stdint.h> |
198 |
-+#endif |
199 |
-+ |
200 |
- #include "mallocvar.h" |
201 |
- #include "nstring.h" |
202 |
- #include "shhopt.h" |
203 |
-diff -ru netpbm-10.41.0.orig/lib/util/vasprintf.c netpbm-10.41.0/lib/util/vasprintf.c |
204 |
---- netpbm-10.41.0.orig/lib/util/vasprintf.c 2008-03-11 08:54:55 +0100 |
205 |
-+++ netpbm-10.41.0/lib/util/vasprintf.c 2008-03-11 08:34:13 +0100 |
206 |
-@@ -7,7 +7,7 @@ |
207 |
- |
208 |
- #include "nstring.h" |
209 |
- |
210 |
--#ifdef __GNUC__ |
211 |
-+#if defined(__GNUC__) && !defined(__INTERIX) |
212 |
- #define HAVE_VASPRINTF 1 |
213 |
- #else |
214 |
- #define HAVE_VASPRINTF 0 |
215 |
|
216 |
diff --git a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch b/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch |
217 |
deleted file mode 100644 |
218 |
index 1e61de8dec..0000000000 |
219 |
--- a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch |
220 |
+++ /dev/null |
221 |
@@ -1,16 +0,0 @@ |
222 |
-Index: trunk/lib/libpbm3.c |
223 |
-=================================================================== |
224 |
---- trunk/lib/libpbm3.c (revision 608) |
225 |
-+++ trunk/lib/libpbm3.c (revision 609) |
226 |
-@@ -116,7 +116,11 @@ packBitsWithMmxSse(FILE * const |
227 |
- ) ]; |
228 |
- */ |
229 |
- |
230 |
-+#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 403) |
231 |
-+ typedef char v8qi __attribute__ ((vector_size(8))); |
232 |
-+#else |
233 |
- typedef int v8qi __attribute__ ((mode(V8QI))); |
234 |
-+#endif |
235 |
- typedef int di __attribute__ ((mode(DI))); |
236 |
- |
237 |
- di const zero64 = 0; /* to clear with PXOR */ |
238 |
|
239 |
diff --git a/media-libs/netpbm/files/netpbm-10.42.0-interix.patch b/media-libs/netpbm/files/netpbm-10.42.0-interix.patch |
240 |
deleted file mode 100644 |
241 |
index 963a4b1c79..0000000000 |
242 |
--- a/media-libs/netpbm/files/netpbm-10.42.0-interix.patch |
243 |
+++ /dev/null |
244 |
@@ -1,26 +0,0 @@ |
245 |
-diff -ru netpbm-10.42.0.orig/editor/pamthreshold.c netpbm-10.42.0/editor/pamthreshold.c |
246 |
---- netpbm-10.42.0.orig/editor/pamthreshold.c 2008-03-31 09:19:51 +0200 |
247 |
-+++ netpbm-10.42.0/editor/pamthreshold.c 2008-03-31 09:31:17 +0200 |
248 |
-@@ -23,6 +23,10 @@ |
249 |
- #include <stdlib.h> |
250 |
- #include <string.h> |
251 |
- |
252 |
-+#ifdef __INTERIX |
253 |
-+# include <stdint.h> |
254 |
-+#endif |
255 |
-+ |
256 |
- #include "mallocvar.h" |
257 |
- #include "nstring.h" |
258 |
- #include "shhopt.h" |
259 |
-diff -ru netpbm-10.42.0.orig/lib/util/vasprintf.c netpbm-10.42.0/lib/util/vasprintf.c |
260 |
---- netpbm-10.42.0.orig/lib/util/vasprintf.c 2008-03-31 09:19:51 +0200 |
261 |
-+++ netpbm-10.42.0/lib/util/vasprintf.c 2008-03-31 09:20:27 +0200 |
262 |
-@@ -7,7 +7,7 @@ |
263 |
- |
264 |
- #include "nstring.h" |
265 |
- |
266 |
--#if defined(__GNUC__) && !defined(__MINGW32__) |
267 |
-+#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__INTERIX) |
268 |
- #define HAVE_VASPRINTF 1 |
269 |
- #else |
270 |
- #define HAVE_VASPRINTF 0 |
271 |
|
272 |
diff --git a/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch b/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch |
273 |
deleted file mode 100644 |
274 |
index 35c4a17b5d..0000000000 |
275 |
--- a/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch |
276 |
+++ /dev/null |
277 |
@@ -1,50 +0,0 @@ |
278 |
-fix from upstream |
279 |
- |
280 |
-http://bugs.gentoo.org/249384#c6 |
281 |
- |
282 |
-Index: converter/ppm/picttoppm.c |
283 |
-=================================================================== |
284 |
---- converter/ppm/picttoppm.c (revision 811) |
285 |
-+++ converter/ppm/picttoppm.c (revision 812) |
286 |
-@@ -4056,6 +4056,23 @@ |
287 |
- |
288 |
- |
289 |
- |
290 |
-+static void |
291 |
-+loadDefaultFontDir(void) { |
292 |
-+/*---------------------------------------------------------------------------- |
293 |
-+ Load the fonts from the font directory file "fontdir" (in the current |
294 |
-+ directory), if it exists. |
295 |
-+-----------------------------------------------------------------------------*/ |
296 |
-+ struct stat statbuf; |
297 |
-+ int rc; |
298 |
-+ |
299 |
-+ rc = stat("fontdir", &statbuf); |
300 |
-+ |
301 |
-+ if (rc == 0) |
302 |
-+ load_fontdir("fontdir"); |
303 |
-+} |
304 |
-+ |
305 |
-+ |
306 |
-+ |
307 |
- int |
308 |
- main(int argc, char * argv[]) { |
309 |
- int argn; |
310 |
-@@ -4092,8 +4109,6 @@ |
311 |
- ++argn; |
312 |
- } |
313 |
- |
314 |
-- load_fontdir("fontdir"); |
315 |
-- |
316 |
- if (argn < argc) { |
317 |
- ifp = pm_openr(argv[argn]); |
318 |
- ++argn; |
319 |
-@@ -4103,6 +4118,8 @@ |
320 |
- if (argn != argc) |
321 |
- pm_usage(usage); |
322 |
- |
323 |
-+ loadDefaultFontDir(); |
324 |
-+ |
325 |
- if (header) { |
326 |
- stage = "Reading 512 byte header"; |
327 |
- skip(512); |
328 |
|
329 |
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-darwin.patch b/media-libs/netpbm/files/netpbm-10.46.00-darwin.patch |
330 |
deleted file mode 100644 |
331 |
index 434f5925f9..0000000000 |
332 |
--- a/media-libs/netpbm/files/netpbm-10.46.00-darwin.patch |
333 |
+++ /dev/null |
334 |
@@ -1,15 +0,0 @@ |
335 |
-* pngtopnm uses zlib itself, so don't rely on libpng-config, which does |
336 |
- not output -lz since it's not necessary to do so to link against |
337 |
- libpng |
338 |
- |
339 |
---- converter/other/Makefile |
340 |
-+++ converter/other/Makefile |
341 |
-@@ -152,7 +152,7 @@ |
342 |
- ifeq ($(shell libpng-config --version),) |
343 |
- PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) |
344 |
- else |
345 |
-- PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) |
346 |
-+ PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) $(ZLIB) |
347 |
- endif |
348 |
- |
349 |
- pngtopnm pngtopam: %: %.o $(NETPBMLIB) $(LIBOPT) |
350 |
|
351 |
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch |
352 |
deleted file mode 100644 |
353 |
index 89948dceb4..0000000000 |
354 |
--- a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch |
355 |
+++ /dev/null |
356 |
@@ -1,35 +0,0 @@ |
357 |
-support for jpeg-7 |
358 |
- |
359 |
---- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c |
360 |
-+++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c |
361 |
-@@ -53,6 +53,17 @@ |
362 |
- #define HEADER_SIZE 607 /*JFIF header size used on output images*/ |
363 |
- |
364 |
- |
365 |
-+static int |
366 |
-+minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { |
367 |
-+ |
368 |
-+#if JPEG_LIB_VERSION >= 70 |
369 |
-+ return cinfo.min_DCT_v_scaled_size; |
370 |
-+#else |
371 |
-+ return cinfo.min_DCT_scaled_size; |
372 |
-+#endif |
373 |
-+} |
374 |
-+ |
375 |
-+ |
376 |
- |
377 |
- /*=======================================================================* |
378 |
- * * |
379 |
-@@ -467,11 +474,7 @@ |
380 |
- /* Make an 8-row-high sample array that will go away when done |
381 |
- with image |
382 |
- */ |
383 |
--#ifdef JPEG4 |
384 |
-- buffer_height = 8; /* could be 2, 4,8 rows high */ |
385 |
--#else |
386 |
-- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; |
387 |
--#endif |
388 |
-+ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); |
389 |
- |
390 |
- for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; |
391 |
- cp++,compptr++) { |
392 |
|
393 |
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.46.00-solaris.patch |
394 |
deleted file mode 100644 |
395 |
index cada46158c..0000000000 |
396 |
--- a/media-libs/netpbm/files/netpbm-10.46.00-solaris.patch |
397 |
+++ /dev/null |
398 |
@@ -1,17 +0,0 @@ |
399 |
-* don't define these if you include strings.h on Solaris, the latter |
400 |
- defines them in that case |
401 |
- |
402 |
---- pm_config.in.h |
403 |
-+++ pm_config.in.h |
404 |
-@@ -103,9 +103,11 @@ |
405 |
- |
406 |
- #ifndef __SASC |
407 |
- #ifndef _DCC /* Amiga DICE Compiler */ |
408 |
-+#ifndef __sun__ /* Solaris */ |
409 |
- #define bzero(dst,len) memset(dst,0,len) |
410 |
- #define bcopy(src,dst,len) memcpy(dst,src,len) |
411 |
- #define bcmp memcmp |
412 |
-+#endif |
413 |
- #endif /* _DCC */ |
414 |
- #endif /* __SASC */ |
415 |
- |
416 |
|
417 |
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-interix.patch b/media-libs/netpbm/files/netpbm-10.48.00-interix.patch |
418 |
deleted file mode 100644 |
419 |
index 7f9d734833..0000000000 |
420 |
--- a/media-libs/netpbm/files/netpbm-10.48.00-interix.patch |
421 |
+++ /dev/null |
422 |
@@ -1,10 +0,0 @@ |
423 |
-diff -ru netpbm-10.48.00.orig/pm_config.in.h netpbm-10.48.00/pm_config.in.h |
424 |
---- netpbm-10.48.00.orig/pm_config.in.h 2010-02-03 11:43:58 +0100 |
425 |
-+++ netpbm-10.48.00/pm_config.in.h 2010-02-03 11:46:16 +0100 |
426 |
-@@ -321,3 +321,6 @@ |
427 |
- #define pm_mkdir(dir, perm) mkdir(dir, perm) |
428 |
- #endif |
429 |
- |
430 |
-+#ifdef __INTERIX |
431 |
-+# include <stdint.h> |
432 |
-+#endif |
433 |
|
434 |
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch b/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch |
435 |
deleted file mode 100644 |
436 |
index 9975d29dce..0000000000 |
437 |
--- a/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch |
438 |
+++ /dev/null |
439 |
@@ -1,51 +0,0 @@ |
440 |
-http://bugs.gentoo.org/287725 |
441 |
- |
442 |
-fix from upstream |
443 |
- |
444 |
---- netpbm/converter/other/pngx.c (revision 1021) |
445 |
-+++ netpbm/converter/other/pngx.c (revision 1022) |
446 |
-@@ -69,6 +69,7 @@ |
447 |
- else |
448 |
- *pngxPP = pngxP; |
449 |
- } |
450 |
-+ pngxP->rw = rw; |
451 |
- } |
452 |
- } |
453 |
- |
454 |
-@@ -77,7 +78,14 @@ |
455 |
- void |
456 |
- pngx_destroy(struct pngx * const pngxP) { |
457 |
- |
458 |
-- png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr); |
459 |
-+ switch(pngxP->rw) { |
460 |
-+ case PNGX_READ: |
461 |
-+ png_destroy_read_struct(&pngxP->png_ptr, &pngxP->info_ptr, NULL); |
462 |
-+ break; |
463 |
-+ case PNGX_WRITE: |
464 |
-+ png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr); |
465 |
-+ break; |
466 |
-+ } |
467 |
- |
468 |
- free(pngxP); |
469 |
- } |
470 |
---- netpbm/converter/other/pngx.h (revision 1021) |
471 |
-+++ netpbm/converter/other/pngx.h (revision 1022) |
472 |
-@@ -5,14 +5,14 @@ |
473 |
- the PNG library easier and cleaner. |
474 |
- */ |
475 |
- |
476 |
-+typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw; |
477 |
-+ |
478 |
- struct pngx { |
479 |
- png_structp png_ptr; |
480 |
-- png_infop info_ptr; |
481 |
-+ png_infop info_ptr; |
482 |
-+ pngx_rw rw; |
483 |
- }; |
484 |
- |
485 |
--typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw; |
486 |
-- |
487 |
-- |
488 |
- void |
489 |
- pngx_create(struct pngx ** const pngxPP, |
490 |
- pngx_rw const rw, |
491 |
|
492 |
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch |
493 |
deleted file mode 100644 |
494 |
index 100c33f9ea..0000000000 |
495 |
--- a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch |
496 |
+++ /dev/null |
497 |
@@ -1,12 +0,0 @@ |
498 |
-http://bugs.gentoo.org/291987 |
499 |
- |
500 |
---- netpbm/converter/other/Makefile |
501 |
-+++ netbpm/converter/other/Makefile |
502 |
-@@ -159,6 +156,7 @@ |
503 |
- $(shell $(LIBOPT) $(NETPBMLIB)) \ |
504 |
- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) |
505 |
- |
506 |
-+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself |
507 |
- pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT) |
508 |
- $(LD) -o $@ $@.o pngtxt.o \ |
509 |
- $(shell $(LIBOPT) $(NETPBMLIB)) \ |
510 |
|
511 |
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.48.00-solaris.patch |
512 |
deleted file mode 100644 |
513 |
index 8a2a2751a9..0000000000 |
514 |
--- a/media-libs/netpbm/files/netpbm-10.48.00-solaris.patch |
515 |
+++ /dev/null |
516 |
@@ -1,22 +0,0 @@ |
517 |
---- converter/other/jpeg2000/jpeg2ktopam.corig 2009-10-03 21:08:53.219016926 +0200 |
518 |
-+++ converter/other/jpeg2000/jpeg2ktopam.c 2009-10-03 21:09:31.086672516 +0200 |
519 |
-@@ -9,8 +9,6 @@ |
520 |
- *****************************************************************************/ |
521 |
- |
522 |
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
523 |
--/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ |
524 |
--#define _XOPEN_SOURCE 600 |
525 |
- #include <string.h> |
526 |
- |
527 |
- #include "pm_c_util.h" |
528 |
---- converter/other/jpeg2000/pamtojpeg2k.c.orig 2009-10-03 21:10:15.221677740 +0200 |
529 |
-+++ converter/other/jpeg2000/pamtojpeg2k.c 2009-10-03 21:10:25.271260072 +0200 |
530 |
-@@ -9,8 +9,6 @@ |
531 |
- *****************************************************************************/ |
532 |
- |
533 |
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
534 |
--/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ |
535 |
--#define _XOPEN_SOURCE 600 |
536 |
- #include <string.h> |
537 |
- |
538 |
- #include "pm_c_util.h" |
539 |
|
540 |
diff --git a/media-libs/netpbm/files/netpbm-10.49.00-darwin-signals.patch b/media-libs/netpbm/files/netpbm-10.49.00-darwin-signals.patch |
541 |
deleted file mode 100644 |
542 |
index 7ad88ab3b1..0000000000 |
543 |
--- a/media-libs/netpbm/files/netpbm-10.49.00-darwin-signals.patch |
544 |
+++ /dev/null |
545 |
@@ -1,16 +0,0 @@ |
546 |
---- lib/libsystem.c.orig 2010-03-19 16:17:14 +0100 |
547 |
-+++ lib/libsystem.c 2010-03-19 16:20:21 +0100 |
548 |
-@@ -255,9 +255,11 @@ |
549 |
- not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO |
550 |
- */ |
551 |
- } |
552 |
-- } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) |
553 |
-+#if defined(SIGRTMIN) && defined(SIGRTMAX) |
554 |
-+ } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) { |
555 |
- return "SIGRTxxx"; |
556 |
-- else |
557 |
-+#endif |
558 |
-+ } else |
559 |
- return "???"; |
560 |
- } |
561 |
- |
562 |
|
563 |
diff --git a/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch b/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch |
564 |
deleted file mode 100644 |
565 |
index dae1b867e0..0000000000 |
566 |
--- a/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch |
567 |
+++ /dev/null |
568 |
@@ -1,23 +0,0 @@ |
569 |
-fix from upstream for systems that lack SIGPWR |
570 |
- |
571 |
-http://bugs.gentoo.org/310179 |
572 |
- |
573 |
---- trunk/lib/libsystem.c 2010/02/23 15:56:42 1129 |
574 |
-+++ trunk/lib/libsystem.c 2010/03/17 01:57:18 1149 |
575 |
-@@ -278,12 +278,14 @@ |
576 |
- return "SIGWINCH"; |
577 |
- case SIGIO: |
578 |
- return "SIGIO"; |
579 |
-- case SIGPWR: |
580 |
-- return "SIGPWR"; |
581 |
- case SIGSYS: |
582 |
- return "SIGSYS"; |
583 |
- default: |
584 |
- return "???"; |
585 |
-+ |
586 |
-+ /* There are various other signal classes on some systems, but |
587 |
-+ not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO |
588 |
-+ */ |
589 |
- } |
590 |
- } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) |
591 |
- return "SIGRTxxx"; |
592 |
|
593 |
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 |
594 |
deleted file mode 100644 |
595 |
index 1eb5506dda..0000000000 |
596 |
--- a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch |
597 |
+++ /dev/null |
598 |
@@ -1,83 +0,0 @@ |
599 |
-taken from upstream |
600 |
- |
601 |
-http://bugs.gentoo.org/338230 |
602 |
- |
603 |
-Index: editor/pnmconvol.c |
604 |
-=================================================================== |
605 |
---- editor/pnmconvol.c (revision 1297) |
606 |
-+++ editor/pnmconvol.c (revision 1298) |
607 |
-@@ -455,13 +455,13 @@ static void |
608 |
- convKernelCreatePnm(struct pam * const cpamP, |
609 |
- tuple * const * const ctuples, |
610 |
- unsigned int const depth, |
611 |
-- bool const offsetPgm, |
612 |
-+ bool const offsetPnm, |
613 |
- struct convKernel ** const convKernelPP) { |
614 |
- /*---------------------------------------------------------------------------- |
615 |
-- Compute the convolution matrix in normalized form from the PGM |
616 |
-- form. Each element of the output matrix is the actual weight we give an |
617 |
-- input pixel -- i.e. the thing by which we multiple a value from the |
618 |
-- input image. |
619 |
-+ Compute the convolution matrix in normalized form from the PGM form |
620 |
-+ 'ctuples'/'cpamP'. Each element of the output matrix is the actual weight |
621 |
-+ we give an input pixel -- i.e. the thing by which we multiple a value from |
622 |
-+ the input image. |
623 |
- |
624 |
- 'depth' is the required number of planes in the kernel. If 'ctuples' has |
625 |
- fewer planes than that, we duplicate as necessary. E.g. if 'ctuples' is |
626 |
-@@ -470,13 +470,13 @@ convKernelCreatePnm(struct pam * |
627 |
- 'ctuples' has more planes than specified, we ignore the higher numbered |
628 |
- ones. |
629 |
- |
630 |
-- 'offsetPgm' means the PGM convolution matrix is defined in offset form so |
631 |
-+ 'offsetPnm' means the PNM convolution matrix is defined in offset form so |
632 |
- that it can represent negative values. E.g. with maxval 100, 50 means |
633 |
- 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0 |
634 |
- and there are no negative weights. |
635 |
- -----------------------------------------------------------------------------*/ |
636 |
-- double const scale = (offsetPgm ? 2.0 : 1.0) / cpamP->maxval; |
637 |
-- double const offset = offsetPgm ? - 1.0 : 0.0; |
638 |
-+ double const scale = (offsetPnm ? 2.0 : 1.0) / cpamP->maxval; |
639 |
-+ double const offset = offsetPnm ? - 1.0 : 0.0; |
640 |
- unsigned int const planes = MIN(3, depth); |
641 |
- |
642 |
- struct convKernel * convKernelP; |
643 |
-@@ -579,9 +579,19 @@ normalizeKernel(struct convKernel * cons |
644 |
- static void |
645 |
- getKernelPnm(const char * const fileName, |
646 |
- unsigned int const depth, |
647 |
-- bool const nooffset, |
648 |
-+ bool const offset, |
649 |
- struct convKernel ** const convKernelPP) { |
650 |
-+/*---------------------------------------------------------------------------- |
651 |
-+ Get the convolution kernel from the PNM file named 'fileName'. |
652 |
-+ 'offset' means the PNM convolution matrix is defined in offset form so |
653 |
-+ that it can represent negative values. E.g. with maxval 100, 50 means |
654 |
-+ 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0 |
655 |
-+ and there are no negative weights. |
656 |
-+ |
657 |
-+ Make the kernel suitable for convolving an image of depth 'depth'. |
658 |
- |
659 |
-+ Return the kernel as *convKernelPP. |
660 |
-+-----------------------------------------------------------------------------*/ |
661 |
- struct pam cpam; |
662 |
- FILE * cifP; |
663 |
- tuple ** ctuples; |
664 |
-@@ -594,7 +604,7 @@ getKernelPnm(const char * const |
665 |
- |
666 |
- validateKernelDimensions(cpam.width, cpam.height); |
667 |
- |
668 |
-- convKernelCreatePnm(&cpam, ctuples, depth, nooffset, convKernelPP); |
669 |
-+ convKernelCreatePnm(&cpam, ctuples, depth, offset, convKernelPP); |
670 |
- } |
671 |
- |
672 |
- |
673 |
-@@ -893,7 +903,7 @@ getKernel(struct cmdlineInfo const cmd |
674 |
- struct convKernel * convKernelP; |
675 |
- |
676 |
- if (cmdline.pnmMatrixFileName) |
677 |
-- getKernelPnm(cmdline.pnmMatrixFileName, depth, cmdline.nooffset, |
678 |
-+ getKernelPnm(cmdline.pnmMatrixFileName, depth, !cmdline.nooffset, |
679 |
- &convKernelP); |
680 |
- else if (cmdline.matrixfile) |
681 |
- convKernelCreateSimpleFile(cmdline.matrixfile, cmdline.normalize, |
682 |
|
683 |
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 |
684 |
deleted file mode 100644 |
685 |
index 0c1e48549b..0000000000 |
686 |
--- a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch |
687 |
+++ /dev/null |
688 |
@@ -1,35 +0,0 @@ |
689 |
-fix from upstream |
690 |
- |
691 |
------------------------------------------------------------------------- |
692 |
-r1285 | giraffedata | 2010-09-18 16:13:39 -0400 (Sat, 18 Sep 2010) | 1 line |
693 |
- |
694 |
-Fix free of non-allocated memory |
695 |
- |
696 |
-Index: converter/ppm/ppmtompeg/param.c |
697 |
-=================================================================== |
698 |
---- converter/ppm/ppmtompeg/param.c (revision 1284) |
699 |
-+++ converter/ppm/ppmtompeg/param.c (revision 1285) |
700 |
-@@ -283,8 +283,8 @@ GetFrameRate(const char * const p) |
701 |
- |
702 |
- |
703 |
- static void |
704 |
--mergeInputSource(struct inputSource * const baseSourceP, |
705 |
-- struct inputSource * const addedSourceP) { |
706 |
-+mergeInputSource(struct inputSource * const baseSourceP, |
707 |
-+ const struct inputSource * const addedSourceP) { |
708 |
- |
709 |
- unsigned int i; |
710 |
- |
711 |
-@@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * co |
712 |
- for (i = 0; i < addedSourceP->numInputFileEntries; ++i) |
713 |
- baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] = |
714 |
- addedSourceP->inputFileEntries[i]; |
715 |
-- |
716 |
-- free(addedSourceP); |
717 |
-- /* Note the space allocated for the *addedSourceP input file |
718 |
-- entries themselves is still allocated, and used by |
719 |
-- *baseSourceP. |
720 |
-- */ |
721 |
- } |
722 |
- |
723 |
- |
724 |
|
725 |
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.51.00-solaris.patch |
726 |
deleted file mode 100644 |
727 |
index 97f8215c43..0000000000 |
728 |
--- a/media-libs/netpbm/files/netpbm-10.51.00-solaris.patch |
729 |
+++ /dev/null |
730 |
@@ -1,16 +0,0 @@ |
731 |
-Inspired by |
732 |
-http://mail-index.netbsd.org/pkgsrc-bugs/2010/03/04/msg036725.html |
733 |
- |
734 |
-Solves c99 requirement and makes it compile fine on Solaris |
735 |
- |
736 |
---- editor/pampaintspill.c |
737 |
-+++ editor/pampaintspill.c |
738 |
-@@ -37,7 +37,7 @@ |
739 |
- 10.04.14 |
740 |
- */ |
741 |
- |
742 |
--#define _XOPEN_SOURCE 600 /* Make sure random(), srandom() are in <stdlib.h>*/ |
743 |
-+#define _XOPEN_SOURCE 500 /* Make sure random(), srandom() are in <stdlib.h>*/ |
744 |
- #include <stdlib.h> |
745 |
- #include <stdio.h> |
746 |
- #include <string.h> |
747 |
|
748 |
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch b/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch |
749 |
deleted file mode 100644 |
750 |
index e161242c44..0000000000 |
751 |
--- a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch |
752 |
+++ /dev/null |
753 |
@@ -1,16 +0,0 @@ |
754 |
- converter/other/Makefile | 2 +- |
755 |
- 1 files changed, 1 insertions(+), 1 deletions(-) |
756 |
- |
757 |
-diff --git a/converter/other/Makefile b/converter/other/Makefile |
758 |
-index 1417cd3..c178101 100644 |
759 |
---- a/converter/other/Makefile |
760 |
-+++ b/converter/other/Makefile |
761 |
-@@ -167,7 +167,7 @@ pngtopam: %: %.o pngx.o $(NETPBMLIB) $(LIBOPT) |
762 |
- pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT) |
763 |
- $(LD) -o $@ $@.o pngx.o pngtxt.o \ |
764 |
- $(shell $(LIBOPT) $(NETPBMLIB)) \ |
765 |
-- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) |
766 |
-+ $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) -lz |
767 |
- |
768 |
- pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT) |
769 |
- $(LD) -o $@ $@.o \ |
770 |
|
771 |
diff --git a/media-libs/netpbm/files/netpbm-10.57.00-solaris-xopensource.patch b/media-libs/netpbm/files/netpbm-10.57.00-solaris-xopensource.patch |
772 |
deleted file mode 100644 |
773 |
index 326247978f..0000000000 |
774 |
--- a/media-libs/netpbm/files/netpbm-10.57.00-solaris-xopensource.patch |
775 |
+++ /dev/null |
776 |
@@ -1,22 +0,0 @@ |
777 |
---- netpbm-10.57.00/editor/specialty/pampaintspill.c |
778 |
-+++ netpbm-10.57.00/editor/specialty/pampaintspill.c |
779 |
-@@ -37,7 +37,7 @@ |
780 |
- 10.04.14 |
781 |
- */ |
782 |
- |
783 |
--#define _XOPEN_SOURCE 600 /* Make sure random(), srandom() are in <stdlib.h>*/ |
784 |
-+#define _XOPEN_SOURCE 500 /* Make sure random(), srandom() are in <stdlib.h>*/ |
785 |
- #include <stdlib.h> |
786 |
- #include <stdio.h> |
787 |
- #include <string.h> |
788 |
---- netpbm-10.57.00/editor/pamrecolor.c |
789 |
-+++ netpbm-10.57.00/editor/pamrecolor.c |
790 |
-@@ -24,7 +24,7 @@ |
791 |
- * ---------------------------------------------------------------------- |
792 |
- */ |
793 |
- |
794 |
--#define _XOPEN_SOURCE 600 /* Make sure random(), srandom() are in <stdlib.h>*/ |
795 |
-+#define _XOPEN_SOURCE 500 /* Make sure random(), srandom() are in <stdlib.h>*/ |
796 |
- #include <stdio.h> |
797 |
- #include <stdlib.h> |
798 |
- #include <string.h> |
799 |
|
800 |
diff --git a/media-libs/netpbm/files/netpbm-10.60.01-strcaseeq-strcasecmp.patch b/media-libs/netpbm/files/netpbm-10.60.01-strcaseeq-strcasecmp.patch |
801 |
deleted file mode 100644 |
802 |
index 413b23ff66..0000000000 |
803 |
--- a/media-libs/netpbm/files/netpbm-10.60.01-strcaseeq-strcasecmp.patch |
804 |
+++ /dev/null |
805 |
@@ -1,13 +0,0 @@ |
806 |
-https://trac.macports.org/browser/trunk/dports/graphics/netpbm/files/patch-converter-other-giftopnm.c-strcaseeq.diff |
807 |
- |
808 |
---- converter/other/giftopnm.c.orig 2012-07-06 23:30:09.000000000 +0200 |
809 |
-+++ converter/other/giftopnm.c 2012-07-06 23:32:45.000000000 +0200 |
810 |
-@@ -155,7 +155,7 @@ |
811 |
- cmdlineP->imageNum = 0; |
812 |
- cmdlineP->allImages = FALSE; |
813 |
- } else { |
814 |
-- if (strcaseeq(image, "all")) { |
815 |
-+ if (strcasecmp(image, "all") == 0) { |
816 |
- cmdlineP->allImages = TRUE; |
817 |
- } else { |
818 |
- char * tailptr; |
819 |
|
820 |
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch |
821 |
deleted file mode 100644 |
822 |
index 231da54467..0000000000 |
823 |
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch |
824 |
+++ /dev/null |
825 |
@@ -1,38 +0,0 @@ |
826 |
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir |
827 |
-- Try to fix parallel building |
828 |
- |
829 |
---- a/lib/Makefile |
830 |
-+++ b/lib/Makefile |
831 |
-@@ -249,7 +249,7 @@ |
832 |
- .PHONY: install.staticlib |
833 |
- install.staticlib: $(PKGDIR)/link |
834 |
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ |
835 |
-- $(PKGDIR)/link |
836 |
-+ $(PKGDIR)/lib |
837 |
- |
838 |
- # Install a shared library stub -- the ".so" file used at link time to |
839 |
- # prepare a program for dynamically linking a library at run time |
840 |
-@@ -257,9 +257,9 @@ |
841 |
- install.sharedlibstub: $(PKGDIR)/link |
842 |
- ifeq ($(NETPBMLIBTYPE),unixshared) |
843 |
- # install the link-time (.so) links to the runtime libraries |
844 |
-- cd $(PKGDIR)/link ; \ |
845 |
-+ cd $(PKGDIR)/lib ; \ |
846 |
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ |
847 |
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ |
848 |
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ |
849 |
- libnetpbm.$(NETPBMLIBSUFFIX) |
850 |
- endif |
851 |
- ifeq ($(NETPBMLIBTYPE),dll) |
852 |
---- a/GNUmakefile |
853 |
-+++ b/GNUmakefile |
854 |
-@@ -87,6 +87,9 @@ |
855 |
- |
856 |
- .PHONY: nonmerge |
857 |
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all) |
858 |
-+ |
859 |
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all |
860 |
-+converter/all analyzer/all editor/all generator/all other/all: lib/all |
861 |
- |
862 |
- # Parallel make (make --jobs) is not smart enough to coordinate builds |
863 |
- # between submakes, so a naive parallel make would cause certain |
864 |
|
865 |
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 |
866 |
deleted file mode 100644 |
867 |
index 392eae0f40..0000000000 |
868 |
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch |
869 |
+++ /dev/null |
870 |
@@ -1,68 +0,0 @@ |
871 |
-do not autoprobe deps when we disabled them |
872 |
- |
873 |
---- GNUmakefile |
874 |
-+++ GNUmakefile |
875 |
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk |
876 |
- |
877 |
- PROG_SUBDIRS = converter analyzer editor generator other |
878 |
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS) |
879 |
--SUPPORT_SUBDIRS = urt icon buildtools test |
880 |
-+SUPPORT_SUBDIRS = icon buildtools test |
881 |
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB)) |
882 |
-+SUPPORT_SUBDIRS += urt |
883 |
-+endif |
884 |
- |
885 |
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS) |
886 |
- |
887 |
---- converter/other/Makefile |
888 |
-+++ converter/other/Makefile |
889 |
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) |
890 |
- |
891 |
- include $(BUILDDIR)/config.mk |
892 |
- |
893 |
-+ifneq ($(XML2_LIBS),NONE) |
894 |
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi |
895 |
- |
896 |
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),) |
897 |
-@@ -22,6 +23,7 @@ else |
898 |
- XML2_CFLAGS=$(shell xml2-config --cflags) |
899 |
- endif |
900 |
- endif |
901 |
-+endif |
902 |
- |
903 |
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg |
904 |
- ifneq ($(BUILD_FIASCO), N) |
905 |
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE) |
906 |
- endif |
907 |
- endif |
908 |
- |
909 |
-+ifneq ($(PNGLIB),NONE) |
910 |
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi |
911 |
- |
912 |
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),) |
913 |
-@@ -58,6 +61,7 @@ else |
914 |
- endif |
915 |
- endif |
916 |
- endif |
917 |
-+endif |
918 |
- |
919 |
- ifneq ($(JPEGLIB),NONE) |
920 |
- ifneq ($(JPEGHDR_DIR)x,x) |
921 |
---- other/pamx/Makefile |
922 |
-+++ other/pamx/Makefile |
923 |
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk |
924 |
- |
925 |
- EXTERN_INCLUDE = |
926 |
- |
927 |
-+ifneq ($(X11LIB),NONE) |
928 |
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),) |
929 |
- # Pkg-config has never heard of X11, or doesn't even exist |
930 |
- |
931 |
-@@ -23,6 +24,7 @@ else |
932 |
- X11LIB = $(shell pkg-config x11 --libs) |
933 |
- EXTERN_INCLUDES += $(shell pkg-config x11 --cflags) |
934 |
- endif |
935 |
-+endif |
936 |
- |
937 |
- ifeq ($(HAVE_X11LIB),Y) |
938 |
- PORTBINARIES += pamx |
939 |
|
940 |
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 |
941 |
deleted file mode 100644 |
942 |
index cdc075e529..0000000000 |
943 |
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch |
944 |
+++ /dev/null |
945 |
@@ -1,22 +0,0 @@ |
946 |
-the tool tries to generate binary output, but the current locale might change |
947 |
-what awk generates. force it to C/ASCII to avoid that. |
948 |
- |
949 |
-https://bugs.gentoo.org/601012 |
950 |
- |
951 |
---- test/pbmtext.test |
952 |
-+++ test/pbmtext.test |
953 |
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm} |
954 |
- |
955 |
- # One long row |
956 |
- # Should print 3233136020 4535 |
957 |
-+LC_CTYPE=C \ |
958 |
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i); |
959 |
- for (i=160;i<=255;++i) printf("%c",i); }' | \ |
960 |
- pbmtext -builtin bdf | cksum |
961 |
- |
962 |
- # One tall column |
963 |
- # Should print 1216262214 5711 |
964 |
-+LC_CTYPE=C \ |
965 |
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i); |
966 |
- for (i=160;i<=255;++i) printf("%c\n",i); }' | \ |
967 |
- pbmtext -nomargins -builtin bdf | cksum |
968 |
|
969 |
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.76.00-solaris.patch |
970 |
deleted file mode 100644 |
971 |
index f294c7de27..0000000000 |
972 |
--- a/media-libs/netpbm/files/netpbm-10.76.00-solaris.patch |
973 |
+++ /dev/null |
974 |
@@ -1,24 +0,0 @@ |
975 |
---- converter/other/jpeg2000/jpeg2ktopam.c |
976 |
-+++ converter/other/jpeg2000/jpeg2ktopam.c |
977 |
-@@ -9,7 +9,9 @@ |
978 |
- *****************************************************************************/ |
979 |
- |
980 |
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
981 |
-+#if 0 |
982 |
- #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ |
983 |
-+#endif |
984 |
- /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was |
985 |
- necessary to make <inttypes.h> define int_fast32_t, etc. on AIX. |
986 |
- <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>, |
987 |
---- converter/other/jpeg2000/pamtojpeg2k.c |
988 |
-+++ converter/other/jpeg2000/pamtojpeg2k.c |
989 |
-@@ -9,7 +9,9 @@ |
990 |
- *****************************************************************************/ |
991 |
- |
992 |
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
993 |
-+#if 0 |
994 |
- #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ |
995 |
-+#endif |
996 |
- /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was |
997 |
- necessary to make <inttypes.h> define int_fast32_t, etc. on AIX. |
998 |
- <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>, |
999 |
|
1000 |
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch |
1001 |
deleted file mode 100644 |
1002 |
index 870998bc98..0000000000 |
1003 |
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch |
1004 |
+++ /dev/null |
1005 |
@@ -1,248 +0,0 @@ |
1006 |
-automatically skip tests of disabled tools |
1007 |
- |
1008 |
---- GNUmakefile |
1009 |
-+++ GNUmakefile |
1010 |
-@@ -455,6 +458,21 @@ deb: |
1011 |
- .PHONY: check-package |
1012 |
- .PHONY: check-install |
1013 |
- |
1014 |
-+# Variables from the make env we pass down to the test scripts. |
1015 |
-+CHECK_VARS = \ |
1016 |
-+ BUILDDIR=$(BUILDDIR) \ |
1017 |
-+ RGBDEF=$(RGBDEF) \ |
1018 |
-+ BUILD_FIASCO=$(BUILD_FIASCO) \ |
1019 |
-+ JASPERLIB="$(JASPERLIB)" \ |
1020 |
-+ JBIGLIB="$(JBIGLIB)" \ |
1021 |
-+ JPEGLIB="$(JPEGLIB)" \ |
1022 |
-+ PNGLIB="$(PNGLIB)" \ |
1023 |
-+ TIFFLIB="$(TIFFLIB)" \ |
1024 |
-+ URTLIB="$(URTLIB)" \ |
1025 |
-+ X11LIB="$(X11LIB)" \ |
1026 |
-+ XML2_LIBS="$(XML2_LIBS)" \ |
1027 |
-+ ZLIB="$(ZLIB)" |
1028 |
-+ |
1029 |
- # Test files in source tree. |
1030 |
- |
1031 |
- check-tree : BUILDBINDIRS :=./analyzer \ |
1032 |
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE |
1033 |
- |
1034 |
- check-tree: $(TESTRANDOM) resultdir-backup |
1035 |
- cd $(RESULTDIR); \ |
1036 |
-+ $(CHECK_VARS) \ |
1037 |
- CHECK_TYPE=tree \ |
1038 |
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \ |
1039 |
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \ |
1040 |
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \ |
1041 |
-- RGBDEF=$(RGBDEF) \ |
1042 |
- $(SRCDIR)/test/Execute-Tests 2>&1 |
1043 |
- |
1044 |
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom. |
1045 |
-@@ -545,19 +563,18 @@ check: check-package |
1046 |
- |
1047 |
- check-package: $(TESTRANDOM) resultdir-backup |
1048 |
- cd $(RESULTDIR); \ |
1049 |
-+ $(CHECK_VARS) \ |
1050 |
- CHECK_TYPE=package \ |
1051 |
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \ |
1052 |
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \ |
1053 |
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \ |
1054 |
-- RGBDEF=$(RGBDEF) \ |
1055 |
- $(SRCDIR)/test/Execute-Tests 2>&1 |
1056 |
- |
1057 |
- |
1058 |
- # Check after install |
1059 |
- check-install: $(TESTRANDOM) resultdir-backup |
1060 |
- cd $(RESULTDIR); \ |
1061 |
-+ $(CHECK_VARS) \ |
1062 |
- CHECK_TYPE=install \ |
1063 |
-- BUILDDIR=$(BUILDDIR) \ |
1064 |
-- RGBDEF=$(RGBDEF) \ |
1065 |
- $(SRCDIR)/test/Execute-Tests 2>&1 |
1066 |
- |
1067 |
- |
1068 |
---- test/all-in-place.test |
1069 |
-+++ test/all-in-place.test |
1070 |
-@@ -367,11 +367,62 @@ ordinary_testprogs="\ |
1071 |
- zeisstopnm \ |
1072 |
- " |
1073 |
- |
1074 |
-+enabled_testprog() { |
1075 |
-+ case $1 in |
1076 |
-+ fiascotopnm|\ |
1077 |
-+ pnmtofiasco) |
1078 |
-+ [ "${BUILD_FIASCO}" = "N" ] && return 1 ;; |
1079 |
-+ |
1080 |
-+ jpeg2ktopam|\ |
1081 |
-+ pamtojpeg2k) |
1082 |
-+ [ "${JASPERLIB}" = "NONE" ] && return 1 ;; |
1083 |
-+ |
1084 |
-+ jbigtopnm|\ |
1085 |
-+ pnmtojbig) |
1086 |
-+ [ "${JBIGLIB}" = "NONE" ] && return 1 ;; |
1087 |
-+ |
1088 |
-+ jpegtopnm|\ |
1089 |
-+ pnmtojpeg|\ |
1090 |
-+ ppmtojpeg) |
1091 |
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;; |
1092 |
-+ |
1093 |
-+ pamtopng|\ |
1094 |
-+ pngtopam|\ |
1095 |
-+ pnmtopng) |
1096 |
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;; |
1097 |
-+ |
1098 |
-+ svgtopam) |
1099 |
-+ [ "${PNGLIB}" = "NONE" ] && return 1 |
1100 |
-+ [ "${XML2_LIBS}" = "NONE" ] && return 1 |
1101 |
-+ ;; |
1102 |
-+ |
1103 |
-+ pamtotiff|\ |
1104 |
-+ pnmtotiffcmyk|\ |
1105 |
-+ tifftopnm) |
1106 |
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;; |
1107 |
-+ |
1108 |
-+ pnmtorle|\ |
1109 |
-+ rletopnm) |
1110 |
-+ [ "${URTLIB}" = "NONE" ] && return 1 ;; |
1111 |
-+ |
1112 |
-+ pamx) |
1113 |
-+ [ "${X11LIB}" = "NONE" ] && return 1 ;; |
1114 |
-+ esac |
1115 |
-+ |
1116 |
-+ return 0 |
1117 |
-+} |
1118 |
-+ |
1119 |
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm |
1120 |
- # has a slightly different version report format. |
1121 |
- |
1122 |
- for i in $ordinary_testprogs |
1123 |
- do |
1124 |
-+ # Stub out programs that aren't built. |
1125 |
-+ if ! enabled_testprog "$i"; then |
1126 |
-+ echo "$i: ok" |
1127 |
-+ continue |
1128 |
-+ fi |
1129 |
-+ |
1130 |
- $i --version 2>&1 | \ |
1131 |
- egrep -v -e fiascotopnm -e \ |
1132 |
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \ |
1133 |
---- test/fiasco-roundtrip.test |
1134 |
-+++ test/fiasco-roundtrip.test |
1135 |
-@@ -2,6 +2,10 @@ |
1136 |
- # This script tests: pnmtofiasco fiascotopnm |
1137 |
- # Also requires: pnmpad |
1138 |
- |
1139 |
-+if [ "${BUILD_FIASCO}" = "N" ]; then |
1140 |
-+ exit 80 |
1141 |
-+fi |
1142 |
-+ |
1143 |
- # Should print 215556145 102615 |
1144 |
- |
1145 |
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \ |
1146 |
---- test/jbig-roundtrip.test |
1147 |
-+++ test/jbig-roundtrip.test |
1148 |
-@@ -2,6 +2,9 @@ |
1149 |
- # This script tests: pnmtojbig jbigtopnm |
1150 |
- # Also requires: pamchannel pamtopnm |
1151 |
- |
1152 |
-+if [ "${JBIGLIB}" = "NONE" ]; then |
1153 |
-+ exit 80 |
1154 |
-+fi |
1155 |
- |
1156 |
- # Test 1. Should print 2425386270 41 |
1157 |
- pnmtojbig testgrid.pbm | jbigtopnm | cksum |
1158 |
---- test/legacy-names.test |
1159 |
-+++ test/legacy-names.test |
1160 |
-@@ -94,8 +94,30 @@ ordinary_testprogs="\ |
1161 |
- ppmtouil \ |
1162 |
- " |
1163 |
- |
1164 |
-+enabled_testprog() { |
1165 |
-+ case $1 in |
1166 |
-+ ppmtojpeg) |
1167 |
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;; |
1168 |
-+ |
1169 |
-+ pamrgbatopng|\ |
1170 |
-+ pngtopnm) |
1171 |
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;; |
1172 |
-+ |
1173 |
-+ pnmtotiff) |
1174 |
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;; |
1175 |
-+ esac |
1176 |
-+ |
1177 |
-+ return 0 |
1178 |
-+} |
1179 |
-+ |
1180 |
- for i in $ordinary_testprogs |
1181 |
- do |
1182 |
-+ # Stub out programs that aren't built. |
1183 |
-+ if ! enabled_testprog "$i"; then |
1184 |
-+ echo "$i: ok" |
1185 |
-+ continue |
1186 |
-+ fi |
1187 |
-+ |
1188 |
- $i --version 2>&1 | \ |
1189 |
- egrep -v \ |
1190 |
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \ |
1191 |
---- test/png-roundtrip.test |
1192 |
-+++ test/png-roundtrip.test |
1193 |
-@@ -6,6 +6,10 @@ |
1194 |
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates |
1195 |
- ## some problem with pnmtopng. |
1196 |
- |
1197 |
-+if [ "${PNGLIB}" = "NONE" ]; then |
1198 |
-+ exit 80 |
1199 |
-+fi |
1200 |
-+ |
1201 |
- # Test 1. Should print 1926073387 101484 18 times |
1202 |
- for flags in "" -interlace \ |
1203 |
- -gamma=.45 \ |
1204 |
---- test/png-roundtrip2.test |
1205 |
-+++ test/png-roundtrip2.test |
1206 |
-@@ -9,6 +9,10 @@ |
1207 |
- ## If both tests fail, the likely cause is a problem with pngtopam. |
1208 |
- ## It is also possible that there is some problem in libpng. |
1209 |
- |
1210 |
-+if [ "${PNGLIB}" = "NONE" ]; then |
1211 |
-+ exit 80 |
1212 |
-+fi |
1213 |
-+ |
1214 |
- # Test 1. Should print 1926073387 101484 twice |
1215 |
- for flags in "" -gamma=.45 |
1216 |
- do |
1217 |
---- test/ps-roundtrip.test |
1218 |
-+++ test/ps-roundtrip.test |
1219 |
-@@ -8,6 +8,10 @@ |
1220 |
- ## (1) zlib was not linked. |
1221 |
- ## (2) ghostscript is not available. |
1222 |
- |
1223 |
-+if [ "${ZLIB}" = "NONE" ]; then |
1224 |
-+ exit 80 |
1225 |
-+fi |
1226 |
-+ |
1227 |
- tmpdir=${tmpdir:-/tmp} |
1228 |
- |
1229 |
- # pstopnm does not use libnetpbm functions for output. |
1230 |
---- test/tiff-roundtrip.test |
1231 |
-+++ test/tiff-roundtrip.test |
1232 |
-@@ -2,6 +2,9 @@ |
1233 |
- # This script tests: pamtotiff tifftopnm |
1234 |
- # Also requires: |
1235 |
- |
1236 |
-+if [ "${TIFFLIB}" = "NONE" ]; then |
1237 |
-+ exit 80 |
1238 |
-+fi |
1239 |
- |
1240 |
- # Failure message |
1241 |
- ## Second test fails if Netpbm was built without the flate library |
1242 |
---- test/utahrle-roundtrip.test |
1243 |
-+++ test/utahrle-roundtrip.test |
1244 |
-@@ -2,6 +2,9 @@ |
1245 |
- # This script tests: pnmtorle rletopnm |
1246 |
- # Also requires: pamchannel pamtopnm |
1247 |
- |
1248 |
-+if [ "${URTLIB}" = "NONE" ]; then |
1249 |
-+ exit 80 |
1250 |
-+fi |
1251 |
- |
1252 |
- #Test 1. Should produce 1571496937 33838, cksum of testimg.red |
1253 |
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \ |
1254 |
|
1255 |
diff --git a/media-libs/netpbm/files/netpbm-prefix.patch b/media-libs/netpbm/files/netpbm-prefix.patch |
1256 |
deleted file mode 100644 |
1257 |
index 89c2398654..0000000000 |
1258 |
--- a/media-libs/netpbm/files/netpbm-prefix.patch |
1259 |
+++ /dev/null |
1260 |
@@ -1,56 +0,0 @@ |
1261 |
---- converter/pbm/pbmtox10bm~ 2007-10-14 11:12:34 +0200 |
1262 |
-+++ converter/pbm/pbmtox10bm 2007-10-14 11:14:12 +0200 |
1263 |
-@@ -1,4 +1,4 @@ |
1264 |
--#! /usr/bin/perl |
1265 |
-+#! @GENTOO_PORTAGE_EPREFIX@/usr/bin/perl |
1266 |
- |
1267 |
- #============================================================================ |
1268 |
- # This is a compatibility interface to Pbmtoxbm. |
1269 |
---- editor/ppmfade~ 2007-10-14 11:17:35 +0200 |
1270 |
-+++ editor/ppmfade 2007-10-14 11:20:02 +0200 |
1271 |
-@@ -1,4 +1,4 @@ |
1272 |
--#!/usr/bin/perl -w |
1273 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w |
1274 |
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- |
1275 |
- # |
1276 |
- # This program creates a fade (a sequence of frames) between two images. |
1277 |
---- editor/pnmflip~ 2007-10-14 11:20:37 +0200 |
1278 |
-+++ editor/pnmflip 2007-10-14 11:20:45 +0200 |
1279 |
-@@ -1,4 +1,4 @@ |
1280 |
--#!/usr/bin/perl -w |
1281 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w |
1282 |
- |
1283 |
- #============================================================================ |
1284 |
- # This is a compatibility interface to Pamflip. |
1285 |
---- editor/pnmquant~ 2007-10-14 11:21:02 +0200 |
1286 |
-+++ editor/pnmquant 2007-10-14 11:21:13 +0200 |
1287 |
-@@ -1,4 +1,4 @@ |
1288 |
--#!/usr/bin/perl -w |
1289 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w |
1290 |
- |
1291 |
- ############################################################################## |
1292 |
- # pnmquant |
1293 |
---- editor/ppmquant~ 2007-10-14 11:21:35 +0200 |
1294 |
-+++ editor/ppmquant 2007-10-14 11:21:43 +0200 |
1295 |
-@@ -1,4 +1,4 @@ |
1296 |
--#!/usr/bin/perl -w |
1297 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w |
1298 |
- ############################################################################## |
1299 |
- # This is nothing but a compatibility interface for Pnmquant. |
1300 |
- # An old program coded to call Ppmquant will continue working because |
1301 |
---- editor/ppmshadow~ 2007-10-14 11:33:01 +0200 |
1302 |
-+++ editor/ppmshadow 2007-10-14 11:33:13 +0200 |
1303 |
-@@ -1,4 +1,4 @@ |
1304 |
--#!/usr/bin/perl -w |
1305 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w |
1306 |
- |
1307 |
- # P P M S H A D O W |
1308 |
- |
1309 |
---- generator/ppmrainbow~ 2007-10-14 11:22:04 +0200 |
1310 |
-+++ generator/ppmrainbow 2007-10-14 11:22:14 +0200 |
1311 |
-@@ -1,4 +1,4 @@ |
1312 |
--#!/usr/bin/perl -wl |
1313 |
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -wl |
1314 |
- use strict; |
1315 |
- use Getopt::Long; |
1316 |
- |
1317 |
|
1318 |
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml |
1319 |
deleted file mode 100644 |
1320 |
index ca3e23b04d..0000000000 |
1321 |
--- a/media-libs/netpbm/metadata.xml |
1322 |
+++ /dev/null |
1323 |
@@ -1,14 +0,0 @@ |
1324 |
-<?xml version="1.0" encoding="UTF-8"?> |
1325 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1326 |
-<pkgmetadata> |
1327 |
- <maintainer type="project"> |
1328 |
- <email>graphics@g.o</email> |
1329 |
- <name>Gentoo Graphics Project</name> |
1330 |
- </maintainer> |
1331 |
- <use> |
1332 |
- <flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag> |
1333 |
- </use> |
1334 |
- <upstream> |
1335 |
- <remote-id type="sourceforge">netpbm</remote-id> |
1336 |
- </upstream> |
1337 |
-</pkgmetadata> |
1338 |
|
1339 |
diff --git a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild b/media-libs/netpbm/netpbm-10.51.00-r2.ebuild |
1340 |
deleted file mode 100644 |
1341 |
index d1de3fa339..0000000000 |
1342 |
--- a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild |
1343 |
+++ /dev/null |
1344 |
@@ -1,194 +0,0 @@ |
1345 |
-# Copyright 1999-2017 Gentoo Foundation |
1346 |
-# Distributed under the terms of the GNU General Public License v2 |
1347 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r2.ebuild,v 1.5 2011/11/16 09:47:56 jlec Exp $ |
1348 |
- |
1349 |
-EAPI="3" |
1350 |
- |
1351 |
-inherit toolchain-funcs eutils multilib prefix |
1352 |
- |
1353 |
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" |
1354 |
-HOMEPAGE="http://netpbm.sourceforge.net/" |
1355 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
1356 |
- mirror://gentoo/${P}-libpng-1.5.patch.bz2" |
1357 |
- |
1358 |
-LICENSE="GPL-2" |
1359 |
-SLOT="0" |
1360 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
1361 |
-IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib" |
1362 |
- |
1363 |
-RDEPEND="jbig? ( media-libs/jbigkit ) |
1364 |
- jpeg? ( virtual/jpeg ) |
1365 |
- jpeg2k? ( media-libs/jasper ) |
1366 |
- png? ( >=media-libs/libpng-1.4:0 ) |
1367 |
- rle? ( media-libs/urt ) |
1368 |
- svga? ( media-libs/svgalib ) |
1369 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
1370 |
- xml? ( dev-libs/libxml2 ) |
1371 |
- zlib? ( sys-libs/zlib ) |
1372 |
- X? ( x11-libs/libX11 )" |
1373 |
-DEPEND="${RDEPEND} |
1374 |
- app-arch/xz-utils |
1375 |
- sys-devel/flex" |
1376 |
- |
1377 |
-maint_pkg_create() { |
1378 |
- local base="${EPREFIX}/usr/local/src" |
1379 |
- local srcdir="${base}/netpbm/release_number" |
1380 |
- if [[ -d ${srcdir} ]] ; then |
1381 |
- cd "${T}" || die |
1382 |
- |
1383 |
- ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}" |
1384 |
- svn export -q ${srcdir}/${PV} netpbm-${PV} |
1385 |
- eend $? || return 1 |
1386 |
- |
1387 |
- ebegin "Creating netpbm-${PV}.tar.xz" |
1388 |
- tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz |
1389 |
- eend $? |
1390 |
- |
1391 |
- einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz" |
1392 |
- else |
1393 |
- einfo "You need to run:" |
1394 |
- einfo " cd ${base}" |
1395 |
- einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm" |
1396 |
- die "need svn checkout dir" |
1397 |
- fi |
1398 |
-} |
1399 |
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.xz ]] && maint_pkg_create ; } |
1400 |
- |
1401 |
-netpbm_libtype() { |
1402 |
- case ${CHOST} in |
1403 |
- *-darwin*) echo dylib;; |
1404 |
- *) echo unixshared;; |
1405 |
- esac |
1406 |
-} |
1407 |
-netpbm_libsuffix() { |
1408 |
- local suffix=$(get_libname) |
1409 |
- echo ${suffix//\.} |
1410 |
-} |
1411 |
-netpbm_ldshlib() { |
1412 |
- # ultra dirty Darwin hack, but hey... in the end this is all it needs... |
1413 |
- case ${CHOST} in |
1414 |
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.10.dylib';; |
1415 |
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; |
1416 |
- esac |
1417 |
-} |
1418 |
-netpbm_config() { |
1419 |
- if use $1 ; then |
1420 |
- [[ $2 != "!" ]] && echo -l${2:-$1} |
1421 |
- else |
1422 |
- echo NONE |
1423 |
- fi |
1424 |
-} |
1425 |
- |
1426 |
-src_prepare() { |
1427 |
- epatch "${FILESDIR}"/netpbm-10.31-build.patch |
1428 |
- epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch |
1429 |
- epatch "${FILESDIR}"/${P}-pnmconvol-nooffset.patch #338230 |
1430 |
- epatch "${WORKDIR}"/${P}-libpng-1.5.patch #355025 |
1431 |
- epatch "${FILESDIR}"/${P}-underlinking.patch #367405 |
1432 |
- |
1433 |
- epatch "${FILESDIR}"/${PN}-10.46.00-darwin.patch |
1434 |
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch |
1435 |
- epatch "${FILESDIR}"/${PN}-10.48.00-solaris.patch |
1436 |
- epatch "${FILESDIR}"/${PN}-10.51.00-solaris.patch |
1437 |
- epatch "${FILESDIR}"/${PN}-10.48.00-interix.patch |
1438 |
- epatch "${FILESDIR}"/${PN}-10.49.00-darwin-signals.patch |
1439 |
- epatch "${FILESDIR}"/netpbm-prefix.patch |
1440 |
- eprefixify converter/pbm/pbmtox10bm generator/ppmrainbow \ |
1441 |
- editor/{ppmfade,pnmflip,pnmquant,ppmquant,ppmshadow} |
1442 |
- |
1443 |
- # make sure we use system urt |
1444 |
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
1445 |
- rm -rf urt |
1446 |
- |
1447 |
- # take care of the importinc stuff ourselves by only doing it once |
1448 |
- # at the top level and having all subdirs use that one set #149843 |
1449 |
- sed -i \ |
1450 |
- -e '/^importinc:/s|^|importinc:\nmanual_|' \ |
1451 |
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ |
1452 |
- common.mk || die |
1453 |
- sed -i \ |
1454 |
- -e '/%.c/s: importinc$::' \ |
1455 |
- common.mk lib/Makefile lib/util/Makefile || die |
1456 |
- |
1457 |
- # avoid ugly depend.mk warnings |
1458 |
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
1459 |
-} |
1460 |
- |
1461 |
-src_configure() { |
1462 |
- cat config.mk.in - >> config.mk <<-EOF |
1463 |
- # Misc crap |
1464 |
- BUILD_FIASCO = N |
1465 |
- SYMLINK = ln -sf |
1466 |
- |
1467 |
- # Toolchain options |
1468 |
- CC = $(tc-getCC) -Wall |
1469 |
- LD = \$(CC) |
1470 |
- CC_FOR_BUILD = $(tc-getBUILD_CC) |
1471 |
- LD_FOR_BUILD = \$(CC_FOR_BUILD) |
1472 |
- AR = $(tc-getAR) |
1473 |
- RANLIB = $(tc-getRANLIB) |
1474 |
- |
1475 |
- STRIPFLAG = |
1476 |
- CFLAGS_SHLIB = -fPIC |
1477 |
- |
1478 |
- LDRELOC = \$(LD) -r |
1479 |
- LDSHLIB = $(netpbm_ldshlib) |
1480 |
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to |
1481 |
- LINKERISCOMPILER = Y |
1482 |
- NETPBMLIBSUFFIX = $(netpbm_libsuffix) |
1483 |
- NETPBMLIBTYPE = $(netpbm_libtype) |
1484 |
- |
1485 |
- # Gentoo build options |
1486 |
- TIFFLIB = $(netpbm_config tiff) |
1487 |
- JPEGLIB = $(netpbm_config jpeg) |
1488 |
- PNGLIB = $(netpbm_config png) |
1489 |
- ZLIB = $(netpbm_config zlib z) |
1490 |
- LINUXSVGALIB = $(netpbm_config svga vga) |
1491 |
- XML2_LIBS = $(netpbm_config xml xml2) |
1492 |
- JBIGLIB = -ljbig |
1493 |
- JBIGHDR_DIR = $(netpbm_config jbig "!") |
1494 |
- JASPERLIB = -ljasper |
1495 |
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!") |
1496 |
- URTLIB = $(netpbm_config rle) |
1497 |
- URTHDR_DIR = |
1498 |
- X11LIB = $(netpbm_config X X11) |
1499 |
- X11HDR_DIR = |
1500 |
- EOF |
1501 |
- # cannot chain the die with the heredoc above as bash-3 |
1502 |
- # has a parser bug in that setup #282902 |
1503 |
- [ $? -eq 0 ] || die "writing config.mk failed" |
1504 |
-} |
1505 |
- |
1506 |
-src_compile() { |
1507 |
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname |
1508 |
- # we need -lnsl, for connect -lsocket |
1509 |
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket" |
1510 |
- # same holds for interix, but we only need iberty |
1511 |
- [[ ${CHOST} == *-interix* ]] && extlibs="-liberty" |
1512 |
- |
1513 |
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc || die #149843 |
1514 |
- emake LIBS="${extlibs}" || die |
1515 |
-} |
1516 |
- |
1517 |
-src_install() { |
1518 |
- mkdir -p "${ED}" |
1519 |
- # Subdir make targets like to use `mkdir` all over the place |
1520 |
- # without any actual dependencies, thus the -j1. |
1521 |
- emake -j1 package pkgdir="${ED}"/usr || die |
1522 |
- |
1523 |
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) |
1524 |
- |
1525 |
- # Remove cruft that we don't need, and move around stuff we want |
1526 |
- rm "${ED}"/usr/bin/{doc.url,manweb} || die |
1527 |
- rm -r "${ED}"/usr/man/web || die |
1528 |
- rm -r "${ED}"/usr/link || die |
1529 |
- rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die |
1530 |
- dodir /usr/share |
1531 |
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die |
1532 |
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die |
1533 |
- |
1534 |
- dodoc README |
1535 |
- cd doc |
1536 |
- dodoc HISTORY Netpbm.programming USERDOC |
1537 |
- dohtml -r . |
1538 |
-} |
1539 |
|
1540 |
diff --git a/media-libs/netpbm/netpbm-10.57.00.ebuild b/media-libs/netpbm/netpbm-10.57.00.ebuild |
1541 |
deleted file mode 100644 |
1542 |
index e9e57fe68c..0000000000 |
1543 |
--- a/media-libs/netpbm/netpbm-10.57.00.ebuild |
1544 |
+++ /dev/null |
1545 |
@@ -1,166 +0,0 @@ |
1546 |
-# Copyright 1999-2017 Gentoo Foundation |
1547 |
-# Distributed under the terms of the GNU General Public License v2 |
1548 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.57.00.ebuild,v 1.1 2012/01/03 01:37:19 vapier Exp $ |
1549 |
- |
1550 |
-EAPI="3" |
1551 |
- |
1552 |
-inherit toolchain-funcs eutils multilib prefix |
1553 |
- |
1554 |
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" |
1555 |
-HOMEPAGE="http://netpbm.sourceforge.net/" |
1556 |
-SRC_URI="mirror://gentoo/${P}.tar.xz" |
1557 |
- |
1558 |
-LICENSE="GPL-2" |
1559 |
-SLOT="0" |
1560 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
1561 |
-IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib" |
1562 |
- |
1563 |
-RDEPEND="jbig? ( media-libs/jbigkit ) |
1564 |
- jpeg? ( virtual/jpeg ) |
1565 |
- jpeg2k? ( media-libs/jasper ) |
1566 |
- png? ( >=media-libs/libpng-1.4:0 ) |
1567 |
- rle? ( media-libs/urt ) |
1568 |
- svga? ( media-libs/svgalib ) |
1569 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
1570 |
- xml? ( dev-libs/libxml2 ) |
1571 |
- zlib? ( sys-libs/zlib ) |
1572 |
- X? ( x11-libs/libX11 )" |
1573 |
-DEPEND="${RDEPEND} |
1574 |
- app-arch/xz-utils |
1575 |
- sys-devel/flex" |
1576 |
- |
1577 |
-netpbm_libtype() { |
1578 |
- case ${CHOST} in |
1579 |
- *-darwin*) echo dylib;; |
1580 |
- *) echo unixshared;; |
1581 |
- esac |
1582 |
-} |
1583 |
-netpbm_libsuffix() { |
1584 |
- local suffix=$(get_libname) |
1585 |
- echo ${suffix//\.} |
1586 |
-} |
1587 |
-netpbm_ldshlib() { |
1588 |
- # ultra dirty Darwin hack, but hey... in the end this is all it needs... |
1589 |
- case ${CHOST} in |
1590 |
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.$(MAJ).dylib';; |
1591 |
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; |
1592 |
- esac |
1593 |
-} |
1594 |
-netpbm_config() { |
1595 |
- if use $1 ; then |
1596 |
- [[ $2 != "!" ]] && echo -l${2:-$1} |
1597 |
- else |
1598 |
- echo NONE |
1599 |
- fi |
1600 |
-} |
1601 |
- |
1602 |
-src_prepare() { |
1603 |
- epatch "${FILESDIR}"/netpbm-10.31-build.patch |
1604 |
- |
1605 |
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch |
1606 |
- epatch "${FILESDIR}"/${PN}-10.48.00-solaris.patch |
1607 |
- epatch "${FILESDIR}"/${PN}-10.57.00-solaris-xopensource.patch |
1608 |
- epatch "${FILESDIR}"/${PN}-10.48.00-interix.patch |
1609 |
- epatch "${FILESDIR}"/netpbm-prefix.patch |
1610 |
- eprefixify converter/pbm/pbmtox10bm generator/ppmrainbow \ |
1611 |
- editor/{ppmfade,pnmflip,pnmquant,ppmquant,ppmshadow} |
1612 |
- |
1613 |
- # make sure we use system urt |
1614 |
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
1615 |
- rm -rf urt |
1616 |
- |
1617 |
- # take care of the importinc stuff ourselves by only doing it once |
1618 |
- # at the top level and having all subdirs use that one set #149843 |
1619 |
- sed -i \ |
1620 |
- -e '/^importinc:/s|^|importinc:\nmanual_|' \ |
1621 |
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ |
1622 |
- common.mk || die |
1623 |
- sed -i \ |
1624 |
- -e '/%.c/s: importinc$::' \ |
1625 |
- common.mk lib/Makefile lib/util/Makefile || die |
1626 |
- |
1627 |
- # avoid ugly depend.mk warnings |
1628 |
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
1629 |
-} |
1630 |
- |
1631 |
-src_configure() { |
1632 |
- cat config.mk.in - >> config.mk <<-EOF |
1633 |
- # Misc crap |
1634 |
- BUILD_FIASCO = N |
1635 |
- SYMLINK = ln -sf |
1636 |
- |
1637 |
- # Toolchain options |
1638 |
- CC = $(tc-getCC) -Wall |
1639 |
- LD = \$(CC) |
1640 |
- CC_FOR_BUILD = $(tc-getBUILD_CC) |
1641 |
- LD_FOR_BUILD = \$(CC_FOR_BUILD) |
1642 |
- AR = $(tc-getAR) |
1643 |
- RANLIB = $(tc-getRANLIB) |
1644 |
- |
1645 |
- STRIPFLAG = |
1646 |
- CFLAGS_SHLIB = -fPIC |
1647 |
- |
1648 |
- LDRELOC = \$(LD) -r |
1649 |
- LDSHLIB = $(netpbm_ldshlib) |
1650 |
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to |
1651 |
- LINKERISCOMPILER = Y |
1652 |
- NETPBMLIBSUFFIX = $(netpbm_libsuffix) |
1653 |
- NETPBMLIBTYPE = $(netpbm_libtype) |
1654 |
- |
1655 |
- # Gentoo build options |
1656 |
- TIFFLIB = $(netpbm_config tiff) |
1657 |
- # Let tiff worry about its own dependencies #395753 |
1658 |
- TIFFLIB_NEEDS_JPEG = N |
1659 |
- TIFFLIB_NEEDS_Z = N |
1660 |
- JPEGLIB = $(netpbm_config jpeg) |
1661 |
- PNGLIB = $(netpbm_config png) |
1662 |
- ZLIB = $(netpbm_config zlib z) |
1663 |
- LINUXSVGALIB = $(netpbm_config svga vga) |
1664 |
- XML2_LIBS = $(netpbm_config xml xml2) |
1665 |
- JBIGLIB = -ljbig |
1666 |
- JBIGHDR_DIR = $(netpbm_config jbig "!") |
1667 |
- JASPERLIB = -ljasper |
1668 |
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!") |
1669 |
- URTLIB = $(netpbm_config rle) |
1670 |
- URTHDR_DIR = |
1671 |
- X11LIB = $(netpbm_config X X11) |
1672 |
- X11HDR_DIR = |
1673 |
- EOF |
1674 |
- # cannot chain the die with the heredoc above as bash-3 |
1675 |
- # has a parser bug in that setup #282902 |
1676 |
- [ $? -eq 0 ] || die "writing config.mk failed" |
1677 |
-} |
1678 |
- |
1679 |
-src_compile() { |
1680 |
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname |
1681 |
- # we need -lnsl, for connect -lsocket |
1682 |
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket" |
1683 |
- # same holds for interix, but we only need iberty |
1684 |
- [[ ${CHOST} == *-interix* ]] && extlibs="-liberty" |
1685 |
- |
1686 |
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc || die #149843 |
1687 |
- emake LIBS="${extlibs}" || die |
1688 |
-} |
1689 |
- |
1690 |
-src_install() { |
1691 |
- mkdir -p "${ED}" |
1692 |
- # Subdir make targets like to use `mkdir` all over the place |
1693 |
- # without any actual dependencies, thus the -j1. |
1694 |
- emake -j1 package pkgdir="${ED}"/usr || die |
1695 |
- |
1696 |
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) |
1697 |
- |
1698 |
- # Remove cruft that we don't need, and move around stuff we want |
1699 |
- rm "${ED}"/usr/bin/{doc.url,manweb} || die |
1700 |
- rm -r "${ED}"/usr/man/web || die |
1701 |
- rm -r "${ED}"/usr/link || die |
1702 |
- rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die |
1703 |
- dodir /usr/share |
1704 |
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die |
1705 |
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die |
1706 |
- |
1707 |
- dodoc README |
1708 |
- cd doc |
1709 |
- dodoc HISTORY Netpbm.programming USERDOC |
1710 |
- dohtml -r . |
1711 |
-} |
1712 |
|
1713 |
diff --git a/media-libs/netpbm/netpbm-10.59.00.ebuild b/media-libs/netpbm/netpbm-10.59.00.ebuild |
1714 |
deleted file mode 100644 |
1715 |
index a1987225f5..0000000000 |
1716 |
--- a/media-libs/netpbm/netpbm-10.59.00.ebuild |
1717 |
+++ /dev/null |
1718 |
@@ -1,169 +0,0 @@ |
1719 |
-# Copyright 1999-2017 Gentoo Foundation |
1720 |
-# Distributed under the terms of the GNU General Public License v2 |
1721 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.59.00.ebuild,v 1.1 2012/07/18 21:50:27 vapier Exp $ |
1722 |
- |
1723 |
-EAPI="4" |
1724 |
- |
1725 |
-inherit toolchain-funcs eutils multilib prefix |
1726 |
- |
1727 |
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" |
1728 |
-HOMEPAGE="http://netpbm.sourceforge.net/" |
1729 |
-SRC_URI="mirror://gentoo/${P}.tar.xz" |
1730 |
- |
1731 |
-LICENSE="GPL-2" |
1732 |
-SLOT="0" |
1733 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
1734 |
-IUSE="doc jbig jpeg jpeg2k png rle svga tiff X xml zlib" |
1735 |
- |
1736 |
-RDEPEND="jbig? ( media-libs/jbigkit ) |
1737 |
- jpeg? ( virtual/jpeg ) |
1738 |
- jpeg2k? ( media-libs/jasper ) |
1739 |
- png? ( >=media-libs/libpng-1.4:0 ) |
1740 |
- rle? ( media-libs/urt ) |
1741 |
- svga? ( media-libs/svgalib ) |
1742 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
1743 |
- xml? ( dev-libs/libxml2 ) |
1744 |
- zlib? ( sys-libs/zlib ) |
1745 |
- X? ( x11-libs/libX11 )" |
1746 |
-DEPEND="${RDEPEND} |
1747 |
- app-arch/xz-utils |
1748 |
- sys-devel/flex" |
1749 |
- |
1750 |
-netpbm_libtype() { |
1751 |
- case ${CHOST} in |
1752 |
- *-darwin*) echo dylib;; |
1753 |
- *) echo unixshared;; |
1754 |
- esac |
1755 |
-} |
1756 |
-netpbm_libsuffix() { |
1757 |
- local suffix=$(get_libname) |
1758 |
- echo ${suffix//\.} |
1759 |
-} |
1760 |
-netpbm_ldshlib() { |
1761 |
- # ultra dirty Darwin hack, but hey... in the end this is all it needs... |
1762 |
- case ${CHOST} in |
1763 |
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.$(MAJ).dylib';; |
1764 |
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; |
1765 |
- esac |
1766 |
-} |
1767 |
-netpbm_config() { |
1768 |
- if use $1 ; then |
1769 |
- [[ $2 != "!" ]] && echo -l${2:-$1} |
1770 |
- else |
1771 |
- echo NONE |
1772 |
- fi |
1773 |
-} |
1774 |
- |
1775 |
-src_prepare() { |
1776 |
- epatch "${FILESDIR}"/netpbm-10.31-build.patch |
1777 |
- |
1778 |
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch |
1779 |
- epatch "${FILESDIR}"/${PN}-10.48.00-solaris.patch |
1780 |
- #epatch "${FILESDIR}"/${PN}-10.57.00-solaris-xopensource.patch |
1781 |
- #epatch "${FILESDIR}"/${PN}-10.48.00-interix.patch |
1782 |
- epatch "${FILESDIR}"/${PN}-10.60.01-strcaseeq-strcasecmp.patch |
1783 |
- epatch "${FILESDIR}"/netpbm-prefix.patch |
1784 |
- eprefixify converter/pbm/pbmtox10bm generator/ppmrainbow \ |
1785 |
- editor/{ppmfade,pnmflip,pnmquant,ppmquant,ppmshadow} |
1786 |
- |
1787 |
- # make sure we use system urt |
1788 |
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
1789 |
- rm -rf urt |
1790 |
- |
1791 |
- # take care of the importinc stuff ourselves by only doing it once |
1792 |
- # at the top level and having all subdirs use that one set #149843 |
1793 |
- sed -i \ |
1794 |
- -e '/^importinc:/s|^|importinc:\nmanual_|' \ |
1795 |
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ |
1796 |
- common.mk || die |
1797 |
- sed -i \ |
1798 |
- -e '/%.c/s: importinc$::' \ |
1799 |
- common.mk lib/Makefile lib/util/Makefile || die |
1800 |
- |
1801 |
- # avoid ugly depend.mk warnings |
1802 |
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
1803 |
-} |
1804 |
- |
1805 |
-src_configure() { |
1806 |
- cat config.mk.in - >> config.mk <<-EOF |
1807 |
- # Misc crap |
1808 |
- BUILD_FIASCO = N |
1809 |
- SYMLINK = ln -sf |
1810 |
- |
1811 |
- # Toolchain options |
1812 |
- CC = $(tc-getCC) -Wall |
1813 |
- LD = \$(CC) |
1814 |
- CC_FOR_BUILD = $(tc-getBUILD_CC) |
1815 |
- LD_FOR_BUILD = \$(CC_FOR_BUILD) |
1816 |
- AR = $(tc-getAR) |
1817 |
- RANLIB = $(tc-getRANLIB) |
1818 |
- |
1819 |
- STRIPFLAG = |
1820 |
- CFLAGS_SHLIB = -fPIC |
1821 |
- |
1822 |
- LDRELOC = \$(LD) -r |
1823 |
- LDSHLIB = $(netpbm_ldshlib) |
1824 |
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to |
1825 |
- LINKERISCOMPILER = Y |
1826 |
- NETPBMLIBSUFFIX = $(netpbm_libsuffix) |
1827 |
- NETPBMLIBTYPE = $(netpbm_libtype) |
1828 |
- |
1829 |
- # Gentoo build options |
1830 |
- TIFFLIB = $(netpbm_config tiff) |
1831 |
- # Let tiff worry about its own dependencies #395753 |
1832 |
- TIFFLIB_NEEDS_JPEG = N |
1833 |
- TIFFLIB_NEEDS_Z = N |
1834 |
- JPEGLIB = $(netpbm_config jpeg) |
1835 |
- PNGLIB = $(netpbm_config png) |
1836 |
- ZLIB = $(netpbm_config zlib z) |
1837 |
- LINUXSVGALIB = $(netpbm_config svga vga) |
1838 |
- XML2_LIBS = $(netpbm_config xml xml2) |
1839 |
- JBIGLIB = -ljbig |
1840 |
- JBIGHDR_DIR = $(netpbm_config jbig "!") |
1841 |
- JASPERLIB = -ljasper |
1842 |
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!") |
1843 |
- URTLIB = $(netpbm_config rle) |
1844 |
- URTHDR_DIR = |
1845 |
- X11LIB = $(netpbm_config X X11) |
1846 |
- X11HDR_DIR = |
1847 |
- EOF |
1848 |
- # cannot chain the die with the heredoc above as bash-3 |
1849 |
- # has a parser bug in that setup #282902 |
1850 |
- [ $? -eq 0 ] || die "writing config.mk failed" |
1851 |
-} |
1852 |
- |
1853 |
-src_compile() { |
1854 |
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname |
1855 |
- # we need -lnsl, for connect -lsocket |
1856 |
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket" |
1857 |
- # same holds for interix, but we only need iberty |
1858 |
- [[ ${CHOST} == *-interix* ]] && extlibs="-liberty" |
1859 |
- |
1860 |
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc #149843 |
1861 |
- emake LIBS="${extlibs}" |
1862 |
-} |
1863 |
- |
1864 |
-src_install() { |
1865 |
- mkdir -p "${ED}" |
1866 |
- # Subdir make targets like to use `mkdir` all over the place |
1867 |
- # without any actual dependencies, thus the -j1. |
1868 |
- emake -j1 package pkgdir="${ED}"/usr |
1869 |
- |
1870 |
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) |
1871 |
- |
1872 |
- # Remove cruft that we don't need, and move around stuff we want |
1873 |
- rm "${ED}"/usr/bin/{doc.url,manweb} || die |
1874 |
- rm -r "${ED}"/usr/man/web || die |
1875 |
- rm -r "${ED}"/usr/link || die |
1876 |
- rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die |
1877 |
- dodir /usr/share |
1878 |
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die |
1879 |
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die |
1880 |
- |
1881 |
- doman userguide/*.[0-9] |
1882 |
- use doc && dohtml -r userguide |
1883 |
- dodoc README |
1884 |
- cd doc |
1885 |
- dodoc HISTORY Netpbm.programming USERDOC |
1886 |
- dohtml -r . |
1887 |
-} |
1888 |
|
1889 |
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild |
1890 |
deleted file mode 100644 |
1891 |
index 8d33c25e68..0000000000 |
1892 |
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild |
1893 |
+++ /dev/null |
1894 |
@@ -1,195 +0,0 @@ |
1895 |
-# Copyright 1999-2019 Gentoo Authors |
1896 |
-# Distributed under the terms of the GNU General Public License v2 |
1897 |
- |
1898 |
-EAPI="5" |
1899 |
- |
1900 |
-inherit toolchain-funcs eutils multilib prefix |
1901 |
- |
1902 |
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" |
1903 |
-HOMEPAGE="http://netpbm.sourceforge.net/" |
1904 |
-SRC_URI="mirror://gentoo/${P}.tar.xz" |
1905 |
- |
1906 |
-LICENSE="GPL-2" |
1907 |
-SLOT="0" |
1908 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
1909 |
-IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" |
1910 |
- |
1911 |
-RDEPEND="jbig? ( media-libs/jbigkit ) |
1912 |
- jpeg? ( virtual/jpeg:0 ) |
1913 |
- jpeg2k? ( media-libs/jasper ) |
1914 |
- png? ( >=media-libs/libpng-1.4:0 ) |
1915 |
- postscript? ( app-text/ghostscript-gpl ) |
1916 |
- rle? ( media-libs/urt ) |
1917 |
- svga? ( media-libs/svgalib ) |
1918 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
1919 |
- xml? ( dev-libs/libxml2 ) |
1920 |
- zlib? ( sys-libs/zlib ) |
1921 |
- X? ( x11-libs/libX11 )" |
1922 |
-DEPEND="${RDEPEND} |
1923 |
- app-arch/xz-utils |
1924 |
- sys-devel/flex" |
1925 |
- |
1926 |
-netpbm_libtype() { |
1927 |
- case ${CHOST} in |
1928 |
- *-darwin*) echo dylib;; |
1929 |
- *) echo unixshared;; |
1930 |
- esac |
1931 |
-} |
1932 |
-netpbm_libsuffix() { |
1933 |
- local suffix=$(get_libname) |
1934 |
- echo ${suffix//\.} |
1935 |
-} |
1936 |
-netpbm_ldshlib() { |
1937 |
- # ultra dirty Darwin hack, but hey... in the end this is all it needs... |
1938 |
- case ${CHOST} in |
1939 |
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.$(MAJ).dylib';; |
1940 |
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; |
1941 |
- esac |
1942 |
-} |
1943 |
-netpbm_config() { |
1944 |
- if use $1 ; then |
1945 |
- [[ $2 != "!" ]] && echo -l${2:-$1} |
1946 |
- else |
1947 |
- echo NONE |
1948 |
- fi |
1949 |
-} |
1950 |
- |
1951 |
-src_prepare() { |
1952 |
- epatch "${FILESDIR}"/netpbm-10.76.00-build.patch |
1953 |
- epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530 |
1954 |
- epatch "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch |
1955 |
- epatch "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012 |
1956 |
- |
1957 |
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch |
1958 |
- epatch "${FILESDIR}"/${PN}-10.76.00-solaris.patch |
1959 |
- epatch "${FILESDIR}"/${PN}-10.60.01-strcaseeq-strcasecmp.patch |
1960 |
- |
1961 |
- # make sure we use system libs |
1962 |
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
1963 |
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die |
1964 |
- |
1965 |
- # take care of the importinc stuff ourselves by only doing it once |
1966 |
- # at the top level and having all subdirs use that one set #149843 |
1967 |
- sed -i \ |
1968 |
- -e '/^importinc:/s|^|importinc:\nmanual_|' \ |
1969 |
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ |
1970 |
- common.mk || die |
1971 |
- sed -i \ |
1972 |
- -e '/%.c/s: importinc$::' \ |
1973 |
- common.mk lib/Makefile lib/util/Makefile || die |
1974 |
- sed -i \ |
1975 |
- -e 's:pkg-config:$(PKG_CONFIG):' \ |
1976 |
- GNUmakefile converter/other/Makefile other/pamx/Makefile || die |
1977 |
- |
1978 |
- # The postscript knob is currently bound up with a fork test. |
1979 |
- if ! use postscript ; then |
1980 |
- sed -i \ |
1981 |
- -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ |
1982 |
- converter/other/Makefile generator/Makefile || die |
1983 |
- sed -i -r \ |
1984 |
- -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ |
1985 |
- test/all-in-place.{ok,test} || die |
1986 |
- sed -i -e '/^$/d' test/all-in-place.ok || die |
1987 |
- sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die |
1988 |
- fi |
1989 |
- |
1990 |
- # avoid ugly depend.mk warnings |
1991 |
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
1992 |
-} |
1993 |
- |
1994 |
-src_configure() { |
1995 |
- cat config.mk.in - >> config.mk <<-EOF |
1996 |
- # Misc crap |
1997 |
- BUILD_FIASCO = N |
1998 |
- SYMLINK = ln -sf |
1999 |
- |
2000 |
- # These vars let src_test work by default |
2001 |
- PKGDIR_DEFAULT = ${T}/netpbm |
2002 |
- RESULTDIR_DEFAULT = ${T}/netpbm-test |
2003 |
- |
2004 |
- # Toolchain options |
2005 |
- CC = $(tc-getCC) -Wall |
2006 |
- LD = \$(CC) |
2007 |
- CC_FOR_BUILD = $(tc-getBUILD_CC) |
2008 |
- LD_FOR_BUILD = \$(CC_FOR_BUILD) |
2009 |
- AR = $(tc-getAR) |
2010 |
- RANLIB = $(tc-getRANLIB) |
2011 |
- PKG_CONFIG = $(tc-getPKG_CONFIG) |
2012 |
- |
2013 |
- STRIPFLAG = |
2014 |
- CFLAGS_SHLIB = -fPIC |
2015 |
- |
2016 |
- LDRELOC = \$(LD) -r |
2017 |
- LDSHLIB = $(netpbm_ldshlib) |
2018 |
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to |
2019 |
- LINKERISCOMPILER = Y |
2020 |
- NETPBMLIBSUFFIX = $(netpbm_libsuffix) |
2021 |
- NETPBMLIBTYPE = $(netpbm_libtype) |
2022 |
- STATICLIB_TOO = $(usex static-libs Y N) |
2023 |
- |
2024 |
- # The var is called SSE, but the code is actually SSE2. |
2025 |
- WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) |
2026 |
- |
2027 |
- # Gentoo build options |
2028 |
- TIFFLIB = $(netpbm_config tiff) |
2029 |
- # Let tiff worry about its own dependencies #395753 |
2030 |
- TIFFLIB_NEEDS_JPEG = N |
2031 |
- TIFFLIB_NEEDS_Z = N |
2032 |
- JPEGLIB = $(netpbm_config jpeg) |
2033 |
- PNGLIB = $(netpbm_config png) |
2034 |
- ZLIB = $(netpbm_config zlib z) |
2035 |
- LINUXSVGALIB = $(netpbm_config svga vga) |
2036 |
- XML2_LIBS = $(netpbm_config xml xml2) |
2037 |
- JBIGLIB = $(netpbm_config jbig) |
2038 |
- JBIGHDR_DIR = |
2039 |
- JASPERLIB = $(netpbm_config jpeg2k jasper) |
2040 |
- JASPERHDR_DIR = |
2041 |
- URTLIB = $(netpbm_config rle) |
2042 |
- URTHDR_DIR = |
2043 |
- X11LIB = $(netpbm_config X X11) |
2044 |
- X11HDR_DIR = |
2045 |
- EOF |
2046 |
- # cannot chain the die with the heredoc above as bash-3 |
2047 |
- # has a parser bug in that setup #282902 |
2048 |
- [ $? -eq 0 ] || die "writing config.mk failed" |
2049 |
-} |
2050 |
- |
2051 |
-src_compile() { |
2052 |
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname |
2053 |
- # we need -lnsl, for connect -lsocket |
2054 |
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket" |
2055 |
- |
2056 |
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc #149843 |
2057 |
- emake LIBS="${extlibs}" |
2058 |
-} |
2059 |
- |
2060 |
-src_test() { |
2061 |
- # The code wants to install everything first and then test the result. |
2062 |
- emake install.{bin,lib,data} |
2063 |
- emake check |
2064 |
-} |
2065 |
- |
2066 |
-src_install() { |
2067 |
- mkdir -p "${ED}" |
2068 |
- # Subdir make targets like to use `mkdir` all over the place |
2069 |
- # without any actual dependencies, thus the -j1. |
2070 |
- emake -j1 package pkgdir="${ED}"/usr |
2071 |
- |
2072 |
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) |
2073 |
- |
2074 |
- # Remove cruft that we don't need, and move around stuff we want |
2075 |
- rm "${ED}"/usr/bin/{doc.url,manweb} || die |
2076 |
- rm -r "${ED}"/usr/man/web || die |
2077 |
- rm -r "${ED}"/usr/link || die |
2078 |
- rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die |
2079 |
- dodir /usr/share |
2080 |
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die |
2081 |
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die |
2082 |
- |
2083 |
- doman userguide/*.[0-9] |
2084 |
- use doc && dohtml -r userguide |
2085 |
- dodoc README |
2086 |
- cd doc |
2087 |
- dodoc HISTORY Netpbm.programming USERDOC |
2088 |
- dohtml -r . |
2089 |
-} |