From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1023751-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7C6A71382C5
for <garchives@archives.gentoo.org>; Sun, 13 May 2018 13:24:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 84FBAE09CD;
Sun, 13 May 2018 13:24:18 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 60907E09BE
for <gentoo-commits@lists.gentoo.org>; Sun, 13 May 2018 13:24:18 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 14017335CA2
for <gentoo-commits@lists.gentoo.org>; Sun, 13 May 2018 13:24:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 561F2292
for <gentoo-commits@lists.gentoo.org>; Sun, 13 May 2018 13:24:15 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1526217853.379d202bdc228b3ec6a6c2d553e4d8977cc47637.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/bzflag/files/, games-action/bzflag/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-action/bzflag/bzflag-2.4.14.ebuild games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
X-VCS-Directories: games-action/bzflag/ games-action/bzflag/files/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 379d202bdc228b3ec6a6c2d553e4d8977cc47637
X-VCS-Branch: master
Date: Sun, 13 May 2018 13:24:15 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c5993d52-6ebc-45bb-bacd-26052a3ef8e0
X-Archives-Hash: a44a22fc9692f3fd7eca2d7037c90ae5
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)