From deaede04e75465e3e3fd9859c859afaeef2b0caf Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 4 Jun 2016 02:37:24 +0200 Subject: [PATCH] dev-games/OpenSceneGraph: bump to 3.5.3 --- metadata/repository_mask.conf | 6 ++ .../OpenSceneGraph-3.5.3.exheres-0 | 90 +++++++++++++++++++ ....5.3-Fix-wrong-jpeg-boolean-handling.patch | 32 +++++++ 3 files changed, 128 insertions(+) create mode 100644 packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.3.exheres-0 create mode 100644 packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.3-Fix-wrong-jpeg-boolean-handling.patch diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf index e4efcc70..e06a9a93 100644 --- a/metadata/repository_mask.conf +++ b/metadata/repository_mask.conf @@ -12,3 +12,9 @@ *description = [ Mask scm versions ] ]] +dev-games/OpenSceneGraph[>=3.5.3] [[ + author = [ Julian Ospald ] + date = [ 04 Jun 2016 ] + token = testing + description = [ Breaks games-engines/openmw ] +]] diff --git a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.3.exheres-0 b/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.3.exheres-0 new file mode 100644 index 00000000..a2feee43 --- /dev/null +++ b/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.3.exheres-0 @@ -0,0 +1,90 @@ +# Copyright 2013-2014 Thomas Witt +# Copyright 2016 Julian Ospald +# Distributed under the terms of the GNU General Public License v2 + +MY_PN="OpenSceneGraph" +MY_PNV=${MY_PN}-${PV} + +require github [ user=openscenegraph project=${MY_PN} tag=${MY_PNV} ] +require cmake [ api=2 ] + +SUMMARY="High performance 3D graphics toolkit" +DESCRIPTION=" + The OpenSceneGraph is an open source high performance 3D graphics toolkit, + used by application developers in fields such as visual simulation, games, + virtual reality, scientific visualization and modelling. Written entirely + in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, + IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph + is now well established as the world leading scene graph technology, used + widely in the vis-sim, space, scientific, oil-gas, games and virtual reality + industries. +" + +HOMEPAGE="http://${PN}.org" + +LICENCES="wxWinLL-3 LGPL-2.1" +SLOT="0" +PLATFORMS="~amd64 ~x86" +MYOPTIONS=" + ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]] + ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]] +" + +DEPENDENCIES=" + build: + virtual/unzip + build+run: + app-text/poppler[cairo] + dev-libs/glib:2 + media-libs/freetype:2 + media-libs/giflib:= + media-libs/gstreamer:1.0 + media-libs/ilmbase + media-libs/jasper + media-libs/libpng:= + media-libs/openexr + media-libs/SDL:0 + media-libs/tiff + media-plugins/gst-plugins-base:1.0 + net-misc/curl + sys-libs/zlib + x11-dri/mesa + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/qtbase:5 + providers:ffmpeg? ( media/ffmpeg ) + providers:ijg-jpeg? ( media-libs/jpeg:= ) + providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) + providers:libav? ( media/libav ) +" + +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PNV}-Fix-wrong-jpeg-boolean-handling.patch +) + +CMAKE_SRC_CONFIGURE_PARAMS=( + -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 + -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1 + -DCMAKE_DISABLE_FIND_PACKAGE_FBX= + -DCMAKE_DISABLE_FIND_PACKAGE_Xine=1 + -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Performer=1 + -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=1 + -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 + -DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1 + -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=1 + -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1 + -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Lua51=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Lua52=1 + -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 + -DOSG_USE_QT=ON + -DOSG_USE_LOCAL_LUA_SOURCE=OFF + -DDESIRED_QT_VERSION=5 + -DOPENGL_PROFILE=GL2 + -DDYNAMIC_OPENSCENEGRAPH=ON + -DLIB_POSTFIX="" +) + diff --git a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.3-Fix-wrong-jpeg-boolean-handling.patch b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.3-Fix-wrong-jpeg-boolean-handling.patch new file mode 100644 index 00000000..c14d804b --- /dev/null +++ b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.3-Fix-wrong-jpeg-boolean-handling.patch @@ -0,0 +1,32 @@ +From a20af6ee2e4b666fec79c2f545e548bd9470bbe6 Mon Sep 17 00:00:00 2001 +From: Julian Ospald +Date: Wed, 16 Mar 2016 21:51:29 +0100 +Subject: [PATCH] Fix wrong jpeg boolean handling + +Upstream: reported only https://github.com/openscenegraph/OpenSceneGraph/issues/58 +--- + src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp +index dd681e8..73480fb 100644 +--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp ++++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp +@@ -70,14 +70,6 @@ namespace osgDBJPEG + + static int jpegerror = ERR_NO_ERROR; + +-/* Some versions of jmorecfg.h define boolean, some don't... +- Those that do also define HAVE_BOOLEAN, so we can guard using that. */ +-#ifndef HAVE_BOOLEAN +- typedef int boolean; +- #define FALSE 0 +- #define TRUE 1 +-#endif +- + /* CODE FOR READING/WRITING JPEG FROM STREAMS + * This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source) + * and modified to use a std::istream/ostream* instead of a FILE* +-- +2.7.3 +