[mupen64plus-video-z64] 137/161: Remove upstream merged sdl2_compat.patch

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.

commit c42087951db8236b313eb4208bea8fff18d6e3ef
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 22:04:15 2013 +0200

    Remove upstream merged sdl2_compat.patch
---
 debian/changelog                 |  2 ++
 debian/patches/sdl2_compat.patch | 20 --------------------
 debian/patches/series            |  1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fed8c9..84e0598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mupen64plus-video-z64 (2.0.0-1) UNRELEASED; urgency=low
     - Work around new debhelper 9.20130624 dh_auto_{clean,test} behavior
       which is causing a FTBFS by adding an explicit
       override_dh_auto_{clean,test} rule
+  * debian/patches:
+    - Remove upstream merged sdl2_compat.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 26 Jun 2013 12:30:01 +0200
 
diff --git a/debian/patches/sdl2_compat.patch b/debian/patches/sdl2_compat.patch
deleted file mode 100644
index 2f90820..0000000
--- a/debian/patches/sdl2_compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add missing name when creating thread with SDL2
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/maingl.cpp b/src/maingl.cpp
-index 9a0142ee6ef58298e89d5677f6739caa03e47fe9..6664ae47b5a104b18b658df6804e6f4e11a8d10f 100644
---- a/src/maingl.cpp
-+++ b/src/maingl.cpp
-@@ -123,7 +123,11 @@ void rdpCreateThread()
-     }
-     if (!rdpThread) {
-         LOG("Creating rdp thread\n");
-+#if SDL_VERSION_ATLEAST(2,0,0)
-+        rdpThread = SDL_CreateThread(rdpThreadFunc, "z64rdp", 0);
-+#else
-         rdpThread = SDL_CreateThread(rdpThreadFunc, 0);
-+#endif
-     }
- }
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index c0c267b..5a5a78d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 printf_fixup.patch
-sdl2_compat.patch

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