[OpenSceneGraph] Upstream update.
corsepiu
corsepiu at fedoraproject.org
Wed Aug 14 12:28:20 UTC 2013
commit dc5ae0c992a37c5a2e20ad6227d69c7d4304fe0c
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Wed Aug 14 14:28:04 2013 +0200
Upstream update.
- Rebase patches.
.gitignore | 1 -
0001-Cmake-fixes.patch | 76 +++++++++++++++++++++
0002-Fix-invalid-char.patch | 25 +++++++
0003-Activate-osgviewerWX.patch | 30 ++++++++
OpenSceneGraph-3.0.1.diff | 141 ---------------------------------------
OpenSceneGraph.spec | 37 ++++++++--
sources | 1 -
7 files changed, 160 insertions(+), 151 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b511a84..c4bdabd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/OpenSceneGraph-3.0.1.zip
/OpenSceneGraph-3.2.0.zip
diff --git a/0001-Cmake-fixes.patch b/0001-Cmake-fixes.patch
new file mode 100644
index 0000000..e07136b
--- /dev/null
+++ b/0001-Cmake-fixes.patch
@@ -0,0 +1,76 @@
+From a496de4b577ca127498e25284e5d9b8736c6dc37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Wed, 14 Aug 2013 12:30:03 +0200
+Subject: [PATCH 1/3] Cmake fixes.
+
+---
+ CMakeLists.txt | 4 ++--
+ CMakeModules/FindFLTK.cmake | 2 +-
+ CMakeModules/OsgMacroUtils.cmake | 2 +-
+ examples/osgviewerSDL/CMakeLists.txt | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be8f2b4..95b322b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++ #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
+
+ # now set up openthreads documentation generation
+ IF(BUILD_REF_DOCS_TAGFILE)
+@@ -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)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++ #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc 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/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
+index e376b78..9162109 100644
+--- a/CMakeModules/FindFLTK.cmake
++++ b/CMakeModules/FindFLTK.cmake
+@@ -9,7 +9,7 @@
+ #
+ # Created by Robert Osfield.
+
+-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
++FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.H FL/Fl.h
+ $ENV{FLTK_DIR}/include
+ $ENV{FLTK_DIR}
+ ~/Library/Frameworks
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index aa607fa..36df873 100644
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -447,7 +447,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 )
+ ENDIF(APPLE)
+
+ ENDMACRO(SETUP_EXAMPLE)
+diff --git a/examples/osgviewerSDL/CMakeLists.txt b/examples/osgviewerSDL/CMakeLists.txt
+index 8498958..c66420f 100644
+--- a/examples/osgviewerSDL/CMakeLists.txt
++++ b/examples/osgviewerSDL/CMakeLists.txt
+@@ -13,7 +13,7 @@ ELSE()
+ # Depending on platform (or SDL version),
+ # this may or may not link successfully.
+ SET(TARGET_SRC osgviewerSDL.cpp)
+- SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
++ SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
+ ENDIF()
+ ENDIF()
+
+--
+1.8.3.1
+
diff --git a/0002-Fix-invalid-char.patch b/0002-Fix-invalid-char.patch
new file mode 100644
index 0000000..55fe92a
--- /dev/null
+++ b/0002-Fix-invalid-char.patch
@@ -0,0 +1,25 @@
+From eeac1c0f80572a6fbecb53f7f3c0c43b0e37e58e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Wed, 14 Aug 2013 12:31:47 +0200
+Subject: [PATCH 2/3] Fix invalid char.
+
+---
+ AUTHORS.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/AUTHORS.txt b/AUTHORS.txt
+index a4f2b2b..3368f0f 100644
+--- a/AUTHORS.txt
++++ b/AUTHORS.txt
+@@ -377,7 +377,7 @@ Nicolas Brodu
+ Nick Black
+ Mojtaba Fathi
+ Mirko Viviani
+-Mikkel Gjøl
++Mikkel Gjøl
+ Mike Garrity
+ Miha Ravsel
+ Michael Polak
+--
+1.8.3.1
+
diff --git a/0003-Activate-osgviewerWX.patch b/0003-Activate-osgviewerWX.patch
new file mode 100644
index 0000000..b82c50b
--- /dev/null
+++ b/0003-Activate-osgviewerWX.patch
@@ -0,0 +1,30 @@
+From fd9157fc6f7258d14b8dee753184c410d3c90293 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Wed, 14 Aug 2013 12:36:32 +0200
+Subject: [PATCH 3/3] Activate osgviewerWX.
+
+---
+ examples/CMakeLists.txt | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 22b58b7..dffc586 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -200,11 +200,9 @@ IF(DYNAMIC_OPENSCENEGRAPH)
+ ADD_SUBDIRECTORY(osgviewerFOX)
+ ENDIF(FOX_FOUND)
+
+- IF (wxWidgets_FOUND AND CMAKE_BUILD_TYPE)
+- IF (${CMAKE_BUILD_TYPE} STREQUAL "Release")
++ IF (wxWidgets_FOUND)
+ ADD_SUBDIRECTORY(osgviewerWX)
+- ENDIF()
+- ENDIF()
++ ENDIF(wxWidgets_FOUND)
+
+ IF ( (QT4_FOUND OR Qt5Widgets_FOUND) AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
+
+--
+1.8.3.1
+
diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index d64f28e..d4bb379 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -1,24 +1,29 @@
#
-# Copyright (c) 2005 - 2012 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005 - 2013 Ralf Corsepius, Ulm, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-%define apivers 3.0.1
-%define srcvers 3.0.1
+%define apivers 3.2.0
+%define srcvers 3.2.0
Name: OpenSceneGraph
Version: %{apivers}
-Release: 18%{?dist}
+Release: 1%{?dist}
Summary: High performance real-time graphics toolkit
Group: Applications/Multimedia
# The OSGPL is just the wxWidgets license.
License: wxWidgets
URL: http://www.openscenegraph.org/
-Source0: http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{version}/source/OpenSceneGraph-%{version}.zip
+# Announced as stable, but published under developer_releases ;)
+Source0: http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
-Patch0: OpenSceneGraph-%{version}.diff
+Patch1: 0001-Cmake-fixes.patch
+Patch2: 0002-Fix-invalid-char.patch
+# Upstream deactivated building osgviewerWX for obscure reasons
+# Reactivate for now.
+Patch3: 0004-Activate-osgviewerWX.patch
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -26,6 +31,7 @@ BuildRequires: libXmu-devel
BuildRequires: libX11-devel
BuildRequires: Inventor-devel
BuildRequires: freeglut-devel
+BuildRequires: libgta-devel
BuildRequires: libjpeg-devel
BuildRequires: libungif-devel
BuildRequires: libtiff-devel
@@ -66,7 +72,9 @@ for rapid development of graphics applications.
%prep
%setup -q -c
cd OpenSceneGraph-%{version}
-%{?PATCH0:%patch0 -p1}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
sed -i -e 's,\.:/usr/share/fonts/ttf:,.:%{_fontdir}:/usr/share/fonts/ttf:,' \
src/osgText/Font.cpp
@@ -301,6 +309,7 @@ Sample applications for OpenSceneGraph
%{_bindir}/osganimationsolid
%{_bindir}/osganimationtimeline
%{_bindir}/osganimationviewer
+%{_bindir}/osgatomiccounter
%{_bindir}/osgautocapture
%{_bindir}/osgautotransform
%{_bindir}/osgbillboard
@@ -311,6 +320,7 @@ Sample applications for OpenSceneGraph
%{_bindir}/osgclip
%{_bindir}/osgcluster
%{_bindir}/osgcompositeviewer
+%{_bindir}/osgcomputeshaders
%{_bindir}/osgcopy
%{_bindir}/osgcubemap
%{_bindir}/osgdatabaserevisions
@@ -323,9 +333,9 @@ Sample applications for OpenSceneGraph
%{_bindir}/osgfont
%{_bindir}/osgforest
%{_bindir}/osgfpdepth
+%{_bindir}/osgframerenderer
%{_bindir}/osgfxbrowser
%{_bindir}/osggameoflife
-%{_bindir}/osggeodemo
%{_bindir}/osggeometry
%{_bindir}/osggeometryshaders
%{_bindir}/osggpx
@@ -338,6 +348,7 @@ Sample applications for OpenSceneGraph
%{_bindir}/osgkdtree
%{_bindir}/osgkeyboard
%{_bindir}/osgkeyboardmouse
+%{_bindir}/osgkeystone
%{_bindir}/osglauncher
%{_bindir}/osglight
%{_bindir}/osglightpoint
@@ -347,13 +358,16 @@ Sample applications for OpenSceneGraph
%{_bindir}/osgmemorytest
%{_bindir}/osgmotionblur
%{_bindir}/osgmovie
+%{_bindir}/osgmultiplemovies
%{_bindir}/osgmultiplerendertargets
%{_bindir}/osgmultitexture
%{_bindir}/osgmultitexturecontrol
+%{_bindir}/osgmultitouch
%{_bindir}/osgmultiviewpaging
%{_bindir}/osgoccluder
%{_bindir}/osgocclusionquery
%{_bindir}/osgoit
+%{_bindir}/osgoscdevice
%{_bindir}/osgoutline
%{_bindir}/osgpackeddepthstencil
%{_bindir}/osgpagedlod
@@ -386,6 +400,8 @@ Sample applications for OpenSceneGraph
%{_bindir}/osgshape
%{_bindir}/osgsharedarray
%{_bindir}/osgsidebyside
+%{_bindir}/osgsimpleshaders
+%{_bindir}/osgsimplegl3
%{_bindir}/osgsimplifier
%{_bindir}/osgsimulation
%{_bindir}/osgslice
@@ -397,6 +413,7 @@ Sample applications for OpenSceneGraph
%{_bindir}/osgteapot
%{_bindir}/osgterrain
%{_bindir}/osgtessellate
+%{_bindir}/osgtessellationshaders
%{_bindir}/osgtext
%{_bindir}/osgtext3D
%{_bindir}/osgtexture1D
@@ -477,6 +494,10 @@ Development files for OpenThreads.
%{_includedir}/OpenThreads
%changelog
+* Wed Aug 14 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.2.0-1
+- Upstream update.
+- Rebase patches.
+
* Tue Aug 13 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.0.1-18
- Fix %%changelog dates.
diff --git a/sources b/sources
index 5ac15d6..8b77202 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c43a25d023e635c3566b2083d8e6d956 OpenSceneGraph-3.0.1.zip
4980f8692712a24d4c99f363f80c6814 OpenSceneGraph-3.2.0.zip
More information about the scm-commits
mailing list