[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
commit: 3584d8bdee08b4307ad4f1362107ad3a05468335
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Feb 24 05:56:02 2024 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Feb 24 05:58:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3584d8bd
dev-games/openscenegraph: fix bug #923788
Closes: https://bugs.gentoo.org/923788
Signed-off-by: Maciej Mrozowski gentoo.org>
...nscenegraph-3.6.5-remove-register-keyword.patch | 172 +
.../openscenegraph-3.6.5-r114.ebuild | 1 +
2 files changed, 173 insertions(+)
diff --git
a/dev-games/openscenegraph/files/openscenegraph-3.6.5-remove-register-keyword.patch
b/dev-games/openscenegraph/files/openscenegraph-3.6.5-remove-register-keyword.patch
new file mode 100644
index ..474e738e05c3
--- /dev/null
+++
b/dev-games/openscenegraph/files/openscenegraph-3.6.5-remove-register-keyword.patch
@@ -0,0 +1,172 @@
+diff -ruN osg/src/osgPlugins/cfg/ConfigLexer.cpp
my/src/osgPlugins/cfg/ConfigLexer.cpp
+--- osg/src/osgPlugins/cfg/ConfigLexer.cpp 2020-01-31 12:03:07.0
+0100
my/src/osgPlugins/cfg/ConfigLexer.cpp 2024-02-24 06:23:01.866597764
+0100
+@@ -832,9 +832,9 @@
+
+ YY_DECL
+ {
+- register yy_state_type yy_current_state;
+- register char *yy_cp, *yy_bp;
+- register int yy_act;
++ yy_state_type yy_current_state;
++ char *yy_cp, *yy_bp;
++ int yy_act;
+
+ #line 35 ".././ConfigLexer.l"
+
+@@ -881,7 +881,7 @@
+ yy_match:
+ do
+ {
+- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
++ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ if ( yy_accept[yy_current_state] )
+ {
+ yy_last_accepting_state = yy_current_state;
+@@ -1598,9 +1598,9 @@
+
+ int yyFlexLexer::yy_get_next_buffer()
+ {
+- register char *dest = yy_current_buffer->yy_ch_buf;
+- register char *source = yytext_ptr;
+- register int number_to_move, i;
++ char *dest = yy_current_buffer->yy_ch_buf;
++ char *source = yytext_ptr;
++ int number_to_move, i;
+ int ret_val;
+
+ if ( yy_c_buf_p > _current_buffer->yy_ch_buf[yy_n_chars + 1] )
+@@ -1730,14 +1730,14 @@
+
+ yy_state_type yyFlexLexer::yy_get_previous_state()
+ {
+- register yy_state_type yy_current_state;
+- register char *yy_cp;
++ yy_state_type yy_current_state;
++ char *yy_cp;
+
+ yy_current_state = yy_start;
+
+ for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+ {
+- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] :
1);
++ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ if ( yy_accept[yy_current_state] )
+ {
+ yy_last_accepting_state = yy_current_state;
+@@ -1764,10 +1764,10 @@
+
+ yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state )
+ {
+- register int yy_is_jam;
+- register char *yy_cp = yy_c_buf_p;
++ int yy_is_jam;
++ char *yy_cp = yy_c_buf_p;
+
+- register YY_CHAR yy_c = 1;
++ YY_CHAR yy_c = 1;
+ if ( yy_accept[yy_current_state] )
+ {
+ yy_last_accepting_state = yy_current_state;
+@@ -1786,9 +1786,9 @@
+ }
+
+
+-void yyFlexLexer::yyunput( int c, register char* yy_bp )
++void yyFlexLexer::yyunput( int c, char* yy_bp )
+ {
+- register char *yy_cp = yy_c_buf_p;
++ char *yy_cp = yy_c_buf_p;
+
+ /* undo effects of setting up yytext */
+ *yy_cp = yy_hold_char;
+@@ -1796,10 +1796,10 @@
+ if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ { /* need to shift things up to make room */
+ /* +2 for EOB chars. */
+- register int number_to_move = yy_n_chars + 2;
+- register char *dest = _current_buffer->yy_ch_buf[
++ int number_to_move = yy_n_chars + 2;
++ char *dest = _current_buffer->yy_ch_buf[
+ yy_current_buffer->yy_buf_size + 2];
+- register char *source =
++ char *source =
+ _current_buffer->yy_ch_buf[number_to_move];
+
+ while ( source > yy_current_buffer->yy_ch_buf )
+@@ -2119,7 +2119,7 @@
+ int n;
+ #endif
+ {
+- register int i;
++ int i;
+ for ( i = 0; i < n; ++i )
+ s1[i] = s2[i];
+ }
+@@ -2133,7 +2133,7 @@
+ yyconst char *s;
+ #endif
+ {
+- register int n;
++ int n;
+ for ( n = 0; s[n]; ++n )
+ ;
+
+diff -ruN osg/src/osgPlugins/cfg/ConfigParser.cpp
my/src/osgPlugins/cfg/ConfigParser.cpp
+--- osg/src/osgPlugins/cfg/ConfigParser.cpp2020-01-31 12:03:07.0
+0100
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
commit: 4ad9aed9c70ec387d36e928871207af5107c7450
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Sep 26 18:14:25 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Sat Sep 26 18:16:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad9aed9
dev-games/openscenegraph: use boost::asio to fix building RestHttpDevice plugin
Closes: https://bugs.gentoo.org/744001
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski gentoo.org>
.../openscenegraph-3.6.5-use_boost_asio.patch | 274 +
...3.6.5.ebuild => openscenegraph-3.6.5-r1.ebuild} | 6 +-
2 files changed, 277 insertions(+), 3 deletions(-)
diff --git
a/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
new file mode 100644
index 000..4dfeedcaf19
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
@@ -0,0 +1,274 @@
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt
osg-my/CMakeLists.txt
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt 2020-01-31
12:03:07.0 +0100
osg-my/CMakeLists.txt 2020-09-26 18:45:41.191099844 +0200
+@@ -764,7 +764,7 @@
+ FIND_PACKAGE(DirectInput)
+ FIND_PACKAGE(NVTT)
+ IF (NOT WIN32)
+-FIND_PACKAGE(Asio)
++FIND_PACKAGE(Boost)
+ ENDIF()
+ FIND_PACKAGE(ZeroConf)
+
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake
osg-my/CMakeModules/FindAsio.cmake
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake
2020-01-31 12:03:07.0 +0100
osg-my/CMakeModules/FindAsio.cmake 1970-01-01 01:00:00.0 +0100
+@@ -1,22 +0,0 @@
+-# Locate ASIO-headers (http://think-async.com/Asio)
+-# This module defines
+-# ASIO_FOUND, if false, do not try to link to gdal
+-# ASIO_INCLUDE_DIR, where to find the headers
+-#
+-# Created by Stephan Maximilian Huber
+-
+-FIND_PATH(ASIO_INCLUDE_DIR
+- NAMES
+-asio.hpp
+- PATHS
+-/usr/include
+-/usr/local/include
+-)
+-
+-SET(ASIO_FOUND "NO")
+-IF(ASIO_INCLUDE_DIR)
+-FIND_PACKAGE( Boost 1.37 )
+-IF(Boost_FOUND)
+-SET(ASIO_FOUND "YES")
+-ENDIF()
+-ENDIF()
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt
osg-my/src/osgPlugins/CMakeLists.txt
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt
2020-01-31 12:03:07.0 +0100
osg-my/src/osgPlugins/CMakeLists.txt 2020-09-26 20:04:59.345449848
+0200
+@@ -299,13 +299,13 @@
+ #
+ # Device integration plugins
+ #
+-IF (SDL_FOUND)
++IF(SDL_FOUND)
+ ADD_PLUGIN_DIRECTORY(sdl)
+-ENDIF(SDL_FOUND)
++ENDIF()
+
+-IF(ASIO_FOUND)
++IF(Boost_FOUND)
+ ADD_PLUGIN_DIRECTORY(RestHttpDevice)
+-ENDIF(ASIO_FOUND)
++ENDIF()
+
+
+ IF(ZEROCONF_FOUND)
+diff -ruN
OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt
osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt
+---
OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt
2020-01-31 12:03:07.0 +0100
osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt2020-09-26
18:46:57.096859301 +0200
+@@ -1,6 +1,5 @@
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+-INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
+-
++
+ SET(TARGET_SRC
+ connection.cpp
+ io_service_pool.cpp
+@@ -26,7 +25,7 @@
+ RestHttpDevice.hpp
+ )
+
+-SET(TARGET_ADDED_LIBRARIES osgPresentation )
++SET(TARGET_ADDED_LIBRARIES osgPresentation)
+
+ end var setup ###
+ SETUP_PLUGIN(resthttp)
+diff -ruN
OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp
osg-my/src/osgPlugins/RestHttpDevice/connection.cpp
+---
OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp
2020-01-31 12:03:07.0 +0100
osg-my/src/osgPlugins/RestHttpDevice/connection.cpp2020-09-26
18:32:19.690576603 +0200
+@@ -37,14 +37,14 @@
+ void connection::start()
+ {
+ OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
+-
++
+ socket_.async_read_some(asio::buffer(buffer_),
+ boost::bind(::handle_read, shared_from_this(),
+ asio::placeholders::error,
+ asio::placeholders::bytes_transferred));
+ }
+
+-void connection::handle_read(const asio::error_code& e,
++void connection::handle_read(const boost::system::error_code& e,
+ std::size_t bytes_transferred)
+ {
+ if (!e)
+@@ -82,12 +82,12 @@
+ // handler returns. The connection class's destructor closes the socket.
+ }
+
+-void connection::handle_write(const asio::error_code& e)
++void connection::handle_write(const boost::system::error_code& e)
+ {
+ if (!e)
+ {
+ // Initiate graceful connection closure.
+-asio::error_code ignored_ec;
++boost::system::error_code ignored_ec;
+ socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
+ }
+
+diff
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
commit: 0ec5d47a8dd8656ace81f69e8eef7069e2735909
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 21:38:13 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 21:41:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec5d47a
dev-games/openscenegraph: 3.6.3 version bump
Closes: https://bugs.gentoo.org/601772
Closes: https://bugs.gentoo.org/659254
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-games/openscenegraph/Manifest | 1 +
.../files/openscenegraph-3.6.3-cmake.patch | 12 ++
.../files/openscenegraph-3.6.3-docdir.patch| 73 ++
dev-games/openscenegraph/metadata.xml | 1 +
.../openscenegraph/openscenegraph-3.6.3.ebuild | 150 +
5 files changed, 237 insertions(+)
diff --git a/dev-games/openscenegraph/Manifest
b/dev-games/openscenegraph/Manifest
index bb69360afc5..f002f9143fe 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1 +1,2 @@
DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B
f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6
SHA512
f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
+DIST OpenSceneGraph-3.6.3.tar.gz 5784660 BLAKE2B
b117a10d7be8fa456d739eb04f218cf9565ea4bd5a91642ada3bde5cc194a71809482ca2e6f2b4ff977fd26f3a855e27392ac60921e4217b72ebd828efa4df0e
SHA512
5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.3-cmake.patch
b/dev-games/openscenegraph/files/openscenegraph-3.6.3-cmake.patch
new file mode 100644
index 000..708c6865968
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.3-cmake.patch
@@ -0,0 +1,12 @@
+--- a/CMakeModules/OsgMacroUtils.cmake
b/CMakeModules/OsgMacroUtils.cmake
+@@ -463,7 +463,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+ IF(APPLE)
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION
share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/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 )
+ IF(MSVC)
+ INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb
DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples
CONFIGURATIONS RelWithDebInfo)
+ INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb
DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples
CONFIGURATIONS Debug)
+
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.3-docdir.patch
b/dev-games/openscenegraph/files/openscenegraph-3.6.3-docdir.patch
new file mode 100644
index 000..75dd48b3068
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.3-docdir.patch
@@ -0,0 +1,73 @@
+From 1dfc0e3218e15b94f7b145c8f5b2bf61974b9573 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 23 Dec 2018 22:10:49 +0100
+Subject: [PATCH 1/2] Add GNUInstallDirs for standard installation directories
+
+Distributions are given standard variables for already existing hooks.
+Multiarch libdirs is taken care of automagically.
+Raises minimum cmake version by a little (2.8.5 is enough).
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 064d4e289..777265e0e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -13,7 +13,7 @@ SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5 FATAL_ERROR)
+
+ if(COMMAND cmake_policy)
+ # Works around warnings libraries linked against that don't
+@@ -767,6 +767,7 @@ ELSE()
+ # FIND_PACKAGE(PythonLibs)
+ ENDIF()
+
++INCLUDE(GNUInstallDirs)
+ # Include macro utilities here
+ INCLUDE(OsgMacroUtils)
+
+--
+2.20.1
+
+
+From d2be900de7b5fb4e23d9429c02269f671962c670 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 23 Dec 2018 22:12:33 +0100
+Subject: [PATCH 2/2] Replace OPENJPEG_INSTALL_DOC_DIR with
+ CMAKE_INSTALL_DOCDIR
+
+This changes the default doc installdir to DATAROOTDIR/doc/PROJECT_NAME
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 777265e0e..e1ed1bd51 100644
+--- a/CMakeLists.txt
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
commit: ba90204c71d1a9fcaf31e4282a795cebaa9a4283
Author: Maciej Mrozowski gentoo org>
AuthorDate: Wed Jan 13 06:41:08 2016 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Wed Jan 13 06:42:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba90204c
dev-games/openscenegraph: Improve 3.4.0 ebuild (fix automagic deps, restore ppc
keywords, rework SDL dependencies)
Package-Manager: portage-2.2.26
.../files/openscenegraph-3.4.0-cmake.patch | 2 +-
dev-games/openscenegraph/metadata.xml | 4 ++--
.../openscenegraph/openscenegraph-3.4.0.ebuild | 22 --
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
index 4633b29..59f971c 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
@@ -73,7 +73,7 @@
IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
-FIND_PACKAGE(Lua52)
-+MACRO_OPTIONAL_FIND_PACKAGE(Lua52)
++MACRO_OPTIONAL_FIND_PACKAGE(Lua)
IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
-FIND_PACKAGE(Lua51)
+MACRO_OPTIONAL_FIND_PACKAGE(Lua51)
diff --git a/dev-games/openscenegraph/metadata.xml
b/dev-games/openscenegraph/metadata.xml
index 28883fa..2d18898 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -13,10 +13,10 @@ The OpenSceneGraph is an open source high performance 3D
graphics toolkit, used
Enable support for dev-cpp/asio library
Build examples using x11-libs/fox
library
Enable support for sci-libs/gdal
library
+Enable support for geospatial data LAS LiDAR format using
sci-geosciences/liblas
Build OpenInventor plugin
Build osg applications
-Use media-libs/libsdl2 additionally to
- media-libs/libsdl
+Use media-libs/libsdl2 additionally to
media-libs/libsdl
Enable support for the X xrandr extension
diff --git a/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild
b/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild
index ae1f110..86d35bc 100644
--- a/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild
@@ -16,14 +16,15 @@
SRC_URI="http://trac.openscenegraph.org/downloads/developer_releases/${MY_P}.zip
LICENSE="wxWinLL-3 LGPL-2.1"
SLOT="0/34" # Subslot consists of major + minor version number
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk
jpeg
-jpeg2k openexr openinventor osgapps pdf png qt4 qt5 sdl sdl2 svg tiff truetype
vnc
-wxwidgets xine xrandr zlib"
+jpeg2k las lua openexr openinventor osgapps pdf png qt4 qt5 sdl sdl2 svg tiff
truetype
+vnc wxwidgets xine xrandr zlib"
REQUIRED_USE="
qt4? ( !qt5 )
qt5? ( !qt4 )
+ sdl2? ( sdl )
"
# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK
@@ -39,8 +40,7 @@ RDEPEND="
fox? ( x11-libs/fox:1.6[opengl] )
glut? ( media-libs/freeglut )
gtk? ( x11-libs/gtkglext )
- sdl? ( media-libs/libsdl
- sdl2? ( media-libs/libsdl2 ) )
+ sdl2? ( media-libs/libsdl2 )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
)
ffmpeg? ( virtual/ffmpeg )
@@ -52,6 +52,8 @@ RDEPEND="
)
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
+ las? ( >=sci-geosciences/liblas-1.8.0 )
+ lua? ( >=dev-lang/lua-5.1.5:* )
openexr? (
media-libs/ilmbase
media-libs/openexr
@@ -70,6 +72,7 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtwidgets:5
)
+ sdl? ( media-libs/libsdl )
svg? (
gnome-base/librsvg
x11-libs/cairo
@@ -109,6 +112,10 @@ src_configure() {
-DDYNAMIC_OPENSCENEGRAPH=ON
-DWITH_ITK=OFF
-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+ -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+ -DOSG_USE_LOCAL_LUA_SOURCE=OFF
+ -DWITH_Lua51=OFF # We use CMake-version FindLua.cmake instead
+ -DWITH_Lua52=OFF
$(cmake-utils_use_with asio)
$(cmake-utils_use_with curl)
$(cmake-utils_use_build doc DOCUMENTATION)
@@ -121,15 +128,18 @@ src_configure() {
$(cmake-utils_use_with gif GIFLIB)
$(cmake-utils_use_with glut)
$(cmake-utils_use_with gstreamer GStreamer)
+ $(cmake-utils_use_with gstreamer GLIB)
$(cmake-utils_use_with gtk GtkGl)
$(cmake-utils_use_with jpeg)
$(cmake-utils_use_with jpeg2k Jasper)
+
[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/
commit: ea2bedc45b72e754aefe50d2f7b710f094978b30
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jan 8 18:04:39 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jan 11 13:22:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2bedc4
dev-games/openscenegraph: Bump to version 3.4.0
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler gentoo.org>
dev-games/openscenegraph/Manifest | 1 +
.../files/openscenegraph-3.4.0-cmake.patch | 297 +
dev-games/openscenegraph/metadata.xml | 2 +
.../openscenegraph/openscenegraph-3.4.0.ebuild | 155 +++
4 files changed, 455 insertions(+)
diff --git a/dev-games/openscenegraph/Manifest
b/dev-games/openscenegraph/Manifest
index c4dd9df..681704b 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1 +1,2 @@
DIST OpenSceneGraph-3.2.1.zip 7219212 SHA256
d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d SHA512
f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e
WHIRLPOOL
ef47a41a316fae86341cdebecaeceb41cf56b5f11fdf93e8218bb9aa9eaa28fc2fc9122efbeb8dce69fa01d8c8b6a2460fab69190714ca53abfa5d347a0ae1bc
+DIST OpenSceneGraph-3.4.0.zip 7975023 SHA256
5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e SHA512
b598a7d68c9e5bf840d7b0a59a334037c3b6efe4d2dce333280b63a8ccef1b9a37cd5ff32b98f18e110ff9cbc48226f588e143cb1d68405edda3c60ab2f3f73a
WHIRLPOOL
fa2ede4e0f9300d122390338ebea15814ffbe80887c3f8d6cb392c0cb478eaf7ba2f67c310f17658620b8c1745a453d4c47c26c5702fa549b7ef73257321b639
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
new file mode 100644
index 000..4633b29
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
@@ -0,0 +1,297 @@
+--- OpenSceneGraph-3.4.0/CMakeLists.txt
OpenSceneGraph-3.4.0/CMakeLists.txt
+@@ -607,6 +607,7 @@
+
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+
++INCLUDE(MacroOptionalFindPackage)
+
+
+ # Set Version header file
+@@ -651,53 +652,53 @@
+ 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(FFmpeg)
+-FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
+-FIND_PACKAGE(GLIB COMPONENTS gobject)
++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(FFmpeg)
++MACRO_OPTIONAL_FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
++MACRO_OPTIONAL_FIND_PACKAGE(GLIB COMPONENTS gobject)
+ FIND_PACKAGE(DirectShow)
+-FIND_PACKAGE(SDL2)
+-FIND_PACKAGE(SDL)
+-FIND_PACKAGE(Poppler-glib)
+-FIND_PACKAGE(RSVG)
+-FIND_PACKAGE(GtkGl)
++MACRO_OPTIONAL_FIND_PACKAGE(SDL2)
++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)
++MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
+ IF (NOT WIN32)
+-FIND_PACKAGE(Asio)
++MACRO_OPTIONAL_FIND_PACKAGE(Asio)
+ ENDIF()
+ FIND_PACKAGE(ZeroConf)
+
+-FIND_PACKAGE(LIBLAS)
++MACRO_OPTIONAL_FIND_PACKAGE(LIBLAS)
+
+ IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
+-FIND_PACKAGE(Lua52)
++MACRO_OPTIONAL_FIND_PACKAGE(Lua52)
+ IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
+-FIND_PACKAGE(Lua51)
++MACRO_OPTIONAL_FIND_PACKAGE(Lua51)
+ ENDIF()
+ ENDIF()
+
+ # V8 and Python plugins are tests for linking against these libraries but
aren't functionality beyond this.
+-# FIND_PACKAGE(V8)
+-# FIND_PACKAGE(PythonLibs)
++# MACRO_OPTIONAL_FIND_PACKAGE(V8)
++#
