[gentoo-commits] repo/gentoo:master commit in: games-action/bzflag/files/, games-action/bzflag/

[Jeroen Roovers]

commit:     379d202bdc228b3ec6a6c2d553e4d8977cc47637
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 13:23:17 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 13 13:24:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379d202b

games-action/bzflag: Fix SDL2 includes (bug #634660).

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 games-action/bzflag/bzflag-2.4.14.ebuild              |  1 +
 .../bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild 
b/games-action/bzflag/bzflag-2.4.14.ebuild
index f41fea01d01..59edcad4188 100644
--- a/games-action/bzflag/bzflag-2.4.14.ebuild
+++ b/games-action/bzflag/bzflag-2.4.14.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 PATCHES=(
        "${FILESDIR}"/${PN}-2.4.12-configure.patch
        "${FILESDIR}"/${PN}-2.4.12-tinfo.patch
+       "${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch
 )
 
 src_prepare() {

diff --git a/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch 
b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
new file mode 100644
index 00000000000..f7f6dfd7f14
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,6 +236,7 @@
+ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_CHECK_PROG(AR, ar, ar)
++PKG_PROG_PKG_CONFIG
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+@@ -716,6 +717,8 @@
+ fi
+ if test "x$with_SDL" = "x2"; then
+     AC_DEFINE(HAVE_SDL2, 1, [Using SDL2])
++    PKG_CHECK_MODULES(sdl2, sdl2,
++        [CONF_CPPFLAGS="$CONF_CPPFLAGS $sdl2_CFLAGS"],[])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_SDL, test x$with_SDL = x1 -o x$with_SDL = x2)