diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2018-05-13 15:23:17 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2018-05-13 15:24:13 +0200 |
| commit | 379d202bdc228b3ec6a6c2d553e4d8977cc47637 (patch) | |
| tree | 58dd219bb608790fbe511a7b062ea47ab13f1f76 | |
| parent | games-action/bzflag: Specify SDL2. (diff) | |
| download | gentoo-379d202bdc228b3ec6a6c2d553e4d8977cc47637.tar.gz gentoo-379d202bdc228b3ec6a6c2d553e4d8977cc47637.tar.bz2 gentoo-379d202bdc228b3ec6a6c2d553e4d8977cc47637.zip | |
games-action/bzflag: Fix SDL2 includes (bug #634660).
Package-Manager: Portage-2.3.36, Repoman-2.3.9
| -rw-r--r-- | games-action/bzflag/bzflag-2.4.14.ebuild | 1 | ||||
| -rw-r--r-- | games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild index f41fea01d012..59edcad41888 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 000000000000..f7f6dfd7f14c --- /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) |