diff --git a/games-arcade/supertux/patches/supertux-0.1.3.patch b/games-arcade/supertux/patches/supertux-0.1.3.patch deleted file mode 100644 index 08c03d475..000000000 --- a/games-arcade/supertux/patches/supertux-0.1.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur supertux-0.1.3/data/Makefile.am supertux-0.1.3-haiku/data/Makefile.am ---- supertux-0.1.3/data/Makefile.am 2005-07-08 22:18:26.015990784 +1000 -+++ supertux-0.1.3-haiku/data/Makefile.am 2012-11-28 23:13:56.921960448 +1000 -@@ -2,8 +2,6 @@ - supertux.strf \ - $(wildcard *.txt) \ - CREDITS \ -- $(wildcard sounds/*.wav) \ -- images/icon.xpm \ - $(wildcard images/*.png) \ - $(wildcard images/*.xpm) \ - $(wildcard images/background/*.png) \ diff --git a/games-arcade/supertux/patches/supertux-0.1.3.patchset b/games-arcade/supertux/patches/supertux-0.1.3.patchset new file mode 100644 index 000000000..99fc4afc0 --- /dev/null +++ b/games-arcade/supertux/patches/supertux-0.1.3.patchset @@ -0,0 +1,87 @@ +From 7a02c3ffe85df120d7beeea38e1f56956ef64ae1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Fri, 4 Jul 2014 00:26:06 +0200 +Subject: [PATCH 1/3] Remove duplicates in EXTRA_DIST files + +--- + data/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index d469f34..d20970c 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -2,8 +2,6 @@ EXTRA_DIST = \ + supertux.strf \ + $(wildcard *.txt) \ + CREDITS \ +- $(wildcard sounds/*.wav) \ +- images/icon.xpm \ + $(wildcard images/*.png) \ + $(wildcard images/*.xpm) \ + $(wildcard images/background/*.png) \ +-- +1.8.3.4 + + +From 3b1c457a022a95333ce12405dc3db3db104f03b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sun, 20 Jul 2014 19:13:26 +0200 +Subject: [PATCH 2/3] Fix OpenGL detection on Haiku + +Replace hardcoded libm with a proper check. Could probably be simpler. +--- + mk/autoconf/ax_check_gl.m4 | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/mk/autoconf/ax_check_gl.m4 b/mk/autoconf/ax_check_gl.m4 +index 0977fcd..4b21bb5 100644 +--- a/mk/autoconf/ax_check_gl.m4 ++++ b/mk/autoconf/ax_check_gl.m4 +@@ -15,8 +15,14 @@ if test "X$with_apple_opengl_framework" = "Xyes"; then + [Use the Apple OpenGL framework.]) + GL_CFLAGS="-framework OpenGL" + else ++ ax_save_LIBS="${LIBS}" ++ LIBS="" ++ AC_SEARCH_LIBS([sqrt], [m]) ++ M_LIBS="${LIBS}" ++ LIBS="${ax_save_LIBS}" ++ + GL_CFLAGS="${PTHREAD_CFLAGS}" +- GL_LIBS="${PTHREAD_LIBS} -lm" ++ GL_LIBS="${PTHREAD_LIBS} ${M_LIBS}" + + # + # Use x_includes and x_libraries if they have been set (presumably by +-- +1.8.3.4 + + +From d0751fcf642b4eba45b61086cf95e53e5afe97f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sun, 20 Jul 2014 19:29:42 +0200 +Subject: [PATCH 3/3] Disable fullscreen by default for now + +The Haiku SDL port currently has a bug with fullscreen +so it doesn't always restore the proper resolution on exit. +--- + src/configfile.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/configfile.cpp b/src/configfile.cpp +index 624e90e..bc191e7 100644 +--- a/src/configfile.cpp ++++ b/src/configfile.cpp +@@ -37,7 +37,7 @@ static void defaults () + debug_mode = false; + audio_device = true; + +- use_fullscreen = true; ++ use_fullscreen = false; + show_fps = false; + use_gl = false; + +-- +1.8.3.4 +