[ri-li] 01/05: Add no-sdl-timers-for-makedat.patch

[Markus Koschany]

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 caeb498021e7958b6fa4bc6bcc34c962117e2c4b
Author: Markus Koschany <apo at debian.org>
Date:   Sun Feb 19 19:27:45 2017 +0100

    Add no-sdl-timers-for-makedat.patch
    
    Thanks: Steve Cotton for the patch.
    Closes: #848063
---
 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 ca64563..14a10e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-gcc4.3-ftbfs.patch
 fix-compiler-warnings.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