[gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/

[Lars Wendler]

commit:     92170680370d7c953241845837d0d6c7daa36e35
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 17:39:43 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 17:39:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92170680

games-emulation/snes9x: Fixed build with USE="-png".

Closes: https://bugs.gentoo.org/659900
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../snes9x-1.58-without-screenshot_build_fix.patch | 31 ++++++++++++++++++++++
 games-emulation/snes9x/snes9x-1.58.ebuild          |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch
new file mode 100644
index 00000000000..7af1e9e2b90
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch
@@ -0,0 +1,31 @@
+From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001
+From: Brandon Wright <bearoso@×××××.com>
+Date: Fri, 4 Jan 2019 10:52:11 -0600
+Subject: [PATCH] Fix PNG usage without preprocessor check.
+
+---
+ shaders/shader_helpers.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp
+index b84e6291..a589d39b 100644
+--- a/shaders/shader_helpers.cpp
++++ b/shaders/shader_helpers.cpp
+@@ -93,6 +93,7 @@ bool loadPngImage(const char* name,
+     bool& outHasAlpha,
+     GLubyte** outData)
+ {
++#ifdef HAVE_LIBPNG
+     png_structp png_ptr;
+     png_infop info_ptr;
+     unsigned int sig_read = 0;
+@@ -211,6 +212,9 @@ bool loadPngImage(const char* name,
+ 
+     /* That's it */
+     return true;
++#else
++    return false;
++#endif
+ }
+ 
+ bool loadTGA(const char* filename, STGA& tgaFile)

diff --git a/games-emulation/snes9x/snes9x-1.58.ebuild b/games-emulation/snes9x/snes9x-1.58.ebuild
index 911de9a90fb..9fd943cac80 100644
--- a/games-emulation/snes9x/snes9x-1.58.ebuild
+++ b/games-emulation/snes9x/snes9x-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P}/unix"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
 	"${FILESDIR}"/${PN}-1.58-build-system.patch
+	"${FILESDIR}"/${P}-without-screenshot_build_fix.patch
 )
 
 src_prepare() {