1 |
commit: 4b6c5c6f306863f02520796383d85f013a22655a |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Oct 9 18:51:22 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 31 20:31:34 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b6c5c6f |
7 |
|
8 |
dev-games/openscenegraph: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5900 |
11 |
|
12 |
.../files/openscenegraph-3.2.1-cmake.patch | 276 --------------------- |
13 |
.../files/openscenegraph-3.2.1-gdal-2.0.patch | 49 ---- |
14 |
.../files/openscenegraph-3.2.1-giflib5.patch | 24 -- |
15 |
3 files changed, 349 deletions(-) |
16 |
|
17 |
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch |
18 |
deleted file mode 100644 |
19 |
index 1a85ee8d47b..00000000000 |
20 |
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch |
21 |
+++ /dev/null |
22 |
@@ -1,276 +0,0 @@ |
23 |
-diff -ruN OpenSceneGraph-3.2.1/CMakeLists.txt new/CMakeLists.txt |
24 |
---- OpenSceneGraph-3.2.1/CMakeLists.txt 2014-07-04 13:29:02.000000000 +0200 |
25 |
-+++ new/CMakeLists.txt 2014-08-20 00:45:08.857600038 +0200 |
26 |
-@@ -486,6 +486,7 @@ |
27 |
- |
28 |
- # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") |
29 |
- |
30 |
-+INCLUDE(MacroOptionalFindPackage) |
31 |
- |
32 |
- ################################################################################ |
33 |
- # Set Version Info resource file |
34 |
-@@ -515,37 +516,37 @@ |
35 |
- ANDROID_3RD_PARTY() |
36 |
- ELSE() |
37 |
- # Common to all platforms except android: |
38 |
-- FIND_PACKAGE(Freetype) |
39 |
-- FIND_PACKAGE(Inventor) |
40 |
-- FIND_PACKAGE(Jasper) |
41 |
-- FIND_PACKAGE(OpenEXR) |
42 |
-- FIND_PACKAGE(COLLADA) |
43 |
-- FIND_PACKAGE(FBX) |
44 |
-- FIND_PACKAGE(ZLIB) |
45 |
-- FIND_PACKAGE(Xine) |
46 |
-- FIND_PACKAGE(OpenVRML) |
47 |
-- FIND_PACKAGE(Performer) |
48 |
-- FIND_PACKAGE(GDAL) |
49 |
-- FIND_PACKAGE(GTA) |
50 |
-- FIND_PACKAGE(CURL) |
51 |
-- FIND_PACKAGE(LibVNCServer) |
52 |
-- FIND_PACKAGE(OurDCMTK) |
53 |
-- FIND_PACKAGE(FFmpeg) |
54 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Freetype) |
55 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Inventor) |
56 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Jasper) |
57 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) |
58 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) |
59 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FBX) |
60 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) |
61 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Xine) |
62 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML) |
63 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Performer) |
64 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GDAL) |
65 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GTA) |
66 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(CURL) |
67 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer) |
68 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK) |
69 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg) |
70 |
- FIND_PACKAGE(DirectShow) |
71 |
-- FIND_PACKAGE(SDL) |
72 |
-- FIND_PACKAGE(Poppler-glib) |
73 |
-- FIND_PACKAGE(RSVG) |
74 |
-- FIND_PACKAGE(GtkGl) |
75 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(SDL) |
76 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib) |
77 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(RSVG) |
78 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) |
79 |
- FIND_PACKAGE(DirectInput) |
80 |
-- FIND_PACKAGE(NVTT) |
81 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(NVTT) |
82 |
- IF (NOT WIN32) |
83 |
-- FIND_PACKAGE(Asio) |
84 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Asio) |
85 |
- ENDIF() |
86 |
- FIND_PACKAGE(ZeroConf) |
87 |
- ENDIF() |
88 |
- |
89 |
- IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) |
90 |
-- FIND_PACKAGE(ITK) |
91 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(ITK) |
92 |
- ENDIF() |
93 |
- |
94 |
- # Include macro utilities here |
95 |
-@@ -604,12 +605,12 @@ |
96 |
- IF (BUILD_OSG_EXAMPLES AND NOT ANDROID) |
97 |
- |
98 |
- |
99 |
-- FIND_PACKAGE(FLTK) |
100 |
-- FIND_PACKAGE(GLUT) |
101 |
-- FIND_PACKAGE(FOX) |
102 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FLTK) |
103 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GLUT) |
104 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FOX) |
105 |
- |
106 |
- SET(wxWidgets_USE_LIBS base core gl net) |
107 |
-- FIND_PACKAGE(wxWidgets) |
108 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets) |
109 |
- |
110 |
- ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) |
111 |
- |
112 |
-@@ -630,10 +631,10 @@ |
113 |
- # can use Quicktime. |
114 |
- IF(NOT ANDROID) |
115 |
- IF(NOT APPLE) |
116 |
-- FIND_PACKAGE(GIFLIB) |
117 |
-- FIND_PACKAGE(JPEG) |
118 |
-- FIND_PACKAGE(PNG) |
119 |
-- FIND_PACKAGE(TIFF) |
120 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB) |
121 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG) |
122 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(PNG) |
123 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF) |
124 |
- # QuickTime is required for OS X, but optional for Windows. |
125 |
- IF(WIN32) |
126 |
- FIND_PACKAGE(QuickTime) |
127 |
-@@ -689,15 +690,7 @@ |
128 |
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") |
129 |
- ENDIF() |
130 |
- |
131 |
--IF(UNIX AND NOT WIN32 AND NOT APPLE) |
132 |
-- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") |
133 |
-- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") |
134 |
-- MARK_AS_ADVANCED(LIB_POSTFIX) |
135 |
-- ENDIF() |
136 |
--ENDIF() |
137 |
--IF(NOT DEFINED LIB_POSTFIX) |
138 |
-- SET(LIB_POSTFIX "") |
139 |
--ENDIF() |
140 |
-+SET(LIB_POSTFIX ${LIB_SUFFIX}) |
141 |
- |
142 |
- # Here we apparantly do some funky stuff with making the bin/ and lib/ |
143 |
- # folders which is probably needed to work around a very old CMake bug? |
144 |
-@@ -1001,7 +994,7 @@ |
145 |
- ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY |
146 |
- ) |
147 |
- #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) |
148 |
-- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc) |
149 |
-+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc) |
150 |
- |
151 |
- # now set up openthreads documentation generation |
152 |
- IF(BUILD_REF_DOCS_TAGFILE) |
153 |
-@@ -1017,7 +1010,7 @@ |
154 |
- ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY |
155 |
- ) |
156 |
- #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) |
157 |
-- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc) |
158 |
-+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc) |
159 |
- |
160 |
- # Process our other doxyfiles but don't create targets for these |
161 |
- CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile |
162 |
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS |
163 |
---- OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 |
164 |
-+++ new/CMakeModules/COPYING-CMAKE-SCRIPTS 2014-08-20 00:27:15.371715620 +0200 |
165 |
-@@ -0,0 +1,22 @@ |
166 |
-+Redistribution and use in source and binary forms, with or without |
167 |
-+modification, are permitted provided that the following conditions |
168 |
-+are met: |
169 |
-+ |
170 |
-+1. Redistributions of source code must retain the copyright |
171 |
-+ notice, this list of conditions and the following disclaimer. |
172 |
-+2. Redistributions in binary form must reproduce the copyright |
173 |
-+ notice, this list of conditions and the following disclaimer in the |
174 |
-+ documentation and/or other materials provided with the distribution. |
175 |
-+3. The name of the author may not be used to endorse or promote products |
176 |
-+ derived from this software without specific prior written permission. |
177 |
-+ |
178 |
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
179 |
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
180 |
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
181 |
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
182 |
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
183 |
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
184 |
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
185 |
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
186 |
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
187 |
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
188 |
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake |
189 |
---- OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake 2010-11-11 17:51:46.000000000 +0100 |
190 |
-+++ new/CMakeModules/FindFLTK.cmake 2014-08-20 00:29:31.229439251 +0200 |
191 |
-@@ -1,52 +0,0 @@ |
192 |
--# Locate FLTK |
193 |
--# This module defines |
194 |
--# FLTK_LIBRARY |
195 |
--# FLTK_FOUND, if false, do not try to link to gdal |
196 |
--# FLTK_INCLUDE_DIR, where to find the headers |
197 |
--# |
198 |
--# $FLTK_DIR is an environment variable that would |
199 |
--# correspond to the ./configure --prefix=$FLTK_DIR |
200 |
--# |
201 |
--# Created by Robert Osfield. |
202 |
-- |
203 |
--FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h |
204 |
-- $ENV{FLTK_DIR}/include |
205 |
-- $ENV{FLTK_DIR} |
206 |
-- ~/Library/Frameworks |
207 |
-- /Library/Frameworks |
208 |
-- /usr/local/include |
209 |
-- /usr/include |
210 |
-- /sw/include # Fink |
211 |
-- /opt/local/include # DarwinPorts |
212 |
-- /opt/csw/include # Blastwave |
213 |
-- /opt/include |
214 |
-- /usr/freeware/include |
215 |
--) |
216 |
-- |
217 |
--MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME) |
218 |
-- |
219 |
-- FIND_LIBRARY(${MYLIBRARY} |
220 |
-- NAMES ${MYLIBRARYNAME} |
221 |
-- PATHS |
222 |
-- $ENV{FLTK_DIR}/lib |
223 |
-- $ENV{FLTK_DIR} |
224 |
-- ~/Library/Frameworks |
225 |
-- /Library/Frameworks |
226 |
-- /usr/local/lib |
227 |
-- /usr/lib |
228 |
-- /sw/lib |
229 |
-- /opt/local/lib |
230 |
-- /opt/csw/lib |
231 |
-- /opt/lib |
232 |
-- /usr/freeware/lib64 |
233 |
-- ) |
234 |
-- |
235 |
--ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME) |
236 |
-- |
237 |
--FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk) |
238 |
--FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl) |
239 |
-- |
240 |
--SET(FLTK_FOUND "NO") |
241 |
--IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR) |
242 |
-- SET(FLTK_FOUND "YES") |
243 |
--ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR) |
244 |
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake |
245 |
---- OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100 |
246 |
-+++ new/CMakeModules/MacroOptionalFindPackage.cmake 2014-08-20 00:32:02.142858484 +0200 |
247 |
-@@ -0,0 +1,28 @@ |
248 |
-+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() |
249 |
-+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] ) |
250 |
-+# This macro is a combination of OPTION() and FIND_PACKAGE(), it |
251 |
-+# works like FIND_PACKAGE(), but additionally it automatically creates |
252 |
-+# an option name WITH_<name>, which can be disabled via the cmake GUI. |
253 |
-+# or via -DWITH_<name>=OFF |
254 |
-+# The standard <name>_FOUND variables can be used in the same way |
255 |
-+# as when using the normal FIND_PACKAGE() |
256 |
-+ |
257 |
-+# Copyright (c) 2006, Alexander Neundorf, <neundorf@×××.org> |
258 |
-+# |
259 |
-+# Redistribution and use is allowed according to the terms of the BSD license. |
260 |
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
261 |
-+ |
262 |
-+ |
263 |
-+macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) |
264 |
-+ option(WITH_${_name} "Search for ${_name} package" ON) |
265 |
-+ if (WITH_${_name}) |
266 |
-+ find_package(${_name} ${ARGN}) |
267 |
-+ else (WITH_${_name}) |
268 |
-+ set(${_name}_FOUND) |
269 |
-+ set(${_name}_INCLUDE_DIR) |
270 |
-+ set(${_name}_INCLUDES) |
271 |
-+ set(${_name}_LIBRARY) |
272 |
-+ set(${_name}_LIBRARIES) |
273 |
-+ endif (WITH_${_name}) |
274 |
-+endmacro (MACRO_OPTIONAL_FIND_PACKAGE) |
275 |
-+ |
276 |
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake |
277 |
---- OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake 2014-04-13 18:03:17.000000000 +0200 |
278 |
-+++ new/CMakeModules/OsgMacroUtils.cmake 2014-08-20 07:31:10.261828759 +0200 |
279 |
-@@ -453,7 +453,7 @@ |
280 |
- IF(APPLE) |
281 |
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) |
282 |
- ELSE(APPLE) |
283 |
-- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) |
284 |
-+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples ) |
285 |
- ENDIF(APPLE) |
286 |
- |
287 |
- ENDMACRO(SETUP_EXAMPLE) |
288 |
-diff -ruN OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt |
289 |
---- OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt 2007-06-25 10:35:06.000000000 +0200 |
290 |
-+++ new/examples/osgviewerFLTK/CMakeLists.txt 2014-08-20 00:40:48.620538012 +0200 |
291 |
-@@ -1,6 +1,6 @@ |
292 |
- SET(TARGET_SRC osgviewerFLTK.cpp ) |
293 |
- |
294 |
--SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY}) |
295 |
-+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY}) |
296 |
- |
297 |
- INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ) |
298 |
- |
299 |
|
300 |
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch |
301 |
deleted file mode 100644 |
302 |
index 639cbc95825..00000000000 |
303 |
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch |
304 |
+++ /dev/null |
305 |
@@ -1,49 +0,0 @@ |
306 |
---- OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp |
307 |
-+++ OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp |
308 |
-@@ -134,11 +134,21 @@ |
309 |
- |
310 |
- virtual ReadResult readFile(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const |
311 |
- { |
312 |
-+#if GDAL_VERSION_MAJOR < 2 |
313 |
- if (OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount() == 0) |
314 |
- OGRRegisterAll(); |
315 |
-+#else |
316 |
-+ if (GDALGetDriverCount() == 0) |
317 |
-+ GDALAllRegister(); |
318 |
-+#endif |
319 |
- |
320 |
- // Try to open data source |
321 |
-+#if GDAL_VERSION_MAJOR < 2 |
322 |
- OGRDataSource* file = OGRSFDriverRegistrar::Open(fileName.c_str()); |
323 |
-+#else |
324 |
-+ GDALDataset *file; |
325 |
-+ file = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR, NULL, NULL, NULL ); |
326 |
-+#endif |
327 |
- if (!file) |
328 |
- return 0; |
329 |
- |
330 |
-@@ -156,6 +166,7 @@ |
331 |
- |
332 |
- osg::Group* group = new osg::Group; |
333 |
- |
334 |
-+#if GDAL_VERSION_MAJOR < 2 |
335 |
- for (int i = 0; i < file->GetLayerCount(); i++) |
336 |
- { |
337 |
- osg::Group* node = readLayer(file->GetLayer(i), file->GetName(), useRandomColorByFeature, addGroupPerFeature); |
338 |
-@@ -163,6 +174,16 @@ |
339 |
- group->addChild( node ); |
340 |
- } |
341 |
- OGRDataSource::DestroyDataSource( file ); |
342 |
-+#else |
343 |
-+ for (int i = 0; i < file->GetLayerCount(); i++) |
344 |
-+ { |
345 |
-+ OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i); |
346 |
-+ osg::Group* node = readLayer(layer, layer->GetName(), useRandomColorByFeature, addGroupPerFeature); |
347 |
-+ if (node) |
348 |
-+ group->addChild( node ); |
349 |
-+ } |
350 |
-+ GDALClose( file ); |
351 |
-+#endif |
352 |
- return group; |
353 |
- } |
354 |
- |
355 |
|
356 |
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch |
357 |
deleted file mode 100644 |
358 |
index bd604c3c19c..00000000000 |
359 |
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch |
360 |
+++ /dev/null |
361 |
@@ -1,24 +0,0 @@ |
362 |
-From: Alberto Luaces <aluaces@×××.es> |
363 |
-Date: Sat, 19 Dec 2015 04:52:52 +0100 |
364 |
-Subject: Compatibility with giflib5. |
365 |
- |
366 |
---- |
367 |
- OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp | 4 ++++ |
368 |
- 1 file changed, 4 insertions(+) |
369 |
- |
370 |
-Index: git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp |
371 |
-=================================================================== |
372 |
---- git2.orig/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp |
373 |
-+++ git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp |
374 |
-@@ -561,7 +561,11 @@ GifImageStream** obj) |
375 |
- *width_ret = giffile->SWidth; |
376 |
- *height_ret = giffile->SHeight; |
377 |
- *numComponents_ret = 4; |
378 |
-+#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)) |
379 |
-+ DGifCloseFile(giffile, &Error); |
380 |
-+#else |
381 |
- DGifCloseFile(giffile); |
382 |
-+#endif |
383 |
- return buffer; |
384 |
- } |
385 |
- |