libraries/OpenSceneGraph: Updated for version 3.0.1.

Also disabled ffmpeg (incompatible)
and added two fixes for curl and xine.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 41 insertions, 5 deletions

diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
index 4f04780df284..29297d8776ad 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
@@ -6,7 +6,7 @@
 # Maintained by Jordan Evans <jordanevans19@gmail.com>
 
 PRGNAM=OpenSceneGraph
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,10 +54,24 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# One fix for xine>=1.2.x and for curl>=0.7.24 (tnx Gentoo)
+patch -p0 < $CWD/openscenegraph-3.0.1-xinelib12x.patch
+sed -i 's|#include <curl/types.h>||' src/osgPlugins/curl/ReaderWriterCURL.cpp
+
+# Our ffmpeg is incompatible ATM
 cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
-  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS="PATH=FFMPEG_LIBAVCODEC_INCLUDE_DIRS-NOTFOUND" \
+  -DFFMPEG_LIBAVCODEC_LIBRARIES="FILEPATH=FFMPEG_LIBAVCODEC_LIBRARIES-NOTFOUND" \
+  -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS="PATH=FFMPEG_LIBAVDEVICE_INCLUDE_DIRS-NOTFOUND" \
+  -DFFMPEG_LIBAVDEVICE_LIBRARIES="FILEPATH=FFMPEG_LIBAVDEVICE_LIBRARIES-NOTFOUND" \
+  -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS="PATH=FFMPEG_LIBAVFORMAT_INCLUDE_DIRS-NOTFOUND" \
+  -DFFMPEG_LIBAVFORMAT_LIBRARIES="FILEPATH=FFMPEG_LIBAVFORMAT_LIBRARIES-NOTFOUND" \
+  -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS="PATH=FFMPEG_LIBAVUTIL_INCLUDE_DIRS-NOTFOUND" \
+  -DFFMPEG_LIBAVUTIL_LIBRARIES="FILEPATH=FFMPEG_LIBAVUTIL_LIBRARIES-NOTFOUND" \
+  -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS="PATH=FFMPEG_LIBSWSCALE_INCLUDE_DIRS-NOTFOUND" \
+  -DFFMPEG_LIBSWSCALE_LIBRARIES="FILEPATH=FFMPEG_LIBSWSCALE_LIBRARIES-NOTFOUND" \
   -DCMAKE_INSTALL_PREFIX=/usr
 
 make
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.info b/libraries/OpenSceneGraph/OpenSceneGraph.info
index 9b2662142a6f..13daa06d822a 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.info
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenSceneGraph"
-VERSION="2.8.3"
+VERSION="3.0.1"
 HOMEPAGE="http://www.openscenegraph.org/"
-DOWNLOAD="http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-2.8.3/source/OpenSceneGraph-2.8.3.zip"
-MD5SUM="dc43b9161555c4eab7f5a678dd4e01ab"
+DOWNLOAD="http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0.1/source/OpenSceneGraph-3.0.1.zip"
+MD5SUM="c43a25d023e635c3566b2083d8e6d956"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/OpenSceneGraph/README b/libraries/OpenSceneGraph/README
index 6b779386ea69..6a4c0f9524be 100644
--- a/libraries/OpenSceneGraph/README
+++ b/libraries/OpenSceneGraph/README
@@ -6,3 +6,6 @@ an object oriented framework on top of OpenGL freeing the developer
 from implementing and optimizing low level graphics calls, and
 provides many additional utilities for rapid development of graphics
 applications.
+
+gdal, gtkglext and OpenAL are optional dependencies.
+Also ffmpeg would be one, but support here it's broken ATM.
diff --git a/libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch b/libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch
new file mode 100644
index 000000000000..a69a6604e003
--- /dev/null
+++ b/libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/397643
+
+--- src/osgPlugins/xine/video_out_rgb.c
++++ src/osgPlugins/xine/video_out_rgb.c
+@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
+ 	clear(rgb_class, sizeof(rgbout_class_t));
+ 
+ 	rgb_class->driver_class.open_plugin     = open_plugin;
++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
+ 	rgb_class->driver_class.get_identifier  = get_identifier;
+ 	rgb_class->driver_class.get_description = get_description;
++#else
++	rgb_class->driver_class.identifier  = get_identifier(NULL);
++	rgb_class->driver_class.description = get_description(NULL);
++#endif
++
+ 	rgb_class->driver_class.dispose         = dispose_class;
+ 
+ 	return(rgb_class);