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 f41c240e13f3dc9c7c361b0ccbdfd69815a7a7cf Author: Sven Eckelmann <[email protected]> Date: Tue Jun 11 00:19:02 2013 +0200 Add missing name when creating thread with SDL2 --- debian/changelog | 2 ++ debian/patches/sdl2_compat.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index efdfe64..51aa5fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mupen64plus-video-z64 (1.99.5+24+f331e66fc630-2) UNRELEASED; urgency=low - Switch from SDL 1.2 to SDL 2.0 * debian/control: - Depend on libsdl2-dev instead of libsdl1.2-dev + * debian/patches: + - Add sdl2_compat.patch, Add missing name when creating thread with SDL2 -- Sven Eckelmann <[email protected]> Sun, 09 Jun 2013 23:02:10 +0200 diff --git a/debian/patches/sdl2_compat.patch b/debian/patches/sdl2_compat.patch new file mode 100644 index 0000000..2f90820 --- /dev/null +++ b/debian/patches/sdl2_compat.patch @@ -0,0 +1,20 @@ +Description: Add missing name when creating thread with SDL2 +Author: Sven Eckelmann <[email protected]> + +--- +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 5a5a78d..c0c267b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
