1 |
commit: 574d283a2aaaf0510b4f7f9447f24933d397b3a0 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 4 14:11:09 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 4 14:11:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574d283a |
7 |
|
8 |
dev-games/openscenegraph: Drop 3.5.5 |
9 |
|
10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-games/openscenegraph/Manifest | 1 - |
14 |
.../files/openscenegraph-3.5.1-jpeg-9.patch | 34 --- |
15 |
.../files/openscenegraph-3.5.5-cmake.patch | 281 --------------------- |
16 |
.../openscenegraph/openscenegraph-3.5.5.ebuild | 142 ----------- |
17 |
4 files changed, 458 deletions(-) |
18 |
|
19 |
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest |
20 |
index 9cb2176a3d3..845c83da61a 100644 |
21 |
--- a/dev-games/openscenegraph/Manifest |
22 |
+++ b/dev-games/openscenegraph/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 |
25 |
DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19 |
26 |
DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b |
27 |
|
28 |
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch |
29 |
deleted file mode 100644 |
30 |
index f6e85e8e352..00000000000 |
31 |
--- a/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch |
32 |
+++ /dev/null |
33 |
@@ -1,34 +0,0 @@ |
34 |
-From 34b4e7001522c1b47b4211dac34d2d6a6b994a6f Mon Sep 17 00:00:00 2001 |
35 |
-From: Robert Osfield <robert@××××××××××××××.com> |
36 |
-Date: Thu, 17 Aug 2017 10:52:59 +0100 |
37 |
-Subject: [PATCH] Added version check for boolean, TRUE and FALSE settings |
38 |
- |
39 |
---- |
40 |
- src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 14 ++++++++------ |
41 |
- 1 file changed, 8 insertions(+), 6 deletions(-) |
42 |
- |
43 |
-diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp |
44 |
-index 9f7f4c38937..115203322a5 100644 |
45 |
---- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp |
46 |
-+++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp |
47 |
-@@ -70,12 +70,14 @@ namespace osgDBJPEG |
48 |
- |
49 |
- static int jpegerror = ERR_NO_ERROR; |
50 |
- |
51 |
--/* Some versions of jmorecfg.h define boolean, some don't... |
52 |
-- Those that do also define HAVE_BOOLEAN, so we can guard using that. */ |
53 |
--#ifndef HAVE_BOOLEAN |
54 |
-- typedef int boolean; |
55 |
-- #define FALSE 0 |
56 |
-- #define TRUE 1 |
57 |
-+#if JPEG_LIB_VERSION < 90 |
58 |
-+ /* Some versions of jmorecfg.h define boolean, some don't... |
59 |
-+ Those that do also define HAVE_BOOLEAN, so we can guard using that. */ |
60 |
-+ #ifndef HAVE_BOOLEAN |
61 |
-+ typedef int boolean; |
62 |
-+ #define FALSE 0 |
63 |
-+ #define TRUE 1 |
64 |
-+ #endif |
65 |
- #endif |
66 |
- |
67 |
- /* CODE FOR READING/WRITING JPEG FROM STREAMS |
68 |
|
69 |
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch |
70 |
deleted file mode 100644 |
71 |
index 6b8ea7abe60..00000000000 |
72 |
--- a/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch |
73 |
+++ /dev/null |
74 |
@@ -1,281 +0,0 @@ |
75 |
---- OpenSceneGraph-3.4.0/CMakeLists.txt |
76 |
-+++ OpenSceneGraph-3.4.0/CMakeLists.txt |
77 |
-@@ -607,6 +607,7 @@ |
78 |
- |
79 |
- # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") |
80 |
- |
81 |
-+INCLUDE(MacroOptionalFindPackage) |
82 |
- |
83 |
- ################################################################################ |
84 |
- # Set Version header file |
85 |
-@@ -716,42 +716,42 @@ |
86 |
- ANDROID_3RD_PARTY() |
87 |
- ELSE() |
88 |
- # Common to all platforms except android: |
89 |
-- FIND_PACKAGE(Freetype) |
90 |
-- FIND_PACKAGE(Inventor) |
91 |
-- FIND_PACKAGE(Jasper) |
92 |
-- FIND_PACKAGE(OpenEXR) |
93 |
-- FIND_PACKAGE(COLLADA) |
94 |
-- FIND_PACKAGE(FBX) |
95 |
-- FIND_PACKAGE(ZLIB) |
96 |
-- FIND_PACKAGE(Xine) |
97 |
-- FIND_PACKAGE(OpenVRML) |
98 |
-- FIND_PACKAGE(GDAL) |
99 |
-- FIND_PACKAGE(GTA) |
100 |
-- FIND_PACKAGE(CURL) |
101 |
-- FIND_PACKAGE(LibVNCServer) |
102 |
-- FIND_PACKAGE(OurDCMTK) |
103 |
-- FIND_PACKAGE(FFmpeg) |
104 |
-- FIND_PACKAGE(GStreamer COMPONENTS app pbutils) |
105 |
-- FIND_PACKAGE(GLIB COMPONENTS gobject) |
106 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Freetype) |
107 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Inventor) |
108 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Jasper) |
109 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) |
110 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) |
111 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FBX) |
112 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) |
113 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Xine) |
114 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML) |
115 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GDAL) |
116 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GTA) |
117 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(CURL) |
118 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer) |
119 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK) |
120 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg) |
121 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GStreamer COMPONENTS app pbutils) |
122 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GLIB COMPONENTS gobject) |
123 |
- FIND_PACKAGE(DirectShow) |
124 |
-- FIND_PACKAGE(SDL2) |
125 |
-- FIND_PACKAGE(SDL) |
126 |
-- FIND_PACKAGE(Poppler-glib) |
127 |
-- FIND_PACKAGE(RSVG) |
128 |
-- FIND_PACKAGE(GtkGl) |
129 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(SDL2) |
130 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(SDL) |
131 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib) |
132 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(RSVG) |
133 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) |
134 |
- FIND_PACKAGE(DirectInput) |
135 |
-- FIND_PACKAGE(NVTT) |
136 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(NVTT) |
137 |
- IF (NOT WIN32) |
138 |
-- FIND_PACKAGE(Asio) |
139 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Asio) |
140 |
- ENDIF() |
141 |
- FIND_PACKAGE(ZeroConf) |
142 |
- |
143 |
-- FIND_PACKAGE(LIBLAS) |
144 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(LIBLAS) |
145 |
- |
146 |
- IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) |
147 |
-- FIND_PACKAGE(Lua52) |
148 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Lua52) |
149 |
- IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR)) |
150 |
-- FIND_PACKAGE(Lua51) |
151 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(Lua51) |
152 |
- ENDIF() |
153 |
- ENDIF() |
154 |
- |
155 |
-@@ -768,11 +768,11 @@ |
156 |
- IF (BUILD_OSG_EXAMPLES AND NOT ANDROID) |
157 |
- |
158 |
- |
159 |
-- FIND_PACKAGE(FLTK) |
160 |
-- FIND_PACKAGE(FOX) |
161 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FLTK) |
162 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(FOX) |
163 |
- |
164 |
- SET(wxWidgets_USE_LIBS base core gl net) |
165 |
-- FIND_PACKAGE(wxWidgets) |
166 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets) |
167 |
- |
168 |
- ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) |
169 |
- |
170 |
-@@ -789,10 +790,10 @@ |
171 |
- # can use Quicktime. |
172 |
- IF(NOT ANDROID) |
173 |
- IF(NOT APPLE) |
174 |
-- FIND_PACKAGE(GIFLIB) |
175 |
-- FIND_PACKAGE(JPEG) |
176 |
-- FIND_PACKAGE(PNG) |
177 |
-- FIND_PACKAGE(TIFF) |
178 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB) |
179 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG) |
180 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(PNG) |
181 |
-+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF) |
182 |
- # QuickTime is required for OS X, but optional for Windows. |
183 |
- IF(WIN32) |
184 |
- FIND_PACKAGE(QuickTime) |
185 |
-@@ -848,15 +849,7 @@ |
186 |
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") |
187 |
- ENDIF() |
188 |
- |
189 |
--IF(UNIX AND NOT WIN32 AND NOT APPLE) |
190 |
-- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") |
191 |
-- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") |
192 |
-- MARK_AS_ADVANCED(LIB_POSTFIX) |
193 |
-- ENDIF() |
194 |
--ENDIF() |
195 |
--IF(NOT DEFINED LIB_POSTFIX) |
196 |
-- SET(LIB_POSTFIX "") |
197 |
--ENDIF() |
198 |
-+SET(LIB_POSTFIX ${LIB_SUFFIX}) |
199 |
- |
200 |
- # Here we apparantly do some funky stuff with making the bin/ and lib/ |
201 |
- # folders which is probably needed to work around a very old CMake bug? |
202 |
-@@ -1191,7 +1184,7 @@ |
203 |
- ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY |
204 |
- ) |
205 |
- #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) |
206 |
-- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc) |
207 |
-+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc) |
208 |
- |
209 |
- # now set up openthreads documentation generation |
210 |
- IF(BUILD_REF_DOCS_TAGFILE) |
211 |
-@@ -1207,7 +1200,7 @@ |
212 |
- ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY |
213 |
- ) |
214 |
- #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) |
215 |
-- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc) |
216 |
-+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc) |
217 |
- |
218 |
- # Process our other doxyfiles but don't create targets for these |
219 |
- CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile |
220 |
---- OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS |
221 |
-+++ OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS |
222 |
-@@ -0,0 +1,22 @@ |
223 |
-+Redistribution and use in source and binary forms, with or without |
224 |
-+modification, are permitted provided that the following conditions |
225 |
-+are met: |
226 |
-+ |
227 |
-+1. Redistributions of source code must retain the copyright |
228 |
-+ notice, this list of conditions and the following disclaimer. |
229 |
-+2. Redistributions in binary form must reproduce the copyright |
230 |
-+ notice, this list of conditions and the following disclaimer in the |
231 |
-+ documentation and/or other materials provided with the distribution. |
232 |
-+3. The name of the author may not be used to endorse or promote products |
233 |
-+ derived from this software without specific prior written permission. |
234 |
-+ |
235 |
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
236 |
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
237 |
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
238 |
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
239 |
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
240 |
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
241 |
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
242 |
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
243 |
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
244 |
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
245 |
---- OpenSceneGraph-3.4.0/CMakeModules/FindFLTK.cmake.rej |
246 |
-+++ OpenSceneGraph-3.4.0/CMakeModules/FindFLTK.cmake.rej |
247 |
-@@ -0,0 +1,55 @@ |
248 |
-+--- CMakeModules/FindFLTK.cmake 2010-11-11 17:51:46.000000000 +0100 |
249 |
-++++ CMakeModules/FindFLTK.cmake 2014-08-20 00:29:31.229439251 +0200 |
250 |
-+@@ -1,52 +0,0 @@ |
251 |
-+-# Locate FLTK |
252 |
-+-# This module defines |
253 |
-+-# FLTK_LIBRARY |
254 |
-+-# FLTK_FOUND, if false, do not try to link to gdal |
255 |
-+-# FLTK_INCLUDE_DIR, where to find the headers |
256 |
-+-# |
257 |
-+-# $FLTK_DIR is an environment variable that would |
258 |
-+-# correspond to the ./configure --prefix=$FLTK_DIR |
259 |
-+-# |
260 |
-+-# Created by Robert Osfield. |
261 |
-+- |
262 |
-+-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h |
263 |
-+- $ENV{FLTK_DIR}/include |
264 |
-+- $ENV{FLTK_DIR} |
265 |
-+- ~/Library/Frameworks |
266 |
-+- /Library/Frameworks |
267 |
-+- /usr/local/include |
268 |
-+- /usr/include |
269 |
-+- /sw/include # Fink |
270 |
-+- /opt/local/include # DarwinPorts |
271 |
-+- /opt/csw/include # Blastwave |
272 |
-+- /opt/include |
273 |
-+- /usr/freeware/include |
274 |
-+-) |
275 |
-+- |
276 |
-+-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME) |
277 |
-+- |
278 |
-+- FIND_LIBRARY(${MYLIBRARY} |
279 |
-+- NAMES ${MYLIBRARYNAME} |
280 |
-+- PATHS |
281 |
-+- $ENV{FLTK_DIR}/lib |
282 |
-+- $ENV{FLTK_DIR} |
283 |
-+- ~/Library/Frameworks |
284 |
-+- /Library/Frameworks |
285 |
-+- /usr/local/lib |
286 |
-+- /usr/lib |
287 |
-+- /sw/lib |
288 |
-+- /opt/local/lib |
289 |
-+- /opt/csw/lib |
290 |
-+- /opt/lib |
291 |
-+- /usr/freeware/lib64 |
292 |
-+- ) |
293 |
-+- |
294 |
-+-ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME) |
295 |
-+- |
296 |
-+-FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk) |
297 |
-+-FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl) |
298 |
-+- |
299 |
-+-SET(FLTK_FOUND "NO") |
300 |
-+-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR) |
301 |
-+- SET(FLTK_FOUND "YES") |
302 |
-+-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR) |
303 |
---- OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake |
304 |
-+++ OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake |
305 |
-@@ -0,0 +1,28 @@ |
306 |
-+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() |
307 |
-+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] ) |
308 |
-+# This macro is a combination of OPTION() and FIND_PACKAGE(), it |
309 |
-+# works like FIND_PACKAGE(), but additionally it automatically creates |
310 |
-+# an option name WITH_<name>, which can be disabled via the cmake GUI. |
311 |
-+# or via -DWITH_<name>=OFF |
312 |
-+# The standard <name>_FOUND variables can be used in the same way |
313 |
-+# as when using the normal FIND_PACKAGE() |
314 |
-+ |
315 |
-+# Copyright (c) 2006, Alexander Neundorf, <neundorf@×××.org> |
316 |
-+# |
317 |
-+# Redistribution and use is allowed according to the terms of the BSD license. |
318 |
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
319 |
-+ |
320 |
-+ |
321 |
-+macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) |
322 |
-+ option(WITH_${_name} "Search for ${_name} package" ON) |
323 |
-+ if (WITH_${_name}) |
324 |
-+ find_package(${_name} ${ARGN}) |
325 |
-+ else (WITH_${_name}) |
326 |
-+ set(${_name}_FOUND) |
327 |
-+ set(${_name}_INCLUDE_DIR) |
328 |
-+ set(${_name}_INCLUDES) |
329 |
-+ set(${_name}_LIBRARY) |
330 |
-+ set(${_name}_LIBRARIES) |
331 |
-+ endif (WITH_${_name}) |
332 |
-+endmacro (MACRO_OPTIONAL_FIND_PACKAGE) |
333 |
-+ |
334 |
---- OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake |
335 |
-+++ OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake |
336 |
-@@ -463,7 +463,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME) |
337 |
- IF(APPLE) |
338 |
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) |
339 |
- ELSE(APPLE) |
340 |
-- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) |
341 |
-+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples ) |
342 |
- IF(MSVC) |
343 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo) |
344 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug) |
345 |
- |
346 |
---- OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt |
347 |
-+++ OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt |
348 |
-@@ -1,6 +1,6 @@ |
349 |
- SET(TARGET_SRC osgviewerFLTK.cpp ) |
350 |
- |
351 |
--SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY}) |
352 |
-+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY}) |
353 |
- |
354 |
- INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ) |
355 |
- |
356 |
|
357 |
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild |
358 |
deleted file mode 100644 |
359 |
index 00182829434..00000000000 |
360 |
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild |
361 |
+++ /dev/null |
362 |
@@ -1,142 +0,0 @@ |
363 |
-# Copyright 1999-2020 Gentoo Authors |
364 |
-# Distributed under the terms of the GNU General Public License v2 |
365 |
- |
366 |
-EAPI=6 |
367 |
-WX_GTK_VER="3.0-gtk3" |
368 |
- |
369 |
-inherit cmake-utils flag-o-matic wxwidgets vcs-snapshot |
370 |
- |
371 |
-MY_PN="OpenSceneGraph" |
372 |
-MY_P=${MY_PN}-${PV} |
373 |
- |
374 |
-DESCRIPTION="Open source high performance 3D graphics toolkit" |
375 |
-HOMEPAGE="http://www.openscenegraph.org/" |
376 |
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz" |
377 |
- |
378 |
-LICENSE="wxWinLL-3 LGPL-2.1" |
379 |
-SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION |
380 |
-KEYWORDS="amd64 ~hppa ppc ppc64 x86" |
381 |
-IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer jpeg |
382 |
-las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff |
383 |
-truetype vnc wxwidgets xine xrandr zlib" |
384 |
- |
385 |
-REQUIRED_USE="sdl2? ( sdl )" |
386 |
- |
387 |
-# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK |
388 |
-RDEPEND=" |
389 |
- x11-libs/libSM |
390 |
- x11-libs/libXext |
391 |
- virtual/glu |
392 |
- virtual/opengl |
393 |
- asio? ( dev-cpp/asio ) |
394 |
- curl? ( net-misc/curl ) |
395 |
- examples? ( |
396 |
- fltk? ( x11-libs/fltk:1[opengl] ) |
397 |
- fox? ( x11-libs/fox:1.6[opengl] ) |
398 |
- glut? ( media-libs/freeglut ) |
399 |
- sdl2? ( media-libs/libsdl2 ) |
400 |
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) |
401 |
- ) |
402 |
- ffmpeg? ( media-video/ffmpeg:0= ) |
403 |
- gdal? ( sci-libs/gdal ) |
404 |
- gif? ( media-libs/giflib:= ) |
405 |
- gstreamer? ( |
406 |
- media-libs/gstreamer:1.0 |
407 |
- media-libs/gst-plugins-base:1.0 |
408 |
- ) |
409 |
- jpeg? ( virtual/jpeg:0 ) |
410 |
- las? ( >=sci-geosciences/liblas-1.8.0 ) |
411 |
- lua? ( >=dev-lang/lua-5.1.5:* ) |
412 |
- openexr? ( |
413 |
- media-libs/ilmbase:= |
414 |
- media-libs/openexr:= |
415 |
- ) |
416 |
- openinventor? ( media-libs/coin ) |
417 |
- pdf? ( app-text/poppler[cairo] ) |
418 |
- png? ( media-libs/libpng:0= ) |
419 |
- sdl? ( media-libs/libsdl ) |
420 |
- svg? ( |
421 |
- gnome-base/librsvg |
422 |
- x11-libs/cairo |
423 |
- ) |
424 |
- tiff? ( media-libs/tiff:0 ) |
425 |
- truetype? ( media-libs/freetype:2 ) |
426 |
- vnc? ( net-libs/libvncserver ) |
427 |
- xine? ( media-libs/xine-lib ) |
428 |
- xrandr? ( x11-libs/libXrandr ) |
429 |
- zlib? ( sys-libs/zlib ) |
430 |
-" |
431 |
-DEPEND="${RDEPEND} |
432 |
- app-arch/unzip |
433 |
- virtual/pkgconfig |
434 |
- x11-base/xorg-proto |
435 |
- doc? ( app-doc/doxygen ) |
436 |
-" |
437 |
- |
438 |
-S="${WORKDIR}/${MY_P}" |
439 |
- |
440 |
-PATCHES=( |
441 |
- "${FILESDIR}"/${PN}-3.5.5-cmake.patch |
442 |
- "${FILESDIR}"/${PN}-3.5.1-jpeg-9.patch |
443 |
-) |
444 |
- |
445 |
-src_configure() { |
446 |
- if use examples && use wxwidgets; then |
447 |
- need-wxwidgets unicode |
448 |
- fi |
449 |
- |
450 |
- # Needed by FFmpeg |
451 |
- append-cppflags -D__STDC_CONSTANT_MACROS |
452 |
- |
453 |
- local mycmakeargs=( |
454 |
- -DDYNAMIC_OPENSCENEGRAPH=ON |
455 |
- -DGENTOO_DOCDIR="/usr/share/doc/${PF}" |
456 |
- -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3 |
457 |
- -DOSG_PROVIDE_READFILE=ON |
458 |
- -DOSG_USE_LOCAL_LUA_SOURCE=OFF |
459 |
- -DWITH_Lua51=OFF # We use CMake-version FindLua.cmake instead |
460 |
- -DWITH_Asio=$(usex asio) |
461 |
- -DWITH_CURL=$(usex curl) |
462 |
- -DBUILD_DOCUMENTATION=$(usex doc) |
463 |
- -DBUILD_OSG_APPLICATIONS=$(usex osgapps) |
464 |
- -DBUILD_OSG_EXAMPLES=$(usex examples) |
465 |
- -DWITH_FFmpeg=$(usex ffmpeg) |
466 |
- -DWITH_GDAL=$(usex gdal) |
467 |
- -DWITH_GIFLIB=$(usex gif) |
468 |
- -DWITH_GStreamer=$(usex gstreamer) |
469 |
- -DWITH_GLIB=$(usex gstreamer) |
470 |
- -DWITH_GtkGl=OFF |
471 |
- -DWITH_JPEG=$(usex jpeg) |
472 |
- -DWITH_Jasper=OFF |
473 |
- -DWITH_LIBLAS=$(usex las) |
474 |
- -DWITH_Lua=$(usex lua) |
475 |
- -DWITH_OpenEXR=$(usex openexr) |
476 |
- -DWITH_Inventor=$(usex openinventor) |
477 |
- -DWITH_Poppler-glib=$(usex pdf) |
478 |
- -DWITH_PNG=$(usex png) |
479 |
- -DWITH_SDL=$(usex sdl) |
480 |
- -DWITH_SDL2=$(usex sdl2) |
481 |
- -DWITH_RSVG=$(usex svg rsvg) |
482 |
- -DWITH_TIFF=$(usex tiff) |
483 |
- -DWITH_Freetype=$(usex truetype) |
484 |
- -DWITH_LibVNCServer=$(usex vnc) |
485 |
- -DWITH_Xine=$(usex xine) |
486 |
- -DOSGVIEWER_USE_XRANDR=$(usex xrandr) |
487 |
- -DWITH_ZLIB=$(usex zlib) |
488 |
- ) |
489 |
- if use examples; then |
490 |
- mycmakeargs+=( |
491 |
- -DWITH_FLTK=$(usex fltk) |
492 |
- -DWITH_FOX=$(usex fox) |
493 |
- -DWITH_GLUT=$(usex glut) |
494 |
- -DWITH_wxWidgets=$(usex wxwidgets) |
495 |
- ) |
496 |
- fi |
497 |
- |
498 |
- cmake-utils_src_configure |
499 |
-} |
500 |
- |
501 |
-src_compile() { |
502 |
- cmake-utils_src_compile |
503 |
- use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads |
504 |
-} |