- rm link.patch; added xine12.patch

Changed files:
    OpenSceneGraph-link.patch -> 1.3
    OpenSceneGraph.spec -> 1.35
    xine12.patch -> 1.1

diff --git a/OpenSceneGraph-link.patch b/OpenSceneGraph-link.patch
deleted file mode 100644 (file)
index b3fee78..0000000
--- a/OpenSceneGraph-link.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- OpenSceneGraph-2.8.4/CMakeLists.txt~       2011-04-07 03:58:09.000000000 +0200
-+++ OpenSceneGraph-2.8.4/CMakeLists.txt        2011-04-21 13:05:37.905970129 +0200
-@@ -153,6 +153,7 @@
-     FIND_PACKAGE(X11)
-     # Some Unicies need explicit linkage to the Math library or the build fails.
-     FIND_LIBRARY(MATH_LIBRARY m)
-+    FIND_LIBRARY(DL_LIBRARY dl)
- ENDIF(UNIX)
- 
- # Make the headers visible to everything
---- OpenSceneGraph-2.8.4/src/osg/CMakeLists.txt~       2010-03-17 18:41:14.000000000 +0100
-+++ OpenSceneGraph-2.8.4/src/osg/CMakeLists.txt        2011-04-21 13:06:14.552636208 +0200
-@@ -326,7 +326,7 @@
- LINK_INTERNAL(${LIB_NAME}     
-     OpenThreads
- )
--LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT}    ${MATH_LIBRARY} )
-+LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT}    ${MATH_LIBRARY} ${DL_LIBRARY})
- LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} )
- 
- INCLUDE(ModuleInstall OPTIONAL)

diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index 8e98c1545f9db44e08c4bff46c0b244a6d248dda..2256c3804ea02297814fa10a2709bf21243fd5ce 100644 (file)
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -9,7 +9,7 @@ Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-
 # Source0-md5: c43a25d023e635c3566b2083d8e6d956
 #Source1:      osg-doxygen-0.9.1.tar.gz
 ## Source1-md5:        7e6d785d1b763aaeae03c2dc4c148805
-Patch0:                %{name}-link.patch
+Patch0:                xine12.patch
 URL:           http://www.openscenegraph.org/projects/osg/
 BuildRequires: cairo-devel
 BuildRequires: cmake

diff --git a/xine12.patch b/xine12.patch
new file mode 100644 (file)
index 0000000..8f02897
--- /dev/null
+++ b/xine12.patch
@@ -0,0 +1,13 @@
+--- 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);