summaryrefslogtreecommitdiff
path: root/games-action/bzflag/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-13 16:38:56 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-13 16:38:56 +0100
commitea31ad0ed5501d0bf92267c35beaf06ac016bad2 (patch)
tree2fdc433d571e3ead010876d43ce2646b7d783680 /games-action/bzflag/files
parent88ebe56470c37b02a044e1091cad6b2df0f3be8f (diff)
gentoo resync : 13.05.2018
Diffstat (limited to 'games-action/bzflag/files')
-rw-r--r--games-action/bzflag/files/bzflag-2.4.12-configure.patch5
-rw-r--r--games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch19
2 files changed, 21 insertions, 3 deletions
diff --git a/games-action/bzflag/files/bzflag-2.4.12-configure.patch b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
index b280621f6ec2..e1c546f37a34 100644
--- a/games-action/bzflag/files/bzflag-2.4.12-configure.patch
+++ b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
@@ -1,6 +1,5 @@
-diff -ru bzflag-2.4.4.orig/configure.ac bzflag-2.4.4/configure.ac
---- bzflag-2.4.4.orig/configure.ac 2016-02-14 19:09:51.000000000 -0500
-+++ bzflag-2.4.4/configure.ac 2016-05-05 16:35:35.475935345 -0400
+--- a/configure.ac
++++ b/configure.ac
@@ -215,7 +215,7 @@
AC_SUBST(AR)
AC_SUBST(AR_FLAGS)
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)