Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Christian Schmitt <chris@××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
Date: Tue, 02 Aug 2011 06:53:18
Message-Id: ac55a47ffb215fd8bb45c6734f5c0fb98dc84c91.christian@gentoo
1 commit: ac55a47ffb215fd8bb45c6734f5c0fb98dc84c91
2 Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
3 AuthorDate: Mon Aug 1 22:15:51 2011 +0000
4 Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
5 CommitDate: Tue Aug 2 06:50:54 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ac55a47f
7
8 [dev-games/openscenegraph] version bump to 3.0.1
9 Removed xulrunner completely. Please test different useflag combinations.
10
11 ---
12 .../files/openscenegraph-cmake.patch | 140 ++++++++++----------
13 dev-games/openscenegraph/metadata.xml | 1 +
14 ...h-2.9.10.ebuild => openscenegraph-3.0.1.ebuild} | 23 ++--
15 3 files changed, 83 insertions(+), 81 deletions(-)
16
17 diff --git a/dev-games/openscenegraph/files/openscenegraph-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
18 index 02503d5..e9809e1 100644
19 --- a/dev-games/openscenegraph/files/openscenegraph-cmake.patch
20 +++ b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
21 @@ -1,8 +1,8 @@
22 diff --git a/CMakeLists.txt b/CMakeLists.txt
23 -index de8af36..be1a3cf 100644
24 +index 6858e70..c4cc339 100644
25 --- a/CMakeLists.txt
26 +++ b/CMakeLists.txt
27 -@@ -374,6 +374,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
28 +@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
29
30 # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
31
32 @@ -10,28 +10,34 @@ index de8af36..be1a3cf 100644
33
34 ################################################################################
35 # Set Version Info resource file
36 -@@ -400,29 +401,29 @@ IF(WIN32)
37 - ENDIF()
38 -
39 - # Common to all platforms:
40 --FIND_PACKAGE(FreeType)
41 --FIND_PACKAGE(Inventor)
42 --FIND_PACKAGE(Jasper)
43 --FIND_PACKAGE(OpenEXR)
44 --FIND_PACKAGE(COLLADA)
45 --FIND_PACKAGE(FBX)
46 --FIND_PACKAGE(ZLIB)
47 --FIND_PACKAGE(Xine)
48 --FIND_PACKAGE(OpenVRML)
49 --FIND_PACKAGE(Performer)
50 --FIND_PACKAGE(GDAL)
51 --FIND_PACKAGE(CURL)
52 --FIND_PACKAGE(ITK)
53 --FIND_PACKAGE(LibVNCServer)
54 --FIND_PACKAGE(OurDCMTK)
55 --FIND_PACKAGE(OpenAL)
56 --FIND_PACKAGE(XUL)
57 --FIND_PACKAGE(FFmpeg)
58 +@@ -450,30 +451,30 @@ IF(ANDROID)
59 + ANDROID_3RD_PARTY()
60 + ELSE()
61 + # Common to all platforms except android:
62 +- FIND_PACKAGE(FreeType)
63 +- FIND_PACKAGE(Inventor)
64 +- FIND_PACKAGE(Jasper)
65 +- FIND_PACKAGE(OpenEXR)
66 +- FIND_PACKAGE(COLLADA)
67 +- FIND_PACKAGE(FBX)
68 +- FIND_PACKAGE(ZLIB)
69 +- FIND_PACKAGE(Xine)
70 +- FIND_PACKAGE(OpenVRML)
71 +- FIND_PACKAGE(Performer)
72 +- FIND_PACKAGE(GDAL)
73 +- FIND_PACKAGE(CURL)
74 +- FIND_PACKAGE(ITK)
75 +- FIND_PACKAGE(LibVNCServer)
76 +- FIND_PACKAGE(OurDCMTK)
77 +- FIND_PACKAGE(OpenAL)
78 +- FIND_PACKAGE(FFmpeg)
79 +- FIND_PACKAGE(DirectShow)
80 +- FIND_PACKAGE(SDL)
81 +- FIND_PACKAGE(Poppler-glib)
82 +- FIND_PACKAGE(RSVG)
83 +- FIND_PACKAGE(GtkGl)
84 +- FIND_PACKAGE(DirectInput)
85 +- FIND_PACKAGE(NVTT)
86 +MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
87 +MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
88 +MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
89 @@ -48,44 +54,42 @@ index de8af36..be1a3cf 100644
90 +MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
91 +MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
92 +MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
93 -+MACRO_OPTIONAL_FIND_PACKAGE(XUL)
94 +MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
95 ++FIND_PACKAGE(DirectShow)
96 +MACRO_OPTIONAL_FIND_PACKAGE(SDL)
97 - FIND_PACKAGE(DirectShow)
98 --FIND_PACKAGE(SDL)
99 --FIND_PACKAGE(Poppler-glib)
100 --FIND_PACKAGE(RSVG)
101 --FIND_PACKAGE(GtkGl)
102 +MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
103 +MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
104 +MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
105 ++FIND_PACKAGE(DirectInput)
106 ++FIND_PACKAGE(NVTT)
107 + ENDIF()
108
109 # Include macro utilities here
110 - INCLUDE(OsgMacroUtils)
111 -@@ -432,17 +433,17 @@ INCLUDE(OsgMacroUtils)
112 - IF (DESIRED_QT_VERSION)
113 +@@ -485,17 +486,18 @@ IF(NOT ANDROID)
114 + IF (DESIRED_QT_VERSION)
115 +
116 + IF (DESIRED_QT_VERSION MATCHES 4)
117 +- FIND_PACKAGE(Qt4)
118 ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
119 + ELSE()
120 +- FIND_PACKAGE(Qt3)
121 ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
122 + ENDIF()
123
124 - IF (DESIRED_QT_VERSION MATCHES 4)
125 -- FIND_PACKAGE(Qt4)
126 -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
127 ++
128 ELSE()
129 -- FIND_PACKAGE(Qt3)
130 -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
131 - ENDIF()
132
133 - ELSE()
134 +- FIND_PACKAGE(Qt4)
135 ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
136
137 -- FIND_PACKAGE(Qt4)
138 -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
139 + IF (NOT QT4_FOUND)
140 +- FIND_PACKAGE(Qt3)
141 ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
142 + ENDIF()
143
144 - IF (NOT QT4_FOUND)
145 -- FIND_PACKAGE(Qt3)
146 -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
147 ENDIF()
148 -
149 - ENDIF()
150 -@@ -451,12 +452,12 @@ ENDIF()
151 - IF (BUILD_OSG_EXAMPLES)
152 +@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
153 + IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
154
155
156 - FIND_PACKAGE(FLTK)
157 @@ -99,24 +103,24 @@ index de8af36..be1a3cf 100644
158 - FIND_PACKAGE(wxWidgets)
159 + MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
160
161 - ENDIF(BUILD_OSG_EXAMPLES)
162 + ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
163
164 -@@ -476,10 +477,10 @@ ENDIF(BUILD_OSG_EXAMPLES)
165 - # Image readers/writers depend on 3rd party libraries except for OS X which
166 +@@ -530,10 +532,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
167 # can use Quicktime.
168 - IF(NOT APPLE)
169 -- FIND_PACKAGE(GIFLIB)
170 -- FIND_PACKAGE(JPEG)
171 -- FIND_PACKAGE(PNG)
172 -- FIND_PACKAGE(TIFF)
173 -+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
174 -+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
175 -+ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
176 -+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
177 + IF(NOT ANDROID)
178 + IF(NOT APPLE)
179 +- FIND_PACKAGE(GIFLIB)
180 +- FIND_PACKAGE(JPEG)
181 +- FIND_PACKAGE(PNG)
182 +- FIND_PACKAGE(TIFF)
183 ++ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
184 ++ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
185 ++ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
186 ++ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
187
188 - # QuickTime is required for OS X, but optional for Windows.
189 - IF(WIN32)
190 -@@ -816,7 +817,7 @@ IF(BUILD_DOCUMENTATION)
191 + # QuickTime is required for OS X, but optional for Windows.
192 + IF(WIN32)
193 +@@ -884,7 +886,7 @@ IF(BUILD_DOCUMENTATION)
194 ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
195 )
196 #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
197 @@ -125,7 +129,7 @@ index de8af36..be1a3cf 100644
198
199 # now set up openthreads documentation generation
200 IF(BUILD_REF_DOCS_TAGFILE)
201 -@@ -832,7 +833,7 @@ IF(BUILD_DOCUMENTATION)
202 +@@ -900,7 +902,7 @@ IF(BUILD_DOCUMENTATION)
203 ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/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 @@ -255,11 +259,11 @@ index 0000000..f09952f
207 +endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
208 +
209 diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
210 -index ea63146..242b14e 100644
211 +index aa607fa..8f3771c 100644
212 --- a/CMakeModules/OsgMacroUtils.cmake
213 +++ b/CMakeModules/OsgMacroUtils.cmake
214 -@@ -390,9 +390,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
215 - SETUP_EXE(${IS_COMMANDLINE_APP})
216 +@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
217 + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
218
219 IF(APPLE)
220 - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
221
222 diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
223 index 8bc0717..e069176 100644
224 --- a/dev-games/openscenegraph/metadata.xml
225 +++ b/dev-games/openscenegraph/metadata.xml
226 @@ -6,6 +6,7 @@
227 The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
228 </longdescription>
229 <use>
230 + <flag name="itk">Build plugin using <pkg>dev-tcltk/itk</pkg> library</flag>
231 <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
232 <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
233 <flag name="openinventor">Build OpenInventor plugin</flag>
234
235 diff --git a/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
236 similarity index 87%
237 rename from dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
238 rename to dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
239 index c2990a1..5bd11d1 100644
240 --- a/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
241 +++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
242 @@ -1,31 +1,27 @@
243 -# Copyright 1999-2010 Gentoo Foundation
244 +# Copyright 1999-2011 Gentoo Foundation
245 # Distributed under the terms of the GNU General Public License v2
246 # $Header: $
247
248 -EAPI=2
249 +EAPI=4
250
251 -inherit eutils versionator cmake-utils
252 +inherit eutils versionator cmake-utils wxwidgets
253
254 MY_PN="OpenSceneGraph"
255 MY_P=${MY_PN}-${PV}
256
257 DESCRIPTION="Open source high performance 3D graphics toolkit"
258 HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
259 -SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
260 +SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P}/source/${MY_P}.zip"
261
262 LICENSE="wxWinLL-3 LGPL-2.1"
263 SLOT="0"
264 KEYWORDS="~amd64 ~x86"
265 -IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
266 -openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype vnc
267 -wxwidgets xine xrandr zlib"
268 +IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jpeg jpeg2k
269 +openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype
270 +vnc wxwidgets xine xrandr zlib"
271
272 # NOTE: OpenAL (support missing)
273 -# TODO: COLLADA, FBX, OpenVRML, Performer, ITK, DCMTK
274 -# xulrunner? ( only 1.8 supported for now, ignore it
275 -# net-libs/xulrunner:1.8
276 -# x11-libs/gtk+:2
277 -# )
278 +# TODO: COLLADA, FBX, OpenVRML, Performer, DCMTK
279 RDEPEND="
280 x11-libs/libSM
281 x11-libs/libXext
282 @@ -48,6 +44,7 @@ RDEPEND="
283 ffmpeg? ( virtual/ffmpeg )
284 gdal? ( sci-libs/gdal )
285 gif? ( media-libs/giflib )
286 + itk? ( dev-tcltk/itk )
287 jpeg? ( virtual/jpeg )
288 jpeg2k? ( media-libs/jasper )
289 openexr? (
290 @@ -95,7 +92,6 @@ src_configure() {
291
292 mycmakeargs=(
293 -DWITH_OpenAL=OFF # Commented out in buildsystem
294 - -DWITH_XUL=OFF # Supports only xulrunner 1.8
295 -DGENTOO_DOCDIR="/usr/share/doc/${PF}"
296 $(cmake-utils_use_with curl)
297 $(cmake-utils_use_build doc DOCUMENTATION)
298 @@ -108,6 +104,7 @@ src_configure() {
299 $(cmake-utils_use_with gif GIFLIB)
300 $(cmake-utils_use_with glut)
301 $(cmake-utils_use_with gtk GtkGl)
302 + $(cmake-utils_use_with itk)
303 $(cmake-utils_use_with jpeg)
304 $(cmake-utils_use_with jpeg2k Jasper)
305 $(cmake-utils_use_with openexr OpenEXR)
Report Message
Find on MARC Find on Google Groups