* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2011-08-02 6:52 Christian Schmitt
0 siblings, 0 replies; 7+ messages in thread
From: Christian Schmitt @ 2011-08-02 6:52 UTC (permalink / raw
To: gentoo-commits
commit: ac55a47ffb215fd8bb45c6734f5c0fb98dc84c91
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Aug 1 22:15:51 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Tue Aug 2 06:50:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ac55a47f
[dev-games/openscenegraph] version bump to 3.0.1
Removed xulrunner completely. Please test different useflag combinations.
---
.../files/openscenegraph-cmake.patch | 140 ++++++++++----------
dev-games/openscenegraph/metadata.xml | 1 +
...h-2.9.10.ebuild => openscenegraph-3.0.1.ebuild} | 23 ++--
3 files changed, 83 insertions(+), 81 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
index 02503d5..e9809e1 100644
--- a/dev-games/openscenegraph/files/openscenegraph-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de8af36..be1a3cf 100644
+index 6858e70..c4cc339 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -374,6 +374,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
@@ -10,28 +10,34 @@ index de8af36..be1a3cf 100644
################################################################################
# Set Version Info resource file
-@@ -400,29 +401,29 @@ IF(WIN32)
- ENDIF()
-
- # Common to all platforms:
--FIND_PACKAGE(FreeType)
--FIND_PACKAGE(Inventor)
--FIND_PACKAGE(Jasper)
--FIND_PACKAGE(OpenEXR)
--FIND_PACKAGE(COLLADA)
--FIND_PACKAGE(FBX)
--FIND_PACKAGE(ZLIB)
--FIND_PACKAGE(Xine)
--FIND_PACKAGE(OpenVRML)
--FIND_PACKAGE(Performer)
--FIND_PACKAGE(GDAL)
--FIND_PACKAGE(CURL)
--FIND_PACKAGE(ITK)
--FIND_PACKAGE(LibVNCServer)
--FIND_PACKAGE(OurDCMTK)
--FIND_PACKAGE(OpenAL)
--FIND_PACKAGE(XUL)
--FIND_PACKAGE(FFmpeg)
+@@ -450,30 +451,30 @@ IF(ANDROID)
+ ANDROID_3RD_PARTY()
+ ELSE()
+ # Common to all platforms except android:
+- FIND_PACKAGE(FreeType)
+- FIND_PACKAGE(Inventor)
+- FIND_PACKAGE(Jasper)
+- FIND_PACKAGE(OpenEXR)
+- FIND_PACKAGE(COLLADA)
+- FIND_PACKAGE(FBX)
+- FIND_PACKAGE(ZLIB)
+- FIND_PACKAGE(Xine)
+- FIND_PACKAGE(OpenVRML)
+- FIND_PACKAGE(Performer)
+- FIND_PACKAGE(GDAL)
+- FIND_PACKAGE(CURL)
+- FIND_PACKAGE(ITK)
+- FIND_PACKAGE(LibVNCServer)
+- FIND_PACKAGE(OurDCMTK)
+- FIND_PACKAGE(OpenAL)
+- FIND_PACKAGE(FFmpeg)
+- FIND_PACKAGE(DirectShow)
+- FIND_PACKAGE(SDL)
+- FIND_PACKAGE(Poppler-glib)
+- FIND_PACKAGE(RSVG)
+- FIND_PACKAGE(GtkGl)
+- FIND_PACKAGE(DirectInput)
+- FIND_PACKAGE(NVTT)
+MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
+MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
+MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
@@ -48,44 +54,42 @@ index de8af36..be1a3cf 100644
+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
+MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
-+MACRO_OPTIONAL_FIND_PACKAGE(XUL)
+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
++FIND_PACKAGE(DirectShow)
+MACRO_OPTIONAL_FIND_PACKAGE(SDL)
- FIND_PACKAGE(DirectShow)
--FIND_PACKAGE(SDL)
--FIND_PACKAGE(Poppler-glib)
--FIND_PACKAGE(RSVG)
--FIND_PACKAGE(GtkGl)
+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
+MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
++FIND_PACKAGE(DirectInput)
++FIND_PACKAGE(NVTT)
+ ENDIF()
# Include macro utilities here
- INCLUDE(OsgMacroUtils)
-@@ -432,17 +433,17 @@ INCLUDE(OsgMacroUtils)
- IF (DESIRED_QT_VERSION)
+@@ -485,17 +486,18 @@ IF(NOT ANDROID)
+ IF (DESIRED_QT_VERSION)
+
+ IF (DESIRED_QT_VERSION MATCHES 4)
+- FIND_PACKAGE(Qt4)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ ELSE()
+- FIND_PACKAGE(Qt3)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+ ENDIF()
- IF (DESIRED_QT_VERSION MATCHES 4)
-- FIND_PACKAGE(Qt4)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
++
ELSE()
-- FIND_PACKAGE(Qt3)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
- ENDIF()
- ELSE()
+- FIND_PACKAGE(Qt4)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
-- FIND_PACKAGE(Qt4)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ IF (NOT QT4_FOUND)
+- FIND_PACKAGE(Qt3)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+ ENDIF()
- IF (NOT QT4_FOUND)
-- FIND_PACKAGE(Qt3)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
ENDIF()
-
- ENDIF()
-@@ -451,12 +452,12 @@ ENDIF()
- IF (BUILD_OSG_EXAMPLES)
+@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
+ IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
- FIND_PACKAGE(FLTK)
@@ -99,24 +103,24 @@ index de8af36..be1a3cf 100644
- FIND_PACKAGE(wxWidgets)
+ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
- ENDIF(BUILD_OSG_EXAMPLES)
+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
-@@ -476,10 +477,10 @@ ENDIF(BUILD_OSG_EXAMPLES)
- # Image readers/writers depend on 3rd party libraries except for OS X which
+@@ -530,10 +532,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
# can use Quicktime.
- IF(NOT APPLE)
-- FIND_PACKAGE(GIFLIB)
-- FIND_PACKAGE(JPEG)
-- FIND_PACKAGE(PNG)
-- FIND_PACKAGE(TIFF)
-+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
-+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
-+ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
-+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
+ IF(NOT ANDROID)
+ IF(NOT APPLE)
+- FIND_PACKAGE(GIFLIB)
+- FIND_PACKAGE(JPEG)
+- FIND_PACKAGE(PNG)
+- FIND_PACKAGE(TIFF)
++ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
++ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
++ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
++ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
- # QuickTime is required for OS X, but optional for Windows.
- IF(WIN32)
-@@ -816,7 +817,7 @@ IF(BUILD_DOCUMENTATION)
+ # QuickTime is required for OS X, but optional for Windows.
+ IF(WIN32)
+@@ -884,7 +886,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@@ -125,7 +129,7 @@ index de8af36..be1a3cf 100644
# now set up openthreads documentation generation
IF(BUILD_REF_DOCS_TAGFILE)
-@@ -832,7 +833,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -900,7 +902,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@@ -255,11 +259,11 @@ index 0000000..f09952f
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
+
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
-index ea63146..242b14e 100644
+index aa607fa..8f3771c 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
-@@ -390,9 +390,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
- SETUP_EXE(${IS_COMMANDLINE_APP})
+@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
IF(APPLE)
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 8bc0717..e069176 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -6,6 +6,7 @@
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.
</longdescription>
<use>
+ <flag name="itk">Build plugin using <pkg>dev-tcltk/itk</pkg> library</flag>
<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
<flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
<flag name="openinventor">Build OpenInventor plugin</flag>
diff --git a/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
similarity index 87%
rename from dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
rename to dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index c2990a1..5bd11d1 100644
--- a/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=4
-inherit eutils versionator cmake-utils
+inherit eutils versionator cmake-utils wxwidgets
MY_PN="OpenSceneGraph"
MY_P=${MY_PN}-${PV}
DESCRIPTION="Open source high performance 3D graphics toolkit"
HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P}/source/${MY_P}.zip"
LICENSE="wxWinLL-3 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
-openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype vnc
-wxwidgets xine xrandr zlib"
+IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype
+vnc wxwidgets xine xrandr zlib"
# NOTE: OpenAL (support missing)
-# TODO: COLLADA, FBX, OpenVRML, Performer, ITK, DCMTK
-# xulrunner? ( only 1.8 supported for now, ignore it
-# net-libs/xulrunner:1.8
-# x11-libs/gtk+:2
-# )
+# TODO: COLLADA, FBX, OpenVRML, Performer, DCMTK
RDEPEND="
x11-libs/libSM
x11-libs/libXext
@@ -48,6 +44,7 @@ RDEPEND="
ffmpeg? ( virtual/ffmpeg )
gdal? ( sci-libs/gdal )
gif? ( media-libs/giflib )
+ itk? ( dev-tcltk/itk )
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/jasper )
openexr? (
@@ -95,7 +92,6 @@ src_configure() {
mycmakeargs=(
-DWITH_OpenAL=OFF # Commented out in buildsystem
- -DWITH_XUL=OFF # Supports only xulrunner 1.8
-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
$(cmake-utils_use_with curl)
$(cmake-utils_use_build doc DOCUMENTATION)
@@ -108,6 +104,7 @@ src_configure() {
$(cmake-utils_use_with gif GIFLIB)
$(cmake-utils_use_with glut)
$(cmake-utils_use_with gtk GtkGl)
+ $(cmake-utils_use_with itk)
$(cmake-utils_use_with jpeg)
$(cmake-utils_use_with jpeg2k Jasper)
$(cmake-utils_use_with openexr OpenEXR)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2011-08-10 13:10 Christian Schmitt
0 siblings, 0 replies; 7+ messages in thread
From: Christian Schmitt @ 2011-08-10 13:10 UTC (permalink / raw
To: gentoo-commits
commit: d73d79b3665594121578e33504cb75eac7ecd243
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Wed Aug 10 08:58:34 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Wed Aug 10 13:06:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=d73d79b3
[dev-games/openscenegraph] make sure NVTT gets disabled for now.
There are NVTT ebuilds available in overlays, but the packages build system is in bad state.
---
.../files/openscenegraph-cmake.patch | 4 ++--
.../openscenegraph/openscenegraph-3.0.1.ebuild | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
index e9809e1..421f93f 100644
--- a/dev-games/openscenegraph/files/openscenegraph-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6858e70..c4cc339 100644
+index 6858e70..3bddcf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
@@ -61,7 +61,7 @@ index 6858e70..c4cc339 100644
+MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
+FIND_PACKAGE(DirectInput)
-+FIND_PACKAGE(NVTT)
++MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
ENDIF()
# Include macro utilities here
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index 5bd11d1..5d3b3c4 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -92,6 +92,7 @@ src_configure() {
mycmakeargs=(
-DWITH_OpenAL=OFF # Commented out in buildsystem
+ -DWITH_NVTT=OFF #ebuild only available in overlays and buildsystem is in bad state
-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
$(cmake-utils_use_with curl)
$(cmake-utils_use_build doc DOCUMENTATION)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2011-10-14 15:14 Christian Schmitt
0 siblings, 0 replies; 7+ messages in thread
From: Christian Schmitt @ 2011-10-14 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 65a94f0a872676ef5d9558069341ee320d81d962
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Fri Oct 14 15:13:49 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Fri Oct 14 15:13:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=65a94f0a
[dev-games/openscenegraph-3.0.1] in portage now
---
.../files/openscenegraph-cmake.patch | 288 --------------------
dev-games/openscenegraph/metadata.xml | 16 -
.../openscenegraph/openscenegraph-3.0.1.ebuild | 133 ---------
3 files changed, 0 insertions(+), 437 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
deleted file mode 100644
index 421f93f..0000000
--- a/dev-games/openscenegraph/files/openscenegraph-cmake.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6858e70..3bddcf2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
-
- # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
-
-+INCLUDE(MacroOptionalFindPackage)
-
- ################################################################################
- # Set Version Info resource file
-@@ -450,30 +451,30 @@ IF(ANDROID)
- ANDROID_3RD_PARTY()
- ELSE()
- # Common to all platforms except android:
-- FIND_PACKAGE(FreeType)
-- FIND_PACKAGE(Inventor)
-- FIND_PACKAGE(Jasper)
-- FIND_PACKAGE(OpenEXR)
-- FIND_PACKAGE(COLLADA)
-- FIND_PACKAGE(FBX)
-- FIND_PACKAGE(ZLIB)
-- FIND_PACKAGE(Xine)
-- FIND_PACKAGE(OpenVRML)
-- FIND_PACKAGE(Performer)
-- FIND_PACKAGE(GDAL)
-- FIND_PACKAGE(CURL)
-- FIND_PACKAGE(ITK)
-- FIND_PACKAGE(LibVNCServer)
-- FIND_PACKAGE(OurDCMTK)
-- FIND_PACKAGE(OpenAL)
-- FIND_PACKAGE(FFmpeg)
-- FIND_PACKAGE(DirectShow)
-- FIND_PACKAGE(SDL)
-- FIND_PACKAGE(Poppler-glib)
-- FIND_PACKAGE(RSVG)
-- FIND_PACKAGE(GtkGl)
-- FIND_PACKAGE(DirectInput)
-- FIND_PACKAGE(NVTT)
-+MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
-+MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
-+MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
-+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
-+MACRO_OPTIONAL_FIND_PACKAGE(FBX)
-+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
-+MACRO_OPTIONAL_FIND_PACKAGE(Xine)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
-+MACRO_OPTIONAL_FIND_PACKAGE(Performer)
-+MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
-+MACRO_OPTIONAL_FIND_PACKAGE(CURL)
-+MACRO_OPTIONAL_FIND_PACKAGE(ITK)
-+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
-+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
-+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
-+FIND_PACKAGE(DirectShow)
-+MACRO_OPTIONAL_FIND_PACKAGE(SDL)
-+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
-+MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
-+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
-+FIND_PACKAGE(DirectInput)
-+MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
- ENDIF()
-
- # Include macro utilities here
-@@ -485,17 +486,18 @@ IF(NOT ANDROID)
- IF (DESIRED_QT_VERSION)
-
- IF (DESIRED_QT_VERSION MATCHES 4)
-- FIND_PACKAGE(Qt4)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
- ELSE()
-- FIND_PACKAGE(Qt3)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
- ENDIF()
-
-+
- ELSE()
-
-- FIND_PACKAGE(Qt4)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
-
- IF (NOT QT4_FOUND)
-- FIND_PACKAGE(Qt3)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
- ENDIF()
-
- ENDIF()
-@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
- IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
-
-
-- FIND_PACKAGE(FLTK)
-- FIND_PACKAGE(GLUT)
-- FIND_PACKAGE(FOX)
-+ MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
-+ MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
-+ MACRO_OPTIONAL_FIND_PACKAGE(FOX)
-
- SET(wxWidgets_USE_LIBS base core gl net)
-- FIND_PACKAGE(wxWidgets)
-+ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
-
- ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
-
-@@ -530,10 +532,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
- # can use Quicktime.
- IF(NOT ANDROID)
- IF(NOT APPLE)
-- FIND_PACKAGE(GIFLIB)
-- FIND_PACKAGE(JPEG)
-- FIND_PACKAGE(PNG)
-- FIND_PACKAGE(TIFF)
-+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
-+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
-+ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
-+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
-
- # QuickTime is required for OS X, but optional for Windows.
- IF(WIN32)
-@@ -884,7 +886,7 @@ IF(BUILD_DOCUMENTATION)
- ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
- )
- #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
-+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
-
- # now set up openthreads documentation generation
- IF(BUILD_REF_DOCS_TAGFILE)
-@@ -900,7 +902,7 @@ IF(BUILD_DOCUMENTATION)
- ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
- )
- #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
-+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
-
- # Process our other doxyfiles but don't create targets for these
- CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-diff --git a/CMakeModules/COPYING-CMAKE-SCRIPTS b/CMakeModules/COPYING-CMAKE-SCRIPTS
-new file mode 100644
-index 0000000..4b41776
---- /dev/null
-+++ b/CMakeModules/COPYING-CMAKE-SCRIPTS
-@@ -0,0 +1,22 @@
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+
-+1. Redistributions of source code must retain the copyright
-+ notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+3. The name of the author may not be used to endorse or promote products
-+ derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
-deleted file mode 100644
-index e376b78..0000000
---- a/CMakeModules/FindFLTK.cmake
-+++ /dev/null
-@@ -1,52 +0,0 @@
--# Locate FLTK
--# This module defines
--# FLTK_LIBRARY
--# FLTK_FOUND, if false, do not try to link to gdal
--# FLTK_INCLUDE_DIR, where to find the headers
--#
--# $FLTK_DIR is an environment variable that would
--# correspond to the ./configure --prefix=$FLTK_DIR
--#
--# Created by Robert Osfield.
--
--FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
-- $ENV{FLTK_DIR}/include
-- $ENV{FLTK_DIR}
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /usr/local/include
-- /usr/include
-- /sw/include # Fink
-- /opt/local/include # DarwinPorts
-- /opt/csw/include # Blastwave
-- /opt/include
-- /usr/freeware/include
--)
--
--MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
--
-- FIND_LIBRARY(${MYLIBRARY}
-- NAMES ${MYLIBRARYNAME}
-- PATHS
-- $ENV{FLTK_DIR}/lib
-- $ENV{FLTK_DIR}
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /usr/local/lib
-- /usr/lib
-- /sw/lib
-- /opt/local/lib
-- /opt/csw/lib
-- /opt/lib
-- /usr/freeware/lib64
-- )
--
--ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
--
--FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
--FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
--
--SET(FLTK_FOUND "NO")
--IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
-- SET(FLTK_FOUND "YES")
--ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
-diff --git a/CMakeModules/MacroOptionalFindPackage.cmake b/CMakeModules/MacroOptionalFindPackage.cmake
-new file mode 100644
-index 0000000..f09952f
---- /dev/null
-+++ b/CMakeModules/MacroOptionalFindPackage.cmake
-@@ -0,0 +1,28 @@
-+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
-+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
-+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
-+# works like FIND_PACKAGE(), but additionally it automatically creates
-+# an option name WITH_<name>, which can be disabled via the cmake GUI.
-+# or via -DWITH_<name>=OFF
-+# The standard <name>_FOUND variables can be used in the same way
-+# as when using the normal FIND_PACKAGE()
-+
-+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+
-+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
-+ option(WITH_${_name} "Search for ${_name} package" ON)
-+ if (WITH_${_name})
-+ find_package(${_name} ${ARGN})
-+ else (WITH_${_name})
-+ set(${_name}_FOUND)
-+ set(${_name}_INCLUDE_DIR)
-+ set(${_name}_INCLUDES)
-+ set(${_name}_LIBRARY)
-+ set(${_name}_LIBRARIES)
-+ endif (WITH_${_name})
-+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
-+
-diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
-index aa607fa..8f3771c 100644
---- a/CMakeModules/OsgMacroUtils.cmake
-+++ b/CMakeModules/OsgMacroUtils.cmake
-@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
-
- IF(APPLE)
-- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
-+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
- ELSE(APPLE)
-- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
-+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
- ENDIF(APPLE)
-
- ENDMACRO(SETUP_EXAMPLE)
-diff --git a/examples/osgviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt
-index 43c023b..dd177f0 100644
---- a/examples/osgviewerFLTK/CMakeLists.txt
-+++ b/examples/osgviewerFLTK/CMakeLists.txt
-@@ -1,6 +1,6 @@
- SET(TARGET_SRC osgviewerFLTK.cpp )
-
--SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
-+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
-
- INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
-
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
deleted file mode 100644
index e069176..0000000
--- a/dev-games/openscenegraph/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-<longdescription lang="en">
-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.
-</longdescription>
- <use>
- <flag name="itk">Build plugin using <pkg>dev-tcltk/itk</pkg> library</flag>
- <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
- <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
- <flag name="openinventor">Build OpenInventor plugin</flag>
- <flag name="osgapps">Build osg applications</flag>
- <flag name="xrandr">Enable support for the X xrandr extension</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
deleted file mode 100644
index 5d3b3c4..0000000
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator cmake-utils wxwidgets
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P}/source/${MY_P}.zip"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jpeg jpeg2k
-openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype
-vnc wxwidgets xine xrandr zlib"
-
-# NOTE: OpenAL (support missing)
-# TODO: COLLADA, FBX, OpenVRML, Performer, DCMTK
-RDEPEND="
- x11-libs/libSM
- x11-libs/libXext
- virtual/glu
- virtual/opengl
- curl? ( net-misc/curl )
- examples? (
- fltk? ( x11-libs/fltk:1[opengl] )
- fox? ( x11-libs/fox:1.6[opengl] )
- glut? ( media-libs/freeglut )
- gtk? ( x11-libs/gtkglext )
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- )
- sdl? ( media-libs/libsdl )
- wxwidgets? ( x11-libs/wxGTK[opengl,X] )
- )
- ffmpeg? ( virtual/ffmpeg )
- gdal? ( sci-libs/gdal )
- gif? ( media-libs/giflib )
- itk? ( dev-tcltk/itk )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- openexr? (
- media-libs/ilmbase
- media-libs/openexr
- )
- openinventor? (
- || (
- media-libs/coin
- media-libs/openinventor
- )
- )
- pdf? ( app-text/poppler[cairo] )
- png? ( media-libs/libpng:0 )
- svg? (
- gnome-base/librsvg
- x11-libs/cairo
- )
- tiff? ( media-libs/tiff:0 )
- truetype? ( media-libs/freetype:2 )
- vnc? ( net-libs/libvncserver )
- xine? ( media-libs/xine-lib )
- xrandr? ( x11-libs/libXrandr )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-util/pkgconfig
- x11-proto/xextproto
- doc? ( app-doc/doxygen )
- xrandr? ( x11-proto/randrproto )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-cmake.patch
-}
-
-src_configure() {
- # Needed by FFmpeg
- append-cppflags -D__STDC_CONSTANT_MACROS
-
- mycmakeargs=(
- -DWITH_OpenAL=OFF # Commented out in buildsystem
- -DWITH_NVTT=OFF #ebuild only available in overlays and buildsystem is in bad state
- -DGENTOO_DOCDIR="/usr/share/doc/${PF}"
- $(cmake-utils_use_with curl)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use_build osgapps OSG_APPLICATIONS)
- $(cmake-utils_use_build examples OSG_EXAMPLES)
- $(cmake-utils_use_with ffmpeg FFmpeg)
- $(cmake-utils_use_with fltk)
- $(cmake-utils_use_with fox)
- $(cmake-utils_use_with gdal)
- $(cmake-utils_use_with gif GIFLIB)
- $(cmake-utils_use_with glut)
- $(cmake-utils_use_with gtk GtkGl)
- $(cmake-utils_use_with itk)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with openinventor Inventor)
- $(cmake-utils_use_with pdf Poppler-glib)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4)
- $(cmake-utils_use !static-libs DYNAMIC_OPENSCENEGRAPH)
- $(cmake-utils_use_with sdl)
- $(cmake-utils_use_with svg rsvg)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with truetype FreeType)
- $(cmake-utils_use_with vnc LibVNCServer)
- $(cmake-utils_use_with wxwidgets wxWidgets)
- $(cmake-utils_use_with xine)
- $(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
- $(cmake-utils_use_with zlib)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2012-11-13 15:15 Christian Schmitt
0 siblings, 0 replies; 7+ messages in thread
From: Christian Schmitt @ 2012-11-13 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 6543188895377616518eee1618e68d1dd0ace84b
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Tue Nov 13 15:13:24 2012 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Tue Nov 13 15:14:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=65431888
[dev-games/openscenegraph] add developer version 3.1.3
---
.../files/openscenegraph-3.1.3-cmake.patch | 290 ++++++++++++++++++++
.../files/openscenegraph-3.1.3-libav-0.7.patch | 24 ++
dev-games/openscenegraph/metadata.xml | 20 ++
.../openscenegraph/openscenegraph-3.1.3.ebuild | 146 ++++++++++
4 files changed, 480 insertions(+), 0 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch
new file mode 100644
index 0000000..17e95ce
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch
@@ -0,0 +1,290 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b436726..7e57f0d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -432,6 +432,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+
++INCLUDE(MacroOptionalFindPackage)
+
+ ################################################################################
+ # Set Version Info resource file
+@@ -461,34 +462,31 @@ IF(ANDROID)
+ ANDROID_3RD_PARTY()
+ ELSE()
+ # Common to all platforms except android:
+- FIND_PACKAGE(FreeType)
+- FIND_PACKAGE(Inventor)
+- FIND_PACKAGE(Jasper)
+- FIND_PACKAGE(OpenEXR)
+- FIND_PACKAGE(COLLADA)
+- FIND_PACKAGE(FBX)
+- FIND_PACKAGE(ZLIB)
+- FIND_PACKAGE(Xine)
+- FIND_PACKAGE(OpenVRML)
+- FIND_PACKAGE(Performer)
+- FIND_PACKAGE(GDAL)
+- FIND_PACKAGE(GTA)
+- FIND_PACKAGE(CURL)
+- FIND_PACKAGE(LibVNCServer)
+- FIND_PACKAGE(OurDCMTK)
+- FIND_PACKAGE(OpenAL)
+- FIND_PACKAGE(FFmpeg)
++MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
++MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
++MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
++MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
++MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
++MACRO_OPTIONAL_FIND_PACKAGE(FBX)
++MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
++MACRO_OPTIONAL_FIND_PACKAGE(Xine)
++MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
++MACRO_OPTIONAL_FIND_PACKAGE(Performer)
++MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
++MACRO_OPTIONAL_FIND_PACKAGE(GTA)
++MACRO_OPTIONAL_FIND_PACKAGE(CURL)
++MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
++MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
++MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
++MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
+ FIND_PACKAGE(DirectShow)
+- FIND_PACKAGE(SDL)
+- FIND_PACKAGE(Poppler-glib)
+- FIND_PACKAGE(RSVG)
+- FIND_PACKAGE(GtkGl)
++MACRO_OPTIONAL_FIND_PACKAGE(SDL)
++MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
++MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
++MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
+ FIND_PACKAGE(DirectInput)
+- FIND_PACKAGE(NVTT)
+-ENDIF()
+-
+-IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+- FIND_PACKAGE(ITK)
++MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
++MACRO_OPTIONAL_FIND_PACKAGE(ITK)
+ ENDIF()
+
+ # Include macro utilities here
+@@ -502,17 +500,17 @@ IF(OSG_USE_QT AND NOT ANDROID)
+ IF (DESIRED_QT_VERSION)
+
+ IF (DESIRED_QT_VERSION MATCHES 4)
+- FIND_PACKAGE(Qt4)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ ELSE()
+- FIND_PACKAGE(Qt3)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+ ENDIF()
+
+ ELSE()
+
+- FIND_PACKAGE(Qt4)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+
+ IF (NOT QT4_FOUND)
+- FIND_PACKAGE(Qt3)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+ ENDIF()
+
+ ENDIF()
+@@ -522,12 +520,12 @@ ENDIF()
+ IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
+
+
+- FIND_PACKAGE(FLTK)
+- FIND_PACKAGE(GLUT)
+- FIND_PACKAGE(FOX)
++ MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
++ MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
++ MACRO_OPTIONAL_FIND_PACKAGE(FOX)
+
+ SET(wxWidgets_USE_LIBS base core gl net)
+- FIND_PACKAGE(wxWidgets)
++ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
+
+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+
+@@ -548,10 +546,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ # can use Quicktime.
+ IF(NOT ANDROID)
+ IF(NOT APPLE)
+- FIND_PACKAGE(GIFLIB)
+- FIND_PACKAGE(JPEG)
+- FIND_PACKAGE(PNG)
+- FIND_PACKAGE(TIFF)
++ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
++ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
++ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
++ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
+
+ # QuickTime is required for OS X, but optional for Windows.
+ IF(WIN32)
+@@ -903,7 +901,7 @@ IF(BUILD_DOCUMENTATION)
+ ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+ )
+ #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
+
+ # now set up openthreads documentation generation
+ IF(BUILD_REF_DOCS_TAGFILE)
+@@ -919,7 +917,7 @@ IF(BUILD_DOCUMENTATION)
+ ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+ )
+ #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
+
+ # Process our other doxyfiles but don't create targets for these
+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+diff --git a/CMakeModules/COPYING-CMAKE-SCRIPTS b/CMakeModules/COPYING-CMAKE-SCRIPTS
+new file mode 100644
+index 0000000..4b41776
+--- /dev/null
++++ b/CMakeModules/COPYING-CMAKE-SCRIPTS
+@@ -0,0 +1,22 @@
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++
++1. Redistributions of source code must retain the copyright
++ notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products
++ derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
+deleted file mode 100644
+index e376b78..0000000
+--- a/CMakeModules/FindFLTK.cmake
++++ /dev/null
+@@ -1,52 +0,0 @@
+-# Locate FLTK
+-# This module defines
+-# FLTK_LIBRARY
+-# FLTK_FOUND, if false, do not try to link to gdal
+-# FLTK_INCLUDE_DIR, where to find the headers
+-#
+-# $FLTK_DIR is an environment variable that would
+-# correspond to the ./configure --prefix=$FLTK_DIR
+-#
+-# Created by Robert Osfield.
+-
+-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
+- $ENV{FLTK_DIR}/include
+- $ENV{FLTK_DIR}
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /usr/local/include
+- /usr/include
+- /sw/include # Fink
+- /opt/local/include # DarwinPorts
+- /opt/csw/include # Blastwave
+- /opt/include
+- /usr/freeware/include
+-)
+-
+-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
+-
+- FIND_LIBRARY(${MYLIBRARY}
+- NAMES ${MYLIBRARYNAME}
+- PATHS
+- $ENV{FLTK_DIR}/lib
+- $ENV{FLTK_DIR}
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /usr/local/lib
+- /usr/lib
+- /sw/lib
+- /opt/local/lib
+- /opt/csw/lib
+- /opt/lib
+- /usr/freeware/lib64
+- )
+-
+-ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
+-
+-FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
+-FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
+-
+-SET(FLTK_FOUND "NO")
+-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
+- SET(FLTK_FOUND "YES")
+-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
+diff --git a/CMakeModules/MacroOptionalFindPackage.cmake b/CMakeModules/MacroOptionalFindPackage.cmake
+new file mode 100644
+index 0000000..f09952f
+--- /dev/null
++++ b/CMakeModules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,28 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++ option(WITH_${_name} "Search for ${_name} package" ON)
++ if (WITH_${_name})
++ find_package(${_name} ${ARGN})
++ else (WITH_${_name})
++ set(${_name}_FOUND)
++ set(${_name}_INCLUDE_DIR)
++ set(${_name}_INCLUDES)
++ set(${_name}_LIBRARY)
++ set(${_name}_LIBRARIES)
++ endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index aa607fa..8f3771c 100644
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
+
+ IF(APPLE)
+- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
++ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
+ ELSE(APPLE)
+- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+ ENDIF(APPLE)
+
+ ENDMACRO(SETUP_EXAMPLE)
+diff --git a/examples/osgviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt
+index 43c023b..dd177f0 100644
+--- a/examples/osgviewerFLTK/CMakeLists.txt
++++ b/examples/osgviewerFLTK/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ SET(TARGET_SRC osgviewerFLTK.cpp )
+
+-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
++SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
+
+ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
+
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch b/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch
new file mode 100644
index 0000000..323d3a0
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch
@@ -0,0 +1,24 @@
+diff --git a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
+index dc79df3..c362b97 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
++++ b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
+@@ -9,13 +9,13 @@ extern "C"
+ #define FF_API_OLD_SAMPLE_FMT 0
+ #include <errno.h> // for error codes defined in avformat.h
+ #include <stdint.h>
+-#include <avcodec.h>
+-#include <avformat.h>
+-#include <avdevice.h>
+-#include <mathematics.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavdevice/avdevice.h>
++#include <libavutil/mathematics.h>
+
+-#ifdef USE_SWSCALE
+- #include <swscale.h>
++#ifdef USE_SWSCALE
++ #include <libswscale/swscale.h>
+ #endif
+
+ #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50,38,0)
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
new file mode 100644
index 0000000..1e904d0
--- /dev/null
+++ b/dev-games/openscenegraph/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<maintainer>
+ <email>reavertm@gentoo.org</email>
+ <name>Maciej Mrozowski</name>
+</maintainer>
+<longdescription lang="en">
+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.
+</longdescription>
+ <use>
+ <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
+ <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
+ <flag name="itk">Build <pkg>dev-tcltk/itk</pkg> plugin</flag>
+ <flag name="openinventor">Build OpenInventor plugin</flag>
+ <flag name="osgapps">Build osg applications</flag>
+ <flag name="xrandr">Enable support for the X xrandr extension</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild
new file mode 100644
index 0000000..234d5ab
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils cmake-utils flag-o-matic wxwidgets
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
+SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype vnc
+wxwidgets xine xrandr zlib"
+
+# NOTE: OpenAL (support missing)
+# TODO: COLLADA, FBX, OpenVRML, Performer, DCMTK
+RDEPEND="
+ x11-libs/libSM
+ x11-libs/libXext
+ virtual/glu
+ virtual/opengl
+ curl? ( net-misc/curl )
+ examples? (
+ fltk? ( x11-libs/fltk:1[opengl] )
+ fox? ( x11-libs/fox:1.6[opengl] )
+ glut? ( media-libs/freeglut )
+ gtk? ( x11-libs/gtkglext )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ )
+ sdl? ( media-libs/libsdl )
+ wxwidgets? ( x11-libs/wxGTK[opengl,X] )
+ )
+ ffmpeg? ( virtual/ffmpeg )
+ gdal? ( sci-libs/gdal )
+ gif? ( media-libs/giflib )
+ itk? ( dev-tcltk/itk )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ openexr? (
+ media-libs/ilmbase
+ media-libs/openexr
+ )
+ openinventor? (
+ || (
+ media-libs/coin
+ media-libs/openinventor
+ )
+ )
+ pdf? ( app-text/poppler[cairo] )
+ png? ( media-libs/libpng:0 )
+ svg? (
+ gnome-base/librsvg
+ x11-libs/cairo
+ )
+ tiff? ( media-libs/tiff:0 )
+ truetype? ( media-libs/freetype:2 )
+ vnc? ( net-libs/libvncserver )
+ xine? ( media-libs/xine-lib )
+ xrandr? ( x11-libs/libXrandr )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ virtual/pkgconfig
+ x11-proto/xextproto
+ doc? ( app-doc/doxygen )
+ xrandr? ( x11-proto/randrproto )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.3-cmake.patch
+ "${FILESDIR}"/${PN}-3.1.3-libav-0.7.patch
+)
+
+src_configure() {
+ if use examples && use wxwidgets; then
+ WX_GTK_VER="2.8"
+ need-wxwidgets unicode
+ fi
+
+ # Needed by FFmpeg
+ append-cppflags -D__STDC_CONSTANT_MACROS
+
+ mycmakeargs=(
+ -DWITH_OpenAL=OFF # Commented out in buildsystem
+ -DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+ $(cmake-utils_use_with curl)
+ $(cmake-utils_use_build doc DOCUMENTATION)
+ $(cmake-utils_use_build osgapps OSG_APPLICATIONS)
+ $(cmake-utils_use_build examples OSG_EXAMPLES)
+ $(cmake-utils_use_with ffmpeg FFmpeg)
+ $(cmake-utils_use_with fltk)
+ $(cmake-utils_use_with fox)
+ $(cmake-utils_use_with gdal)
+ $(cmake-utils_use_with gif GIFLIB)
+ $(cmake-utils_use_with glut)
+ $(cmake-utils_use_with gtk GtkGl)
+ $(cmake-utils_use_with itk)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with jpeg2k Jasper)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use_with openinventor Inventor)
+ $(cmake-utils_use_with pdf Poppler-glib)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4)
+ $(cmake-utils_use !static-libs DYNAMIC_OPENSCENEGRAPH)
+ $(cmake-utils_use_with sdl)
+ $(cmake-utils_use_with svg rsvg)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with truetype FreeType)
+ $(cmake-utils_use_with vnc LibVNCServer)
+ $(cmake-utils_use_with wxwidgets wxWidgets)
+ $(cmake-utils_use_with xine)
+ $(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
+ $(cmake-utils_use_with zlib)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+}
+
+pkg_postinst() {
+ if has_version 'dev-games/simgear'; then
+ ewarn "dev-games/simgear has been detected and may need to be rebuilt now."
+ ewarn "Please run the following:"
+ ewarn " # emerge -1 dev-games/simgear"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2013-02-22 9:54 Christian Schmitt
0 siblings, 0 replies; 7+ messages in thread
From: Christian Schmitt @ 2013-02-22 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 1e5e909c1ffb3c339f1960797061760875fe915b
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Fri Feb 22 09:37:54 2013 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Fri Feb 22 09:38:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=1e5e909c
[dev-games/openscenegraph-3.1.4] bump version
---
...make.patch => openscenegraph-3.1.4-cmake.patch} | 31 +++++++++++--------
...ph-3.1.3.ebuild => openscenegraph-3.1.4.ebuild} | 2 +-
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch
similarity index 94%
rename from dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch
rename to dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch
index 17e95ce..307a8e3 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.1.3-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b436726..7e57f0d 100644
+index b6007f9..6d32675 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -432,6 +432,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+@@ -463,6 +463,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
@@ -10,7 +10,7 @@ index b436726..7e57f0d 100644
################################################################################
# Set Version Info resource file
-@@ -461,34 +462,31 @@ IF(ANDROID)
+@@ -492,36 +493,36 @@ IF(ANDROID)
ANDROID_3RD_PARTY()
ELSE()
# Common to all platforms except android:
@@ -59,16 +59,20 @@ index b436726..7e57f0d 100644
+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
FIND_PACKAGE(DirectInput)
- FIND_PACKAGE(NVTT)
--ENDIF()
--
--IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
-- FIND_PACKAGE(ITK)
+- FIND_PACKAGE(Asio)
+- FIND_PACKAGE(ZeroConf)
+MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
++MACRO_OPTIONAL_FIND_PACKAGE(Asio)
++MACRO_OPTIONAL_FIND_PACKAGE(ZeroConf)
+ ENDIF()
+
+ IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+- FIND_PACKAGE(ITK)
+MACRO_OPTIONAL_FIND_PACKAGE(ITK)
ENDIF()
# Include macro utilities here
-@@ -502,17 +500,17 @@ IF(OSG_USE_QT AND NOT ANDROID)
+@@ -535,17 +536,17 @@ IF(OSG_USE_QT AND NOT ANDROID)
IF (DESIRED_QT_VERSION)
IF (DESIRED_QT_VERSION MATCHES 4)
@@ -90,7 +94,7 @@ index b436726..7e57f0d 100644
ENDIF()
ENDIF()
-@@ -522,12 +520,12 @@ ENDIF()
+@@ -555,12 +556,12 @@ ENDIF()
IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
@@ -107,7 +111,7 @@ index b436726..7e57f0d 100644
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
-@@ -548,10 +546,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+@@ -581,10 +582,11 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
# can use Quicktime.
IF(NOT ANDROID)
IF(NOT APPLE)
@@ -119,10 +123,11 @@ index b436726..7e57f0d 100644
+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
+ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
-
++
# QuickTime is required for OS X, but optional for Windows.
IF(WIN32)
-@@ -903,7 +901,7 @@ IF(BUILD_DOCUMENTATION)
+ FIND_PACKAGE(QuickTime)
+@@ -943,7 +945,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@@ -131,7 +136,7 @@ index b436726..7e57f0d 100644
# now set up openthreads documentation generation
IF(BUILD_REF_DOCS_TAGFILE)
-@@ -919,7 +917,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -959,7 +961,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
diff --git a/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild
similarity index 98%
rename from dev-games/openscenegraph/openscenegraph-3.1.3.ebuild
rename to dev-games/openscenegraph/openscenegraph-3.1.4.ebuild
index 8135da7..2ca2d5c 100644
--- a/dev-games/openscenegraph/openscenegraph-3.1.3.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild
@@ -83,7 +83,7 @@ S=${WORKDIR}/${MY_P}
DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
PATCHES=(
- "${FILESDIR}"/${PN}-3.1.3-cmake.patch
+ "${FILESDIR}"/${PN}-3.1.4-cmake.patch
"${FILESDIR}"/${PN}-3.1.3-libav-0.7.patch
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2013-08-18 10:43 Christian Schmitt
0 siblings, 0 replies; 7+ messages in thread
From: Christian Schmitt @ 2013-08-18 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 6a5632ec4f215dd22384534f24821f73be0df972
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Sun Aug 18 10:24:57 2013 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Sun Aug 18 10:25:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=6a5632ec
[dev-games/openscenegraph] version bump to 3.2.0
---
.../files/openscenegraph-3.1.3-libav-0.7.patch | 24 -----------
...make.patch => openscenegraph-3.2.0-cmake.patch} | 50 ++++++++++++++--------
.../files/openscenegraph-3.2.0-ffmpeg.patch | 13 ++++++
...ph-3.1.4.ebuild => openscenegraph-3.2.0.ebuild} | 4 +-
4 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch b/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch
deleted file mode 100644
index 323d3a0..0000000
--- a/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-index dc79df3..c362b97 100644
---- a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-+++ b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-@@ -9,13 +9,13 @@ extern "C"
- #define FF_API_OLD_SAMPLE_FMT 0
- #include <errno.h> // for error codes defined in avformat.h
- #include <stdint.h>
--#include <avcodec.h>
--#include <avformat.h>
--#include <avdevice.h>
--#include <mathematics.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavdevice/avdevice.h>
-+#include <libavutil/mathematics.h>
-
--#ifdef USE_SWSCALE
-- #include <swscale.h>
-+#ifdef USE_SWSCALE
-+ #include <libswscale/swscale.h>
- #endif
-
- #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50,38,0)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.0-cmake.patch
similarity index 90%
rename from dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch
rename to dev-games/openscenegraph/files/openscenegraph-3.2.0-cmake.patch
index 307a8e3..a527c32 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.0-cmake.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b6007f9..6d32675 100644
+index be8f2b4..20e325a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -463,6 +463,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+@@ -483,6 +483,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
@@ -10,7 +10,7 @@ index b6007f9..6d32675 100644
################################################################################
# Set Version Info resource file
-@@ -492,36 +493,36 @@ IF(ANDROID)
+@@ -512,37 +513,35 @@ IF(ANDROID)
ANDROID_3RD_PARTY()
ELSE()
# Common to all platforms except android:
@@ -29,7 +29,6 @@ index b6007f9..6d32675 100644
- FIND_PACKAGE(CURL)
- FIND_PACKAGE(LibVNCServer)
- FIND_PACKAGE(OurDCMTK)
-- FIND_PACKAGE(OpenAL)
- FIND_PACKAGE(FFmpeg)
+MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
+MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
@@ -46,7 +45,6 @@ index b6007f9..6d32675 100644
+MACRO_OPTIONAL_FIND_PACKAGE(CURL)
+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
FIND_PACKAGE(DirectShow)
- FIND_PACKAGE(SDL)
@@ -59,7 +57,9 @@ index b6007f9..6d32675 100644
+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
FIND_PACKAGE(DirectInput)
- FIND_PACKAGE(NVTT)
-- FIND_PACKAGE(Asio)
+- IF (NOT WIN32)
+- FIND_PACKAGE(Asio)
+- ENDIF()
- FIND_PACKAGE(ZeroConf)
+MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
+MACRO_OPTIONAL_FIND_PACKAGE(Asio)
@@ -72,10 +72,13 @@ index b6007f9..6d32675 100644
ENDIF()
# Include macro utilities here
-@@ -535,17 +536,17 @@ IF(OSG_USE_QT AND NOT ANDROID)
- IF (DESIRED_QT_VERSION)
+@@ -557,16 +556,16 @@ IF(OSG_USE_QT AND NOT ANDROID)
- IF (DESIRED_QT_VERSION MATCHES 4)
+ IF (DESIRED_QT_VERSION)
+ IF (DESIRED_QT_VERSION MATCHES 5)
+- FIND_PACKAGE(Qt5Widgets)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets)
+ ELSEIF (DESIRED_QT_VERSION MATCHES 4)
- FIND_PACKAGE(Qt4)
+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
ELSE()
@@ -85,16 +88,25 @@ index b6007f9..6d32675 100644
ELSE()
-- FIND_PACKAGE(Qt4)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+- FIND_PACKAGE(Qt5Widgets QUIET)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets QUIET)
- IF (NOT QT4_FOUND)
-- FIND_PACKAGE(Qt3)
-+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
- ENDIF()
+ IF ( Qt5Widgets_FOUND )
+ # CMake 2.8.8 or greater required
+@@ -582,10 +581,10 @@ IF(OSG_USE_QT AND NOT ANDROID)
+ ENDIF( )
+ IF ( NOT Qt5Widgets_FOUND )
+- FIND_PACKAGE(Qt4)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+
+ IF (NOT QT4_FOUND)
+- FIND_PACKAGE(Qt3)
++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+ ENDIF()
+ ENDIF()
ENDIF()
-@@ -555,12 +556,12 @@ ENDIF()
+@@ -601,12 +600,12 @@ ENDIF()
IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
@@ -111,7 +123,7 @@ index b6007f9..6d32675 100644
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
-@@ -581,10 +582,11 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+@@ -627,10 +626,11 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
# can use Quicktime.
IF(NOT ANDROID)
IF(NOT APPLE)
@@ -127,7 +139,7 @@ index b6007f9..6d32675 100644
# QuickTime is required for OS X, but optional for Windows.
IF(WIN32)
FIND_PACKAGE(QuickTime)
-@@ -943,7 +945,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -988,7 +988,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@@ -136,7 +148,7 @@ index b6007f9..6d32675 100644
# now set up openthreads documentation generation
IF(BUILD_REF_DOCS_TAGFILE)
-@@ -959,7 +961,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -1004,7 +1004,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.0-ffmpeg.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.0-ffmpeg.patch
new file mode 100644
index 0000000..2157978
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.0-ffmpeg.patch
@@ -0,0 +1,13 @@
+diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
+index 497969f..4ec9f13 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
++++ b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
+@@ -279,7 +279,7 @@ bool FFmpegDecoder::readNextPacketNormal()
+ int error = av_read_frame(m_format_context.get(), &packet);
+ if (error < 0)
+ {
+- if (error == AVERROR_EOF || url_feof(m_format_context.get()->pb))
++ if (error == AVERROR_EOF || m_format_context.get()->pb->eof_reached)
+ end_of_stream = true;
+ else {
+ OSG_FATAL << "av_read_frame() returned " << AvStrError(error) << std::endl;
diff --git a/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.0.ebuild
similarity index 97%
rename from dev-games/openscenegraph/openscenegraph-3.1.4.ebuild
rename to dev-games/openscenegraph/openscenegraph-3.2.0.ebuild
index e788633..fbdabb4 100644
--- a/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.0.ebuild
@@ -83,8 +83,8 @@ S=${WORKDIR}/${MY_P}
DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
PATCHES=(
- "${FILESDIR}"/${PN}-3.1.4-cmake.patch
- "${FILESDIR}"/${PN}-3.1.3-libav-0.7.patch
+ "${FILESDIR}"/${PN}-3.2.0-cmake.patch
+ "${FILESDIR}"/${PN}-3.2.0-ffmpeg.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
@ 2014-08-26 19:52 Michael Weber
0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-08-26 19:52 UTC (permalink / raw
To: gentoo-commits
commit: a92172782de87a0351053690bd7ef8920d5ce94e
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue Aug 26 19:52:06 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 26 19:52:06 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a9217278
Fix freetype plugin (needed for newer flightgear canvas)
Package-Manager: portage-2.2.12
Manifest-Sign-Key: 62EEF090
---
.../files/openscenegraph-3.2.0-freetype2.patch | 39 ++++++
.../openscenegraph/openscenegraph-3.2.0-r1.ebuild | 148 +++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.0-freetype2.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.0-freetype2.patch
new file mode 100644
index 0000000..0fffb25
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.0-freetype2.patch
@@ -0,0 +1,39 @@
+--- OpenSceneGraph-3.2.0/src/osgPlugins/freetype/FreeTypeFont.cpp
++++ OpenSceneGraph-3.2.0/src/osgPlugins/freetype/FreeTypeFont.cpp
+@@ -14,8 +14,8 @@
+ #include "FreeTypeFont.h"
+ #include "FreeTypeLibrary.h"
+
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftbbox.h>
++#include <freetype2/ftoutln.h>
++#include <freetype2/ftbbox.h>
+
+ #include <osg/Notify>
+ #include <osg/io_utils>
+--- OpenSceneGraph-3.2.0/CMakeModules/FindFreeType.cmake
++++ OpenSceneGraph-3.2.0/CMakeModules/FindFreeType.cmake
+@@ -48,19 +48,19 @@
+ /opt/csw
+ /opt
+ /usr/freeware
+- PATH_SUFFIXES include
++ PATH_SUFFIXES include include/freetype2
+ )
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ $ENV{FREETYPE_DIR}/include/freetype2
+ NO_DEFAULT_PATH
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES include/freetype2
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ /usr/local/include/freetype2
+ /usr/include/freetype2
+ /usr/local/X11R6/include/freetype2
diff --git a/dev-games/openscenegraph/openscenegraph-3.2.0-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.0-r1.ebuild
new file mode 100644
index 0000000..7cbe227
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.2.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils cmake-utils flag-o-matic wxwidgets
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
+SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype vnc
+wxwidgets xine xrandr zlib"
+
+# NOTE: OpenAL (support missing)
+# TODO: COLLADA, FBX, OpenVRML, Performer, DCMTK
+RDEPEND="
+ x11-libs/libSM
+ x11-libs/libXext
+ virtual/glu
+ virtual/opengl
+ curl? ( net-misc/curl )
+ examples? (
+ fltk? ( x11-libs/fltk:1[opengl] )
+ fox? ( x11-libs/fox:1.6[opengl] )
+ glut? ( media-libs/freeglut )
+ gtk? ( x11-libs/gtkglext )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ )
+ sdl? ( media-libs/libsdl )
+ wxwidgets? ( x11-libs/wxGTK[opengl,X] )
+ )
+ ffmpeg? ( virtual/ffmpeg )
+ gdal? ( sci-libs/gdal )
+ gif? ( media-libs/giflib )
+ itk? ( dev-tcltk/itk )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ openexr? (
+ media-libs/ilmbase
+ media-libs/openexr
+ )
+ openinventor? (
+ || (
+ media-libs/coin
+ media-libs/openinventor
+ )
+ )
+ pdf? ( app-text/poppler[cairo] )
+ png? ( media-libs/libpng:0 )
+ svg? (
+ gnome-base/librsvg
+ x11-libs/cairo
+ )
+ tiff? ( media-libs/tiff:0 )
+ truetype? ( media-libs/freetype:2 )
+ vnc? ( net-libs/libvncserver )
+ xine? ( media-libs/xine-lib )
+ xrandr? ( x11-libs/libXrandr )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ virtual/pkgconfig
+ x11-proto/xextproto
+ doc? ( app-doc/doxygen )
+ xrandr? ( x11-proto/randrproto )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.0-cmake.patch
+ "${FILESDIR}"/${PN}-3.2.0-ffmpeg.patch
+ "${FILESDIR}"/${PN}-3.2.0-freetype2.patch
+)
+
+src_configure() {
+ if use examples && use wxwidgets; then
+ WX_GTK_VER="2.8"
+ need-wxwidgets unicode
+ fi
+
+ # Needed by FFmpeg
+ append-cppflags -D__STDC_CONSTANT_MACROS
+
+ mycmakeargs=(
+ -DWITH_OpenAL=OFF # Commented out in buildsystem
+ -DWITH_NVTT=OFF #broken, just to be sure
+ -DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+ $(cmake-utils_use_with curl)
+ $(cmake-utils_use_build doc DOCUMENTATION)
+ $(cmake-utils_use_build osgapps OSG_APPLICATIONS)
+ $(cmake-utils_use_build examples OSG_EXAMPLES)
+ $(cmake-utils_use_with ffmpeg FFmpeg)
+ $(cmake-utils_use_with fltk)
+ $(cmake-utils_use_with fox)
+ $(cmake-utils_use_with gdal)
+ $(cmake-utils_use_with gif GIFLIB)
+ $(cmake-utils_use_with glut)
+ $(cmake-utils_use_with gtk GtkGl)
+ $(cmake-utils_use_with itk)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with jpeg2k Jasper)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use_with openinventor Inventor)
+ $(cmake-utils_use_with pdf Poppler-glib)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4)
+ $(cmake-utils_use !static-libs DYNAMIC_OPENSCENEGRAPH)
+ $(cmake-utils_use_with sdl)
+ $(cmake-utils_use_with svg rsvg)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with truetype FreeType)
+ $(cmake-utils_use_with vnc LibVNCServer)
+ $(cmake-utils_use_with wxwidgets wxWidgets)
+ $(cmake-utils_use_with xine)
+ $(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
+ $(cmake-utils_use_with zlib)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+}
+
+pkg_postinst() {
+ if has_version 'dev-games/simgear'; then
+ ewarn "dev-games/simgear has been detected and may need to be rebuilt now."
+ ewarn "Please run the following:"
+ ewarn " # emerge -1 dev-games/simgear"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-08-26 19:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-14 15:14 [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/ Christian Schmitt
-- strict thread matches above, loose matches on Subject: below --
2014-08-26 19:52 Michael Weber
2013-08-18 10:43 Christian Schmitt
2013-02-22 9:54 Christian Schmitt
2012-11-13 15:15 Christian Schmitt
2011-08-10 13:10 Christian Schmitt
2011-08-02 6:52 Christian Schmitt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox