- updated to 3.1.5. Works with ffmpeg 1.1.3

diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index 1d6b2f027b6841a1cb060b00a7e2357cf14a7854..d4c2db480cb0a6dd44b7e324ee4bcba1b7a30740 100644 (file)
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -1,15 +1,14 @@
 Summary:       Open Scene Graph - real-time visualization library
 Summary(pl.UTF-8):     Open Scene Graph - biblioteka do wizualizacji
 Name:          OpenSceneGraph
-Version:       3.0.1
+Version:       3.1.5
 Release:       0.1
 License:       OpenSceneGraph Public Licence (based on LGPL with exceptions)
 Group:         X11/Libraries
-Source0:       http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0.1/source/%{name}-%{version}.zip
-# Source0-md5: c43a25d023e635c3566b2083d8e6d956
+Source0:       http://www.openscenegraph.org/downloads/developer_releases/%{name}-%{version}.zip
+# Source0-md5: 1c90b851b109849c985006486ef59822
 #Source1:      osg-doxygen-0.9.1.tar.gz
 ## Source1-md5:        7e6d785d1b763aaeae03c2dc4c148805
-Patch0:                xine12.patch
 URL:           http://www.openscenegraph.org/projects/osg/
 BuildRequires: QtCore-devel
 BuildRequires: QtOpenGL-devel
@@ -79,7 +78,6 @@ Wtyczki dla biblioteki Open Scene Graph.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build
@@ -107,39 +105,39 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libOpenThreads.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libOpenThreads.so.12
 %attr(755,root,root) %{_libdir}/libosg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosg.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosg.so.97
 %attr(755,root,root) %{_libdir}/libosgAnimation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgAnimation.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgAnimation.so.97
 %attr(755,root,root) %{_libdir}/libosgDB.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgDB.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgDB.so.97
 %attr(755,root,root) %{_libdir}/libosgFX.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgFX.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgFX.so.97
 %attr(755,root,root) %{_libdir}/libosgGA.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgGA.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgGA.so.97
 %attr(755,root,root) %{_libdir}/libosgManipulator.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgManipulator.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgManipulator.so.97
 %attr(755,root,root) %{_libdir}/libosgParticle.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgParticle.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgParticle.so.97
 %attr(755,root,root) %{_libdir}/libosgPresentation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgPresentation.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgPresentation.so.97
 %attr(755,root,root) %{_libdir}/libosgQt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgQt.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgQt.so.97
 %attr(755,root,root) %{_libdir}/libosgShadow.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgShadow.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgShadow.so.97
 %attr(755,root,root) %{_libdir}/libosgSim.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgSim.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgSim.so.97
 %attr(755,root,root) %{_libdir}/libosgTerrain.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgTerrain.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgTerrain.so.97
 %attr(755,root,root) %{_libdir}/libosgText.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgText.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgText.so.97
 %attr(755,root,root) %{_libdir}/libosgUtil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgUtil.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgUtil.so.97
 %attr(755,root,root) %{_libdir}/libosgViewer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgViewer.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgViewer.so.97
 %attr(755,root,root) %{_libdir}/libosgVolume.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgVolume.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgVolume.so.97
 %attr(755,root,root) %{_libdir}/libosgWidget.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgWidget.so.80
+%attr(755,root,root) %ghost %{_libdir}/libosgWidget.so.97
 
 %files plugins
 %defattr(644,root,root,755)

diff --git a/xine12.patch b/xine12.patch
deleted file mode 100644 (file)
index 8f02897..0000000
--- a/xine12.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c.orig      2012-05-20 11:31:15.157158848 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c   2012-05-20 11:38:48.992055552 +0200
-@@ -2769,8 +2769,8 @@ init_class(xine_t* xine, void* vo_visual
-       clear(rgb_class, sizeof(rgbout_class_t));
- 
-       rgb_class->driver_class.open_plugin     = open_plugin;
--      rgb_class->driver_class.get_identifier  = get_identifier;
--      rgb_class->driver_class.get_description = get_description;
-+      rgb_class->driver_class.identifier  = get_identifier;
-+      rgb_class->driver_class.description = get_description;
-       rgb_class->driver_class.dispose         = dispose_class;
- 
-       return(rgb_class);