diff options
-rw-r--r-- | libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | 4 | ||||
-rw-r--r-- | libraries/OpenSceneGraph/OpenSceneGraph.info | 6 | ||||
-rw-r--r-- | libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch | 19 |
3 files changed, 4 insertions, 25 deletions
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index 76e2b624d5..4720604deb 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:-3.0.1} +VERSION=${VERSION:-3.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -52,8 +52,6 @@ find -L . \ \( -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 diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.info b/libraries/OpenSceneGraph/OpenSceneGraph.info index 13daa06d82..b0e46ecc2e 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.info +++ b/libraries/OpenSceneGraph/OpenSceneGraph.info @@ -1,8 +1,8 @@ PRGNAM="OpenSceneGraph" -VERSION="3.0.1" +VERSION="3.2.1" HOMEPAGE="http://www.openscenegraph.org/" -DOWNLOAD="http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0.1/source/OpenSceneGraph-3.0.1.zip" -MD5SUM="c43a25d023e635c3566b2083d8e6d956" +DOWNLOAD="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" +MD5SUM="4f95206a1eef218bd007c3b43e1334f5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch b/libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch deleted file mode 100644 index a69a6604e0..0000000000 --- a/libraries/OpenSceneGraph/openscenegraph-3.0.1-xinelib12x.patch +++ /dev/null @@ -1,19 +0,0 @@ -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); |