[ri-li] 01/02: Revert "Drop no-sdl-timers-for-makedat.patch again."
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Feb 20 21:35:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository ri-li.
commit 316ea813f72502e0595114f1929a267d194a9eb5
Author: Markus Koschany <apo at debian.org>
Date: Mon Feb 20 21:42:23 2017 +0100
Revert "Drop no-sdl-timers-for-makedat.patch again."
This reverts commit ea2e43f1c84c5bcc88b10321a083f9bd4e51e2e2.
---
debian/patches/no-sdl-timers-for-makedat.patch | 28 ++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 29 insertions(+)
diff --git a/debian/patches/no-sdl-timers-for-makedat.patch b/debian/patches/no-sdl-timers-for-makedat.patch
new file mode 100644
index 0000000..3386a99
--- /dev/null
+++ b/debian/patches/no-sdl-timers-for-makedat.patch
@@ -0,0 +1,28 @@
+From: Steve Cotton <steve at octalot.co.uk>
+Date: Sun, 19 Feb 2017 17:37:41 +0100
+Subject: Don't init SDL timers when running MakeDat
+
+MakeDat doesn't use timers (there are no calls to SDL_AddTimer), and the
+binaries generated and moved to the data directory are identical.
+
+When it initialised timers and was run with xvfb-run on a single-cpu buildd,
+SDL failed to initialise.
+
+Bug-Debian: https://bugs.debian.org/848063
+---
+ data-src/main.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data-src/main.cc b/data-src/main.cc
+index 0a04628..05f7ab0 100644
+--- a/data-src/main.cc
++++ b/data-src/main.cc
+@@ -193,7 +193,7 @@ int main(int narg,char *argv[])
+ unsigned char Buf[2];
+
+ // Initilise SDL
+- if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
++ if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
+ cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl;
+ exit(-1);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index db4f98a..263abb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix-gcc4.3-ftbfs.patch
fix-compiler-warnings.patch
link-with-X11.patch
+no-sdl-timers-for-makedat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ri-li.git
More information about the Pkg-games-commits
mailing list