1 |
commit: 379d202bdc228b3ec6a6c2d553e4d8977cc47637 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 13 13:23:17 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 13 13:24:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379d202b |
7 |
|
8 |
games-action/bzflag: Fix SDL2 includes (bug #634660). |
9 |
|
10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
11 |
|
12 |
games-action/bzflag/bzflag-2.4.14.ebuild | 1 + |
13 |
.../bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch | 19 +++++++++++++++++++ |
14 |
2 files changed, 20 insertions(+) |
15 |
|
16 |
diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild |
17 |
index f41fea01d01..59edcad4188 100644 |
18 |
--- a/games-action/bzflag/bzflag-2.4.14.ebuild |
19 |
+++ b/games-action/bzflag/bzflag-2.4.14.ebuild |
20 |
@@ -31,6 +31,7 @@ DEPEND=" |
21 |
PATCHES=( |
22 |
"${FILESDIR}"/${PN}-2.4.12-configure.patch |
23 |
"${FILESDIR}"/${PN}-2.4.12-tinfo.patch |
24 |
+ "${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch |
25 |
) |
26 |
|
27 |
src_prepare() { |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 00000000000..f7f6dfd7f14 |
32 |
--- /dev/null |
33 |
+++ b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch |
34 |
@@ -0,0 +1,19 @@ |
35 |
+--- a/configure.ac |
36 |
++++ b/configure.ac |
37 |
+@@ -236,6 +236,7 @@ |
38 |
+ AC_PROG_CC |
39 |
+ AC_PROG_LN_S |
40 |
+ AC_CHECK_PROG(AR, ar, ar) |
41 |
++PKG_PROG_PKG_CONFIG |
42 |
+ AC_SUBST(AR) |
43 |
+ AC_SUBST(AR_FLAGS) |
44 |
+ |
45 |
+@@ -716,6 +717,8 @@ |
46 |
+ fi |
47 |
+ if test "x$with_SDL" = "x2"; then |
48 |
+ AC_DEFINE(HAVE_SDL2, 1, [Using SDL2]) |
49 |
++ PKG_CHECK_MODULES(sdl2, sdl2, |
50 |
++ [CONF_CPPFLAGS="$CONF_CPPFLAGS $sdl2_CFLAGS"],[]) |
51 |
+ fi |
52 |
+ |
53 |
+ AM_CONDITIONAL(HAVE_SDL, test x$with_SDL = x1 -o x$with_SDL = x2) |