gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-05 12:38:09 -07:00
Code Issues Projects Releases Wiki Activity

dev-games/openscenegraph: Fix build with jpeg-9

Browse Source 
Closes: https://bugs.gentoo.org/646454
Package-Manager: Portage-2.3.24, Repoman-2.3.6
This commit is contained in:
Andreas Sturmlechner
2018-02-07 02:19:35 +01:00
parent bd2c473b51
commit 87f44f56ae
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch Normal file
View File

@@ -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

3
dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
View File

@@ -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() {

3
dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
View File

@@ -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() {