diff options
| -rw-r--r-- | libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | 47 | ||||
| -rw-r--r-- | libraries/OpenSceneGraph/OpenSceneGraph.info | 6 | ||||
| -rw-r--r-- | libraries/OpenSceneGraph/README | 3 | ||||
| -rw-r--r-- | libraries/OpenSceneGraph/giflib.patch | 12 |
4 files changed, 22 insertions, 46 deletions
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index bd24ea73e2..1696730c23 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.2.1} +VERSION=${VERSION:-3.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,34 +47,23 @@ unzip $CWD/$PRGNAM-$VERSION.zip cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -sed -i 's|#include <curl/types.h>||' src/osgPlugins/curl/ReaderWriterCURL.cpp - -# Fix building with giflib-5.1.1 -- thanks to Arch Linux -# https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib.patch?h=packages/openscenegraph -patch -p1 < $CWD/giflib.patch - -cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ - -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 -make install DESTDIR=$PKG + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.info b/libraries/OpenSceneGraph/OpenSceneGraph.info index e695622d72..b1b1c09e12 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.info +++ b/libraries/OpenSceneGraph/OpenSceneGraph.info @@ -1,8 +1,8 @@ PRGNAM="OpenSceneGraph" -VERSION="3.2.1" +VERSION="3.4.0" HOMEPAGE="http://www.openscenegraph.org/" -DOWNLOAD="http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" -MD5SUM="4f95206a1eef218bd007c3b43e1334f5" +DOWNLOAD="http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.4.0/source/OpenSceneGraph-3.4.0.zip" +MD5SUM="a5e762c64373a46932e444f6f7332496" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/OpenSceneGraph/README b/libraries/OpenSceneGraph/README index 6a4c0f9524..d52ee36bd1 100644 --- a/libraries/OpenSceneGraph/README +++ b/libraries/OpenSceneGraph/README @@ -7,5 +7,4 @@ 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. +ffmpeg, gdal and gtkglext are optional dependencies. diff --git a/libraries/OpenSceneGraph/giflib.patch b/libraries/OpenSceneGraph/giflib.patch deleted file mode 100644 index 8bb72a8d3b..0000000000 --- a/libraries/OpenSceneGraph/giflib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp ---- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400 -+++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400 -@@ -561,7 +561,7 @@ - *width_ret = giffile->SWidth; - *height_ret = giffile->SHeight; - *numComponents_ret = 4; -- DGifCloseFile(giffile); -+ DGifCloseFile(giffile, NULL); - return buffer; - } - |