gentoo resync : 11.02.2018

4 files changed, 41 insertions, 4 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index a67589279a2b..771de49c82eb 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,8 +1,9 @@
 AUX openscenegraph-3.4.0-cmake.patch 11173 BLAKE2B 24b33b110ae9a18074c3c96a4ede33660ddc7d3bc8c0cdb49d271b986bac9a31a2a91b1689842950b7db94ad309843bfb6beaff6031d65f77c456834612d4cff SHA512 820167c01dcb03ea014cd711398bc1239d13e30189ad001b07bf7bf1139795b5191110b8b28106688224cd285929b4d4628208616c2b8d291f8a482d131a9d77
 AUX openscenegraph-3.5.1-ffmpeg-3.patch 7660 BLAKE2B 27d1222caab469801313defc04b48d3c0c46a65770260e9976ed0fd4178f122d8a55f1924fb04e097dc89dc56a9c27bb69cc2d6eb4cf4c7bb93ffbbe78a6e7d6 SHA512 1fbb01748841f62262e52244f4f66feaf397150888fbfbf781baf0b31affb93118257a8377c946f17f42291916f4988309a708d0b8e3156057c655d157cc0275
+AUX openscenegraph-3.5.1-jpeg-9.patch 1211 BLAKE2B 7fedf10332a13270a489c5d2e662947ca84659ad5abc43190d0415212b083b72933b01f84caed161d457490587c8236e38e070e734c649c44b0d67fdc7399a2d SHA512 404439415f8ff6881a90be44281e4a811f018c3e82c2981d076a106e63a3c44fd769867496b8f8a7d53669ba660ab9076a6ccab31e921e9abab65d2ba652b5cc
 AUX openscenegraph-3.5.5-cmake.patch 11029 BLAKE2B 924c464b46b58e97efc3d477742c58c1762ccd4ad9cbc4ecb45232a1d4b8a476540d38031a6886c46a792c2a30da381a75c11a3a8303da56620c28e423043876 SHA512 f5cf409acd5d4e11b7f90fca8775e50cf57ae020fdae74e26d05a984726cb614d33f317c5ec985a198865cd445b3a1e8e2f5843af8ba10c890eb332ed9498504
 DIST OpenSceneGraph-3.5.1.zip 8353019 BLAKE2B 5f16fc4be3f7cd3c9a4214586920a3e1943a2858ee5d7d86f20a6b35c53c662b952db3596f0ab5c8be0c97c11a2d4537d1d9261b746ec67d88ce6da404b31e44 SHA512 5d419cb2e59efaf1e9b2efdb3a28e1deb5bf8b62a1be2ab4fed06e50064c4c4fb9f1332e65e0bfe0c6d8e99fe0cc134f863ba46965eda9546d125fbd22151057
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
-EBUILD openscenegraph-3.5.1-r2.ebuild 4024 BLAKE2B 3ca1fd9c66cfb64160a351e6d34293e1c6c571290d5647e46c30e90f3e2c19d38031edb0464b90ae6af418543cc1078d40a57a311419b4b8a2582712bc20b990 SHA512 dab1177b5a09a4cca5835db4ced957b51d2d428c157f1f62a9d2611a2c9d999d8aa2cc9764c4489c5f51ee97aea6a7bdcd985bc9ce54d5634dc96a8762cfcd7b
-EBUILD openscenegraph-3.5.5.ebuild 3776 BLAKE2B 9caa6a7aa9988d7dcfee40ceb78b4151175a30efb690b4de2f57cd98107ddc86c670bda07b2d6d8c9e6e06e9363d3d8f2898bf5409ea42c2f4785f92958302b2 SHA512 230abc2860cfd149d6a02a62ae783ba978b4851857b49b4e1db20b2bba47b3c778a7153de42b97b1bc956b99f4ce656681627302665783b4b540448f43b3909b
+EBUILD openscenegraph-3.5.1-r2.ebuild 4057 BLAKE2B 5e0b940959059c119b8ec5a02883c3a2170bfd09461a0f3431629ffeb78c31f96596182077b3e02d0bf0dcf47249db0c9ac14b74b2bebae46fd72d2c7a3ad61e SHA512 f775fbc1342169a86f25d912953827b73d065d77a379c28aed6f3235637a8db98d36ac7edaf3a28362f19e78a12b5db5fc95ddd1bb6ff1984e6fec2268147b89
+EBUILD openscenegraph-3.5.5.ebuild 3816 BLAKE2B 1be90ffff02d0806013a3beea60edfa387fe8c8568b2918ca7bb8c81d1b93326db61e54e0a528174e02501670081a2005440ea230ccefb5bbb725c57d3e82b65 SHA512 994de7f2498b4a12e7e07b8f3e5799004882606d00249b41de72c7ec622e5b46e28f87b3bf122e853633bbe9deebebeae5dd147b695b633c011422d76f7678bb
 MISC metadata.xml 1616 BLAKE2B 1c92db1270e1785f2dc412a043102d47fb9635b1063bb2055b2c807912039c074da0b9347e4301ebed8b76823ed6c46f31bd6a27852f408402c867d9fd46128b SHA512 b2fb8a0c8df980ab7d31b04b4f0f9d7a31f5689cd3a08fac6aaa8376116c0b361994779ba04808aeba2e07f76dcfcbf41bd99068ae5f9038421c7d9d67da0c73
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 000000000000..f6e85e8e352d
--- /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 e37bfe37e566..655369b1064b 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 bd6fba7e3d2a..202234ac4846 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() {