[scummvm] 01/04: Use libsdl2 when available (Closes: #807710)

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch master
in repository scummvm.

commit 2c04ca5
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue Mar 15 00:30:30 2016

    Use libsdl2 when available (Closes: #807710)
---
 debian/control               |  2 +-
 debian/patches/libsdl2.patch | 18 ++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index a408cb4..3ae9de9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), autotools-dev
               ,libjpeg-dev
               ,libmad0-dev
               ,libmpeg2-4-dev
-              ,libsdl1.2-dev
+              ,libsdl2-dev | libsdl1.2-dev
               ,libtheora-dev
               ,libvorbis-dev
               ,libz-dev
diff --git a/debian/patches/libsdl2.patch b/debian/patches/libsdl2.patch
new file mode 100644
index 0000000..ebf7934
--- /dev/null
+++ b/debian/patches/libsdl2.patch
@@ -0,0 +1,18 @@
+Last-Update: 2016-03-15
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: search for "sdl2-config"
+
+--- a/configure
++++ b/configure
+@@ -180,9 +180,9 @@
+ _stagingpath="staging"
+ _win32path="c:/scummvm"
+ _amigaospath="Games:ScummVM"
+ _staticlibpath=
+-_sdlconfig=sdl-config
++_sdlconfig=sdl2-config
+ _freetypeconfig=freetype-config
+ _sdlpath="$PATH"
+ _freetypepath="$PATH"
+ _nasmpath="$PATH"
diff --git a/debian/patches/series b/debian/patches/series
index ea130ef..9355e26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 drop1test.patch
 disable-arm-asm.patch
+libsdl2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git