dev-games/OpenSceneGraph: bump to 3.4.0

Change-Id: Idaab88f1020ea3b4959a96595188f51a9db33182
Reviewed-on: https://galileo.mailstation.de/gerrit/5229
Reviewed-by: Jenkins <wk@mailstation.de>
Reviewed-by: Wulf C. Krueger <philantrop@exherbo.org>
This commit is contained in:
Julian Ospald 2016-03-16 22:00:33 +01:00
parent 062c545c2b
commit 5b7c2ab9d5
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
2 changed files with 119 additions and 0 deletions

View File

@ -0,0 +1,87 @@
# Copyright 2013-2014 Thomas Witt
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
# Distributed under the terms of the GNU General Public License v2
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.
"
MY_PN="OpenSceneGraph"
MY_PNV=${MY_PN}-${PV}
HOMEPAGE="http://${PN}.org"
DOWNLOADS="http://trac.openscenegraph.org/downloads/developer_releases/${MY_PNV}.zip"
LICENCES="wxWinLL-3 LGPL-2.1"
SLOT="0"
PLATFORMS="~amd64 ~x86"
MYOPTIONS="
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
"
DEPENDENCIES="
build:
virtual/unzip
build+run:
app-text/poppler[cairo]
dev-libs/glib:2
media/ffmpeg
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:ijg-jpeg? ( media-libs/jpeg:= )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
"
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=""
)

View File

@ -0,0 +1,32 @@
From a20af6ee2e4b666fec79c2f545e548bd9470bbe6 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
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