1 |
commit: cbf3b048f150e28d08d1ba12cbaf22f6135cd552 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 16 13:54:01 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 16 13:54:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf3b048 |
7 |
|
8 |
media-libs/simage-1.7.1: bump |
9 |
|
10 |
1) removed not needed stuff from simage-1.7.1-cmake-automagic-deps.patch |
11 |
2) disabling check that uses GifQuantizeBuffer (see #687088, #682198) |
12 |
3) added simage-1.7.1-fix-examples-linking.patch for fixing linking issues |
13 |
4) reintroduced ~sparc |
14 |
5) removed buggy simage-1.7.1a_beta_pre20180312.ebuild (see 2)) |
15 |
|
16 |
Bug: https://bugs.gentoo.org/682198 |
17 |
Closes: https://bugs.gentoo.org/687088 |
18 |
Closes: https://bugs.gentoo.org/698882 |
19 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
20 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
21 |
|
22 |
media-libs/simage/Manifest | 2 +- |
23 |
.../files/simage-1.7.1-cmake-automagic-deps.patch | 498 ++------------------- |
24 |
.../simage-1.7.1-disable-gif-quantize-buffer.patch | 31 ++ |
25 |
.../files/simage-1.7.1-fix-examples-linking.patch | 22 + |
26 |
...beta_pre20180312.ebuild => simage-1.7.1.ebuild} | 19 +- |
27 |
5 files changed, 108 insertions(+), 464 deletions(-) |
28 |
|
29 |
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest |
30 |
index 59b5c71b67f..58cf77d47d7 100644 |
31 |
--- a/media-libs/simage/Manifest |
32 |
+++ b/media-libs/simage/Manifest |
33 |
@@ -1,2 +1,2 @@ |
34 |
-DIST Coin3D-simage-3bd369da8f08.tar.bz2 630229 BLAKE2B 6231dde891c07d8a4a37eebd5f89d9e445c048bf48d1718a5f1e2b12f488ad6c806edd04fd4eb30b5e041f978fbb65ea0b1d3b1263d7006bbda4568f4bef87c6 SHA512 61793a728c66dc4f427b1f853e0dcf38a71dced68814c8438e6653a4a1486d8066ce50a7c088d476cf796b4872c724687b3ca9d51ec0ed74f54d5d7e47c89b34 |
35 |
DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f |
36 |
+DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867 |
37 |
|
38 |
diff --git a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch |
39 |
index c119c938eeb..5f3fd2db714 100644 |
40 |
--- a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch |
41 |
+++ b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch |
42 |
@@ -1,497 +1,85 @@ |
43 |
-diff -ruN Coin3D-simage-3bd369da8f08/CMakeLists.txt my/CMakeLists.txt |
44 |
---- Coin3D-simage-3bd369da8f08/CMakeLists.txt 2018-03-12 19:57:28.000000000 +0100 |
45 |
-+++ my/CMakeLists.txt 2018-05-06 08:53:45.202467390 +0200 |
46 |
-@@ -74,6 +74,36 @@ |
47 |
- set(SIMAGE_GDIPLUS_SUPPORT OFF) |
48 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
49 |
+index 5536922..8225dc4 100644 |
50 |
+--- a/CMakeLists.txt |
51 |
++++ b/CMakeLists.txt |
52 |
+@@ -218,14 +218,14 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD |
53 |
+ find_package(TIFF) |
54 |
+ |
55 |
+ set(HAVE_ZLIB ${ZLIB_FOUND}) |
56 |
+- set(HAVE_GIFLIB ${GIF_FOUND}) |
57 |
+- set(HAVE_JPEGLIB ${JPEG_FOUND}) |
58 |
+- set(HAVE_PNGLIB ${PNG_FOUND}) |
59 |
+- set(HAVE_TIFFLIB ${TIFF_FOUND}) |
60 |
++ set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT}) |
61 |
++ set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT}) |
62 |
++ set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT}) |
63 |
++ set(HAVE_TIFFLIB ${SIMAGE_TIFF_SUPPORT}) |
64 |
endif() |
65 |
|
66 |
-+if(GIF_FOUND) |
67 |
-+ option(SIMAGE_GIF_SUPPORT "Enable support for GIF images" ON) |
68 |
-+else() |
69 |
-+ set(SIMAGE_GIF_SUPPORT OFF) |
70 |
-+endif() |
71 |
-+ |
72 |
-+if(JASPER_FOUND) |
73 |
-+ option(SIMAGE_JASPER_SUPPORT "Enable support for JPEG2K images" ON) |
74 |
-+else() |
75 |
-+ set(SIMAGE_JASPER_SUPPORT OFF) |
76 |
-+endif() |
77 |
-+ |
78 |
-+if(JPEG_FOUND) |
79 |
-+ option(SIMAGE_JPEG_SUPPORT "Enable support for JPEG images" ON) |
80 |
-+else() |
81 |
-+ set(SIMAGE_JPEG_SUPPORT OFF) |
82 |
-+endif() |
83 |
-+ |
84 |
-+if(PNG_FOUND) |
85 |
-+ option(SIMAGE_PNG_SUPPORT "Enable support for PNG images" ON) |
86 |
-+else() |
87 |
-+ set(SIMAGE_PNG_SUPPORT OFF) |
88 |
-+endif() |
89 |
-+ |
90 |
-+if(TIFF_FOUND) |
91 |
-+ option(SIMAGE_TIFF_SUPPORT "Enable support for TIFF images" ON) |
92 |
-+else() |
93 |
-+ set(SIMAGE_TIFF_SUPPORT OFF) |
94 |
-+endif() |
95 |
-+ |
96 |
- if(SNDFILE_FOUND) |
97 |
- option(SIMAGE_LIBSNDFILE_SUPPORT "" ON) |
98 |
- else() |
99 |
-@@ -141,23 +171,23 @@ |
100 |
- return 0; |
101 |
- } |
102 |
- " HAVE_GDIPLUS_LOCKBITS_RECTARG_POINTER) |
103 |
--set(HAVE_GIFLIB ${GIF_FOUND}) |
104 |
-+set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT}) |
105 |
- check_include_files(guile/gh.h HAVE_GUILE_GH_H) |
106 |
- check_include_files(inttypes.h HAVE_INTTYPES_H) |
107 |
-set(HAVE_JASPER ${JASPER_FOUND}) |
108 |
--set(HAVE_JPEGLIB ${JPG_FOUND}) |
109 |
-+set(HAVE_JASPER ${SIMAGE_JASPER_SUPPORT}) |
110 |
-+set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT}) |
111 |
- check_include_files(libguile.h HAVE_LIBGUILE_H) |
112 |
- check_include_files(memory.h HAVE_MEMORY_H) |
113 |
--set(HAVE_PNGLIB ${PNG_FOUND}) |
114 |
-+set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT}) |
115 |
- check_include_files(stdint.h HAVE_STDINT_H) |
116 |
- check_include_files(stdlib.h HAVE_STDLIB_H) |
117 |
- check_include_files(strings.h HAVE_STRINGS_H) |
118 |
- check_include_files(string.h HAVE_STRING_H) |
119 |
- check_include_files(sys/stat.h HAVE_SYS_STAT_H) |
120 |
- check_include_files(sys/types.h HAVE_SYS_TYPES_H) |
121 |
--set(HAVE_TIFFLIB ${TIFF_FOUND}) |
122 |
-+set(HAVE_TIFFLIB ${SIMAGE_TIFF_SUPPORT}) |
123 |
- check_include_files(unistd.h HAVE_UNISTD_H) |
124 |
-set(HAVE_VFW ${VFW_FOUND}) |
125 |
++set(HAVE_JASPER ${SIMAGE_JASPER_SUPPORT}) |
126 |
+set(HAVE_VFW ${SIMAGE_AVIENC_SUPPORT}) |
127 |
- check_include_files(windows.h HAVE_WINDOWS_H) |
128 |
- set(PACKAGE "simage") |
129 |
- set(PACKAGE_BUGREPORT "coin-support@××××××.org") |
130 |
-@@ -321,27 +351,27 @@ |
131 |
- target_link_libraries(simage ${GDIPLUS_LIBRARIES}) |
132 |
+ |
133 |
+ check_include_files(guile/gh.h HAVE_GUILE_GH_H) |
134 |
+ check_include_files(inttypes.h HAVE_INTTYPES_H) |
135 |
+@@ -430,27 +430,27 @@ if(SIMAGE_GDIPLUS_SUPPORT) |
136 |
+ target_link_libraries(simage PRIVATE ${GDIPLUS_LIBRARIES}) |
137 |
endif() |
138 |
|
139 |
-if(GIF_FOUND) |
140 |
+if(SIMAGE_GIF_SUPPORT) |
141 |
- target_include_directories(simage PUBLIC ${GIF_INCLUDE_DIR}) |
142 |
- target_link_libraries(simage ${GIF_LIBRARIES}) |
143 |
+ target_include_directories(simage PRIVATE ${GIF_INCLUDE_DIR}) |
144 |
+ target_link_libraries(simage PRIVATE ${GIF_LIBRARIES}) |
145 |
endif() |
146 |
|
147 |
-if(JASPER_FOUND) |
148 |
+if(SIMAGE_JASPER_SUPPORT) |
149 |
- target_include_directories(simage PUBLIC ${JASPER_INCLUDE_DIR}) |
150 |
- target_link_libraries(simage ${JASPER_LIBRARIES}) |
151 |
+ target_include_directories(simage PRIVATE ${JASPER_INCLUDE_DIR}) |
152 |
+ target_link_libraries(simage PRIVATE ${JASPER_LIBRARIES}) |
153 |
endif() |
154 |
|
155 |
-if(JPEG_FOUND) |
156 |
+if(SIMAGE_JPEG_SUPPORT) |
157 |
- target_include_directories(simage PUBLIC ${JPEG_INCLUDE_DIR}) |
158 |
- target_link_libraries(simage ${JPEG_LIBRARIES}) |
159 |
+ target_include_directories(simage PRIVATE ${JPEG_INCLUDE_DIR}) |
160 |
+ target_link_libraries(simage PRIVATE ${JPEG_LIBRARIES}) |
161 |
endif() |
162 |
|
163 |
-if(OGGVORBIS_FOUND) |
164 |
+if(SIMAGE_OGGVORBIS_SUPPORT) |
165 |
- target_include_directories(simage PUBLIC ${OGGVORBIS_INCLUDE_DIRS}) |
166 |
- target_link_libraries(simage ${OGGVORBIS_LIBRARIES}) |
167 |
+ target_include_directories(simage PRIVATE ${OGGVORBIS_INCLUDE_DIRS}) |
168 |
+ target_link_libraries(simage PRIVATE ${OGGVORBIS_LIBRARIES}) |
169 |
endif() |
170 |
|
171 |
-if(PNG_FOUND) |
172 |
+if(SIMAGE_PNG_SUPPORT) |
173 |
- target_include_directories(simage PUBLIC ${PNG_INCLUDE_DIR}) |
174 |
- target_link_libraries(simage ${PNG_LIBRARIES}) |
175 |
+ target_include_directories(simage PRIVATE ${PNG_INCLUDE_DIR}) |
176 |
+ target_link_libraries(simage PRIVATE ${PNG_LIBRARIES}) |
177 |
endif() |
178 |
-@@ -350,22 +380,22 @@ |
179 |
- target_link_libraries(simage ${QT_LIBRARIES}) |
180 |
+@@ -459,22 +459,22 @@ if(SIMAGE_QIMAGE_SUPPORT) |
181 |
+ target_link_libraries(simage PRIVATE ${QT_LIBRARIES}) |
182 |
endif() |
183 |
|
184 |
-if(QUICKTIME_FOUND) |
185 |
+if(SIMAGE_QUICKTIME_SUPPORT) |
186 |
- target_include_directories(simage PUBLIC ${QUICKTIME_INCLUDE_DIR}) |
187 |
- target_link_libraries(simage ${QUICKTIME_LIBRARIES}) |
188 |
+ target_include_directories(simage PRIVATE ${QUICKTIME_INCLUDE_DIR}) |
189 |
+ target_link_libraries(simage PRIVATE ${QUICKTIME_LIBRARIES}) |
190 |
endif() |
191 |
|
192 |
-if(SNDFILE_FOUND) |
193 |
-+if(SIMAGE_LIBSNDFILE_SUPPORT) |
194 |
- target_include_directories(simage PUBLIC ${SNDFILE_INCLUDE_DIRS}) |
195 |
- target_link_libraries(simage ${SNDFILE_LIBRARIES}) |
196 |
++if(SIMAGE_SNDFILE_SUPPORT) |
197 |
+ target_include_directories(simage PRIVATE ${SNDFILE_INCLUDE_DIRS}) |
198 |
+ target_link_libraries(simage PRIVATE ${SNDFILE_LIBRARIES}) |
199 |
endif() |
200 |
|
201 |
-if(TIFF_FOUND) |
202 |
+if(SIMAGE_TIFF_SUPPORT) |
203 |
- target_include_directories(simage PUBLIC ${TIFF_INCLUDE_DIR}) |
204 |
- target_link_libraries(simage ${TIFF_LIBRARY}) |
205 |
+ target_include_directories(simage PRIVATE ${TIFF_INCLUDE_DIR}) |
206 |
+ target_link_libraries(simage PRIVATE ${TIFF_LIBRARY}) |
207 |
endif() |
208 |
|
209 |
-if(VFW_FOUND) |
210 |
-+if(SIMAGE_AVIENC_SUPPORT) |
211 |
- target_link_libraries(simage ${VFW_LIBRARIES}) |
212 |
++if(SIMAGE_VFW_SUPPORT) |
213 |
+ target_link_libraries(simage PRIVATE ${VFW_LIBRARIES}) |
214 |
endif() |
215 |
|
216 |
-diff -ruN Coin3D-simage-3bd369da8f08/config.h.cmake.in my/config.h.cmake.in |
217 |
---- Coin3D-simage-3bd369da8f08/config.h.cmake.in 2018-03-12 19:57:28.000000000 +0100 |
218 |
-+++ my/config.h.cmake.in 2018-05-06 09:29:09.795849171 +0200 |
219 |
-@@ -9,30 +9,18 @@ |
220 |
- /* Define if first argument of Gdiplus::Bitmap::LockBits() is a pointer */ |
221 |
- #cmakedefine HAVE_GDIPLUS_LOCKBITS_RECTARG_POINTER 1 |
222 |
- |
223 |
--/* define to support the giflib library */ |
224 |
--#cmakedefine HAVE_GIFLIB 1 |
225 |
-- |
226 |
- /* Define to 1 if you have the <guile/gh.h> header file. */ |
227 |
- #cmakedefine HAVE_GUILE_GH_H 1 |
228 |
- |
229 |
- /* Define to 1 if you have the <inttypes.h> header file. */ |
230 |
- #cmakedefine HAVE_INTTYPES_H 1 |
231 |
- |
232 |
--/* define to support the jasper library */ |
233 |
--#cmakedefine HAVE_JASPER 1 |
234 |
-- |
235 |
--/* define to support the jpeg library */ |
236 |
--#cmakedefine HAVE_JPEGLIB 1 |
237 |
-- |
238 |
- /* Define to 1 if you have the <libguile.h> header file. */ |
239 |
- #cmakedefine HAVE_LIBGUILE_H 1 |
240 |
- |
241 |
- /* Define to 1 if you have the <memory.h> header file. */ |
242 |
- #cmakedefine HAVE_MEMORY_H 1 |
243 |
- |
244 |
--/* define for libpng support */ |
245 |
--#cmakedefine HAVE_PNGLIB 1 |
246 |
-- |
247 |
- /* Define to 1 if you have the <stdint.h> header file. */ |
248 |
- #cmakedefine HAVE_STDINT_H 1 |
249 |
- |
250 |
-@@ -51,15 +39,9 @@ |
251 |
- /* Define to 1 if you have the <sys/types.h> header file. */ |
252 |
- #cmakedefine HAVE_SYS_TYPES_H 1 |
253 |
- |
254 |
--/* define to support the tiff library */ |
255 |
--#cmakedefine HAVE_TIFFLIB 1 |
256 |
-- |
257 |
- /* Define to 1 if you have the <unistd.h> header file. */ |
258 |
- #cmakedefine HAVE_UNISTD_H 1 |
259 |
- |
260 |
--/* Define to use the Video for Windows library */ |
261 |
--#cmakedefine HAVE_VFW 1 |
262 |
-- |
263 |
- /* Define to 1 if you have the <windows.h> header file. */ |
264 |
- #cmakedefine HAVE_WINDOWS_H 1 |
265 |
- |
266 |
-@@ -108,6 +90,21 @@ |
267 |
- /* define this to the simage minor version number */ |
268 |
- #define SIMAGE_MINOR_VERSION @SIMAGE_MINOR_VERSION@ |
269 |
- |
270 |
-+/* define to support the giflib library */ |
271 |
-+#cmakedefine SIMAGE_GIF_SUPPORT 1 |
272 |
-+ |
273 |
-+/* define to support the jasper library */ |
274 |
-+#cmakedefine SIMAGE_JASPER_SUPPORT 1 |
275 |
-+ |
276 |
-+/* define to support the jpeg library */ |
277 |
-+#cmakedefine SIMAGE_JPEG_SUPPORT 1 |
278 |
-+ |
279 |
-+/* define for libpng support */ |
280 |
-+#cmakedefine SIMAGE_PNG_SUPPORT 1 |
281 |
-+ |
282 |
-+/* define to support the tiff library */ |
283 |
-+#cmakedefine SIMAGE_TIFF_SUPPORT 1 |
284 |
-+ |
285 |
- /* define to enable mpeg2enc support */ |
286 |
- #cmakedefine SIMAGE_MPEG2ENC_SUPPORT 1 |
287 |
- |
288 |
-diff -ruN Coin3D-simage-3bd369da8f08/include/simage_gif.h my/include/simage_gif.h |
289 |
---- Coin3D-simage-3bd369da8f08/include/simage_gif.h 2018-03-12 19:57:28.000000000 +0100 |
290 |
-+++ my/include/simage_gif.h 2018-05-06 09:42:19.739539807 +0200 |
291 |
-@@ -21,9 +21,9 @@ |
292 |
- #include <config.h> |
293 |
- #endif /* HAVE_CONFIG_H */ |
294 |
- |
295 |
--#ifndef HAVE_GIFLIB |
296 |
-+#ifndef SIMAGE_GIF_SUPPORT |
297 |
- #error "This file should not be used under the current configuration!" |
298 |
--#endif /* !HAVE_GIFLIB */ |
299 |
-+#endif /* !SIMAGE_GIF_SUPPORT */ |
300 |
- |
301 |
- #ifdef __cplusplus |
302 |
- extern "C" { |
303 |
-diff -ruN Coin3D-simage-3bd369da8f08/include/simage_jasper.h my/include/simage_jasper.h |
304 |
---- Coin3D-simage-3bd369da8f08/include/simage_jasper.h 2018-03-12 19:57:28.000000000 +0100 |
305 |
-+++ my/include/simage_jasper.h 2018-05-06 09:42:31.084498335 +0200 |
306 |
-@@ -21,9 +21,9 @@ |
307 |
- #include <config.h> |
308 |
- #endif /* HAVE_CONFIG_H */ |
309 |
- |
310 |
--#ifndef HAVE_JASPER |
311 |
-+#ifndef SIMAGE_JASPER_SUPPORT |
312 |
- #error "This file should not be used under the current configuration!" |
313 |
--#endif /* !HAVE_JASPERLIB */ |
314 |
-+#endif /* !SIMAGE_JASPER_SUPPORT */ |
315 |
- |
316 |
- #ifdef __cplusplus |
317 |
- extern "C" { |
318 |
-diff -ruN Coin3D-simage-3bd369da8f08/include/simage_jpeg.h my/include/simage_jpeg.h |
319 |
---- Coin3D-simage-3bd369da8f08/include/simage_jpeg.h 2018-03-12 19:57:28.000000000 +0100 |
320 |
-+++ my/include/simage_jpeg.h 2018-05-06 09:42:50.762422085 +0200 |
321 |
-@@ -21,9 +21,9 @@ |
322 |
- #include <config.h> |
323 |
- #endif /* HAVE_CONFIG_H */ |
324 |
- |
325 |
--#ifndef HAVE_JPEGLIB |
326 |
-+#ifndef SIMAGE_JPEG_SUPPORT |
327 |
- #error "This file should not be used under the current configuration!" |
328 |
--#endif /* !HAVE_JPEGLIB */ |
329 |
-+#endif /* !SIMAGE_JPEG_SUPPORT */ |
330 |
- |
331 |
- #ifdef __cplusplus |
332 |
- extern "C" { |
333 |
-diff -ruN Coin3D-simage-3bd369da8f08/include/simage_png.h my/include/simage_png.h |
334 |
---- Coin3D-simage-3bd369da8f08/include/simage_png.h 2018-03-12 19:57:28.000000000 +0100 |
335 |
-+++ my/include/simage_png.h 2018-05-06 09:43:08.250349842 +0200 |
336 |
-@@ -21,9 +21,9 @@ |
337 |
- #include <config.h> |
338 |
- #endif /* HAVE_CONFIG_H */ |
339 |
- |
340 |
--#ifndef HAVE_PNGLIB |
341 |
-+#ifndef SIMAGE_PNG_SUPPORT |
342 |
- #error "This file should not be used under the current configuration!" |
343 |
--#endif /* !HAVE_PNGLIB */ |
344 |
-+#endif /* !SIMAGE_PNG_SUPPORT */ |
345 |
- |
346 |
- #ifdef __cplusplus |
347 |
- extern "C" { |
348 |
-diff -ruN Coin3D-simage-3bd369da8f08/include/simage_tiff.h my/include/simage_tiff.h |
349 |
---- Coin3D-simage-3bd369da8f08/include/simage_tiff.h 2018-03-12 19:57:28.000000000 +0100 |
350 |
-+++ my/include/simage_tiff.h 2018-05-06 09:43:32.091244844 +0200 |
351 |
-@@ -21,9 +21,9 @@ |
352 |
- #include <config.h> |
353 |
- #endif /* HAVE_CONFIG_H */ |
354 |
- |
355 |
--#ifndef HAVE_TIFFLIB |
356 |
-+#ifndef SIMAGE_TIFF_SUPPORT |
357 |
- #error "This file should not be used under the current configuration!" |
358 |
--#endif /* !HAVE_TIFFLIB */ |
359 |
-+#endif /* !SIMAGE_TIFF_SUPPORT */ |
360 |
- |
361 |
- #ifdef __cplusplus |
362 |
- extern "C" { |
363 |
-diff -ruN Coin3D-simage-3bd369da8f08/src/simage_gif.c my/src/simage_gif.c |
364 |
---- Coin3D-simage-3bd369da8f08/src/simage_gif.c 2018-03-12 19:57:28.000000000 +0100 |
365 |
-+++ my/src/simage_gif.c 2018-05-06 09:40:56.444783960 +0200 |
366 |
-@@ -23,7 +23,7 @@ |
367 |
- #include <config.h> |
368 |
- #endif /* HAVE_CONFIG_H */ |
369 |
- |
370 |
--#ifdef HAVE_GIFLIB |
371 |
-+#ifdef SIMAGE_GIF_SUPPORT |
372 |
- |
373 |
- #include <simage_gif.h> |
374 |
- #include <stdlib.h> |
375 |
-@@ -409,4 +409,4 @@ |
376 |
- return 1; |
377 |
- } |
378 |
- |
379 |
--#endif /* HAVE_GIFLIB */ |
380 |
-+#endif /* SIMAGE_GIF_SUPPORT */ |
381 |
-diff -ruN Coin3D-simage-3bd369da8f08/src/simage_jasper.c my/src/simage_jasper.c |
382 |
---- Coin3D-simage-3bd369da8f08/src/simage_jasper.c 2018-03-12 19:57:28.000000000 +0100 |
383 |
-+++ my/src/simage_jasper.c 2018-05-06 09:30:40.082652034 +0200 |
384 |
-@@ -23,7 +23,7 @@ |
385 |
- #include <config.h> |
386 |
- #endif /* HAVE_CONFIG_H */ |
387 |
- |
388 |
--#ifdef HAVE_JASPER |
389 |
-+#ifdef SIMAGE_JASPER_SUPPORT |
390 |
- |
391 |
- #include <simage_jasper.h> |
392 |
- |
393 |
-@@ -331,4 +331,4 @@ |
394 |
- return 0; |
395 |
- } |
396 |
- |
397 |
--#endif /* HAVE_JASPER */ |
398 |
-+#endif /* SIMAGE_JASPER_SUPPORT */ |
399 |
-diff -ruN Coin3D-simage-3bd369da8f08/src/simage_jpeg.c my/src/simage_jpeg.c |
400 |
---- Coin3D-simage-3bd369da8f08/src/simage_jpeg.c 2018-03-12 19:57:28.000000000 +0100 |
401 |
-+++ my/src/simage_jpeg.c 2018-05-06 09:31:06.325304369 +0200 |
402 |
-@@ -23,7 +23,7 @@ |
403 |
- #include <config.h> |
404 |
- #endif /* HAVE_CONFIG_H */ |
405 |
- |
406 |
--#ifdef HAVE_JPEGLIB |
407 |
-+#ifdef SIMAGE_JPEG_SUPPORT |
408 |
- |
409 |
- #include <stdio.h> |
410 |
- #include <setjmp.h> |
411 |
-@@ -74,7 +74,7 @@ |
412 |
- strncpy(buffer, "JPEG saver: Error opening file", buflen); |
413 |
- break; |
414 |
- case ERR_JPEGLIB_WRITE: |
415 |
-- strncpy(buffer, "JPEG saver: Internal libjpeg error", buflen); |
416 |
-+ strncpy(buffer, "JPEG saver: Internal libjpeg error", buflen); |
417 |
- break; |
418 |
- } |
419 |
- return jpegerror; |
420 |
-@@ -89,7 +89,7 @@ |
421 |
- |
422 |
- typedef struct my_error_mgr * my_error_ptr; |
423 |
- |
424 |
--static void |
425 |
-+static void |
426 |
- my_error_exit (j_common_ptr cinfo) |
427 |
- { |
428 |
- /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */ |
429 |
-@@ -105,7 +105,7 @@ |
430 |
- longjmp(myerr->setjmp_buffer, 1); |
431 |
- } |
432 |
- |
433 |
--int |
434 |
-+int |
435 |
- simage_jpeg_identify(const char * ptr, |
436 |
- const unsigned char *header, |
437 |
- int headerlen) |
438 |
-@@ -113,9 +113,9 @@ |
439 |
- static unsigned char jpgcmp[] = {'J', 'F', 'I', 'F' }; |
440 |
- static unsigned char jpgcmp2[] = {'E', 'x', 'i', 'f' }; |
441 |
- if (headerlen < 10) return 0; |
442 |
-- if (memcmp((const void*)&header[6], |
443 |
-+ if (memcmp((const void*)&header[6], |
444 |
- (const void*)jpgcmp, 4) == 0) return 1; |
445 |
-- if (memcmp((const void*)&header[6], |
446 |
-+ if (memcmp((const void*)&header[6], |
447 |
- (const void*)jpgcmp2, 4) == 0) return 1; |
448 |
- return 0; |
449 |
- } |
450 |
-@@ -215,7 +215,7 @@ |
451 |
- format = 3; |
452 |
- cinfo.out_color_space = JCS_RGB; |
453 |
- } |
454 |
-- |
455 |
-+ |
456 |
- (void) jpeg_start_decompress(&cinfo); |
457 |
- /* We can ignore the return value since suspension is not possible |
458 |
- * with the stdio data source. |
459 |
-@@ -234,20 +234,20 @@ |
460 |
- ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); |
461 |
- width = cinfo.output_width; |
462 |
- height = cinfo.output_height; |
463 |
-- buffer = currPtr = (unsigned char*) |
464 |
-+ buffer = currPtr = (unsigned char*) |
465 |
- malloc(width*height*cinfo.output_components); |
466 |
-- |
467 |
-+ |
468 |
- /* Step 6: while (scan lines remain to be read) */ |
469 |
- /* jpeg_read_scanlines(...); */ |
470 |
- |
471 |
- /* Here we use the library's state variable cinfo.output_scanline as the |
472 |
- * loop counter, so that we don't have to keep track ourselves. |
473 |
- */ |
474 |
-- |
475 |
-+ |
476 |
- /* flip image upside down */ |
477 |
- if (buffer) { |
478 |
-- currPtr = buffer + row_stride * (cinfo.output_height-1); |
479 |
-- |
480 |
-+ currPtr = buffer + row_stride * (cinfo.output_height-1); |
481 |
-+ |
482 |
- while (cinfo.output_scanline < cinfo.output_height) { |
483 |
- /* jpeg_read_scanlines expects an array of pointers to scanlines. |
484 |
- * Here the array is only one element long, but you could ask for |
485 |
-@@ -293,7 +293,7 @@ |
486 |
- return buffer; |
487 |
- } |
488 |
- |
489 |
--int |
490 |
-+int |
491 |
- simage_jpeg_save(const char * filename, |
492 |
- const unsigned char * bytes, |
493 |
- int width, |
494 |
-@@ -321,7 +321,7 @@ |
495 |
- int quality; |
496 |
- unsigned char * tmpbytes; |
497 |
- int bytesperrow; |
498 |
-- |
499 |
-+ |
500 |
- quality = 90; |
501 |
- tmpbytes = NULL; |
502 |
- |
503 |
-@@ -375,7 +375,7 @@ |
504 |
- /* |
505 |
- * alpha channel is not supported for jpeg. strip it. |
506 |
- */ |
507 |
-- |
508 |
-+ |
509 |
- if (numcomponents == 4) { |
510 |
- unsigned char * dst; |
511 |
- const unsigned char * src; |
512 |
-@@ -383,8 +383,8 @@ |
513 |
- dst = tmpbytes = (unsigned char *) malloc(n*3); |
514 |
- src = bytes; |
515 |
- for (i = 0; i < n; i++) { |
516 |
-- *dst++ = *src++; |
517 |
-- *dst++ = *src++; |
518 |
-+ *dst++ = *src++; |
519 |
-+ *dst++ = *src++; |
520 |
- *dst++ = *src++; |
521 |
- src++; |
522 |
- } |
523 |
-@@ -397,7 +397,7 @@ |
524 |
- dst = tmpbytes = (unsigned char *) malloc(n*3); |
525 |
- src = bytes; |
526 |
- for (i = 0; i < n; i++) { |
527 |
-- *dst++ = *src++; |
528 |
-+ *dst++ = *src++; |
529 |
- src++; |
530 |
- } |
531 |
- numcomponents = 1; |
532 |
-@@ -408,7 +408,7 @@ |
533 |
- /* First we supply a description of the input image. |
534 |
- * Four fields of the cinfo struct must be filled in: |
535 |
- */ |
536 |
-- |
537 |
-+ |
538 |
- cinfo.image_width = width; /* image width and height, in pixels */ |
539 |
- cinfo.image_height = height; |
540 |
- cinfo.input_components = numcomponents; /* # of color components per pixel */ |
541 |
-@@ -468,4 +468,4 @@ |
542 |
- return 1; |
543 |
- } |
544 |
- |
545 |
--#endif /* HAVE_JPEGLIB */ |
546 |
-+#endif /* SIMAGE_JPEG_SUPPORT */ |
547 |
-diff -ruN Coin3D-simage-3bd369da8f08/src/simage_png.c my/src/simage_png.c |
548 |
---- Coin3D-simage-3bd369da8f08/src/simage_png.c 2018-03-12 19:57:28.000000000 +0100 |
549 |
-+++ my/src/simage_png.c 2018-05-06 09:32:01.648571705 +0200 |
550 |
-@@ -22,7 +22,7 @@ |
551 |
- #include <config.h> |
552 |
- #endif /* HAVE_CONFIG_H */ |
553 |
- |
554 |
--#ifdef HAVE_PNGLIB |
555 |
-+#ifdef SIMAGE_PNG_SUPPORT |
556 |
- |
557 |
- #include <simage_png.h> |
558 |
- #include <stdio.h> |
559 |
-@@ -479,4 +479,4 @@ |
560 |
- return 1; |
561 |
- } |
562 |
- |
563 |
--#endif /* HAVE_PNGLIB */ |
564 |
-+#endif /* SIMAGE_PNG_SUPPORT */ |
565 |
-diff -ruN Coin3D-simage-3bd369da8f08/src/simage_tiff.c my/src/simage_tiff.c |
566 |
---- Coin3D-simage-3bd369da8f08/src/simage_tiff.c 2018-03-12 19:57:28.000000000 +0100 |
567 |
-+++ my/src/simage_tiff.c 2018-05-06 09:32:43.539017111 +0200 |
568 |
-@@ -23,7 +23,7 @@ |
569 |
- #include <config.h> |
570 |
- #endif /* HAVE_CONFIG_H */ |
571 |
- |
572 |
--#ifdef HAVE_TIFFLIB |
573 |
-+#ifdef SIMAGE_TIFF_SUPPORT |
574 |
- |
575 |
- #include <simage_tiff.h> |
576 |
- #include <stdio.h> |
577 |
-@@ -683,4 +683,4 @@ |
578 |
- #undef CVT |
579 |
- #undef pack |
580 |
- |
581 |
--#endif /* HAVE_TIFFLIB */ |
582 |
-+#endif /* SIMAGE_TIFF_SUPPORT */ |
583 |
|
584 |
diff --git a/media-libs/simage/files/simage-1.7.1-disable-gif-quantize-buffer.patch b/media-libs/simage/files/simage-1.7.1-disable-gif-quantize-buffer.patch |
585 |
new file mode 100644 |
586 |
index 00000000000..99535b22142 |
587 |
--- /dev/null |
588 |
+++ b/media-libs/simage/files/simage-1.7.1-disable-gif-quantize-buffer.patch |
589 |
@@ -0,0 +1,31 @@ |
590 |
+diff --git a/src/simage_gif.c b/src/simage_gif.c |
591 |
+index 0819ef8..f959127 100644 |
592 |
+--- a/src/simage_gif.c |
593 |
++++ b/src/simage_gif.c |
594 |
+@@ -37,7 +37,7 @@ |
595 |
+ #define DGifOpenFileName(gif) DGifOpenFileName(gif, NULL) |
596 |
+ #define EGifOpenFileName(gif, exist) EGifOpenFileName(gif, exist, NULL) |
597 |
+ //see https://sourceforge.net/p/giflib/mailman/message/29367749/ |
598 |
+-#define QuantizeBuffer GifQuantizeBuffer |
599 |
++//#define QuantizeBuffer GifQuantizeBuffer |
600 |
+ #define MakeMapObject GifMakeMapObject |
601 |
+ #define FreeMapObject GifFreeMapObject |
602 |
+ #endif |
603 |
+@@ -347,7 +347,7 @@ simage_gif_save(const char * filename, |
604 |
+ free(outbuf); |
605 |
+ return 0; |
606 |
+ } |
607 |
+- |
608 |
++/* |
609 |
+ if (QuantizeBuffer(width, height, &colormapsize, |
610 |
+ rgbbuf, &rgbbuf[bufsize], &rgbbuf[bufsize*2], |
611 |
+ outbuf, cmapobj->Colors) == GIF_ERROR) { |
612 |
+@@ -357,7 +357,7 @@ simage_gif_save(const char * filename, |
613 |
+ FreeMapObject(cmapobj); |
614 |
+ return 0; |
615 |
+ } |
616 |
+- |
617 |
++*/ |
618 |
+ /* open gif file and overwrite any existing file */ |
619 |
+ if (!(giffile = EGifOpenFileName(filename, FALSE))) { |
620 |
+ giferror = ERR_OPEN; |
621 |
|
622 |
diff --git a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch b/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch |
623 |
new file mode 100644 |
624 |
index 00000000000..756ddea5c73 |
625 |
--- /dev/null |
626 |
+++ b/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch |
627 |
@@ -0,0 +1,22 @@ |
628 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
629 |
+index 8225dc4..de89fd0 100644 |
630 |
+--- a/CMakeLists.txt |
631 |
++++ b/CMakeLists.txt |
632 |
+@@ -494,7 +494,7 @@ foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) |
633 |
+ get_filename_component(_example ${_source} NAME_WE) |
634 |
+ add_executable(${_example} ${_source}) |
635 |
+ target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) |
636 |
+- target_link_libraries(${_example} simage) |
637 |
++ target_link_libraries(${_example} simage sndfile) |
638 |
+ if(UNIX) |
639 |
+ target_link_libraries(${_example} m) |
640 |
+ endif() |
641 |
+@@ -507,7 +507,7 @@ endforeach() |
642 |
+ enable_testing() |
643 |
+ |
644 |
+ add_executable(loaders tests/loaders.c) |
645 |
+-target_link_libraries(loaders simage) |
646 |
++target_link_libraries(loaders simage sndfile) |
647 |
+ target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) |
648 |
+ if(UNIX) |
649 |
+ target_link_libraries(loaders m) |
650 |
|
651 |
diff --git a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild b/media-libs/simage/simage-1.7.1.ebuild |
652 |
similarity index 80% |
653 |
rename from media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild |
654 |
rename to media-libs/simage/simage-1.7.1.ebuild |
655 |
index 4ced5ba2961..e27f0252065 100644 |
656 |
--- a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild |
657 |
+++ b/media-libs/simage/simage-1.7.1.ebuild |
658 |
@@ -1,18 +1,16 @@ |
659 |
# Copyright 1999-2019 Gentoo Authors |
660 |
# Distributed under the terms of the GNU General Public License v2 |
661 |
|
662 |
-EAPI=6 |
663 |
+EAPI=7 |
664 |
|
665 |
inherit cmake-utils flag-o-matic |
666 |
|
667 |
-MY_P=Coin3D-simage-3bd369da8f08 |
668 |
- |
669 |
DESCRIPTION="Image and video texturing library" |
670 |
HOMEPAGE="https://bitbucket.org/Coin3D/simage" |
671 |
-SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2" |
672 |
+SRC_URI="https://bitbucket.org/Coin3D/simage/downloads/${P}-src.zip" |
673 |
|
674 |
LICENSE="public-domain mpeg2enc" |
675 |
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" |
676 |
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
677 |
SLOT="0" |
678 |
IUSE="debug gif jpeg png qt5 sndfile tiff vorbis" |
679 |
|
680 |
@@ -31,12 +29,17 @@ RDEPEND=" |
681 |
media-libs/libvorbis |
682 |
) |
683 |
" |
684 |
-DEPEND="${RDEPEND}" |
685 |
+DEPEND=" |
686 |
+ ${RDEPEND} |
687 |
+ app-arch/unzip |
688 |
+" |
689 |
|
690 |
-S="${WORKDIR}/${MY_P}" |
691 |
+S="${WORKDIR}/${PN}" |
692 |
|
693 |
PATCHES=( |
694 |
- "${FILESDIR}/${PN}-1.7.1-cmake-automagic-deps.patch" |
695 |
+ "${FILESDIR}/${P}-cmake-automagic-deps.patch" |
696 |
+ "${FILESDIR}/${P}-fix-examples-linking.patch" |
697 |
+ "${FILESDIR}/${P}-disable-gif-quantize-buffer.patch" |
698 |
) |
699 |
|
700 |
DOCS=(AUTHORS ChangeLog NEWS README) |