summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-02-07 02:19:35 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-02-07 02:58:43 +0100
commit87f44f56ae0765df802f10271bdf6ed4ee5dd59a (patch)
tree55958c1128f26779229bcd9402af8d14dda65da0 /dev-games
parentsys-fs/mp3fs: ebuild maintenance (diff)
downloadgentoo-87f44f56ae0765df802f10271bdf6ed4ee5dd59a.tar.gz
gentoo-87f44f56ae0765df802f10271bdf6ed4ee5dd59a.tar.bz2
gentoo-87f44f56ae0765df802f10271bdf6ed4ee5dd59a.zip
dev-games/openscenegraph: Fix build with jpeg-9
Closes: https://bugs.gentoo.org/646454 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch34
-rw-r--r--dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild3
-rw-r--r--dev-games/openscenegraph/openscenegraph-3.5.5.ebuild3
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch
new file mode 100644
index 00000000000..f6e85e8e352
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch
@@ -0,0 +1,34 @@
+From 34b4e7001522c1b47b4211dac34d2d6a6b994a6f Mon Sep 17 00:00:00 2001
+From: Robert Osfield <robert@openscenegraph.com>
+Date: Thu, 17 Aug 2017 10:52:59 +0100
+Subject: [PATCH] Added version check for boolean, TRUE and FALSE settings
+
+---
+ src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+index 9f7f4c38937..115203322a5 100644
+--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
++++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+@@ -70,12 +70,14 @@ 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
++#if JPEG_LIB_VERSION < 90
++ /* 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
+ #endif
+
+ /* CODE FOR READING/WRITING JPEG FROM STREAMS
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
index e37bfe37e56..655369b1064 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -92,6 +92,7 @@ DOCS=( AUTHORS.txt ChangeLog NEWS.txt )
PATCHES=(
"${FILESDIR}"/${PN}-3.4.0-cmake.patch
"${FILESDIR}"/${P}-ffmpeg-3.patch
+ "${FILESDIR}"/${P}-jpeg-9.patch
)
src_configure() {
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index bd6fba7e3d2..202234ac484 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -83,6 +83,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-3.5.5-cmake.patch
+ "${FILESDIR}"/${PN}-3.5.1-jpeg-9.patch
)
src_configure() {