This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit a7919ce06e1cc8efbe766c8a3b9a7dab6fdb0ef0 Author: Sven Eckelmann <[email protected]> Date: Sat Oct 3 01:26:26 2009 +0200 Update ftbfs-glibc210.patch, Backport actual commit from upstream --- debian/changelog | 1 + debian/patches/ftbfs-glibc210.patch | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0485456..0b49813 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mupen64plus (1.5+dfsg1-6) UNRELEASED; urgency=low * debian/patches: - Add Origin information to patches - Update fix_readpng.patch, Backport actual commit from upstream + - Update ftbfs-glibc210.patch, Backport actual commit from upstream -- Sven Eckelmann <[email protected]> Sat, 03 Oct 2009 00:36:41 +0200 diff --git a/debian/patches/ftbfs-glibc210.patch b/debian/patches/ftbfs-glibc210.patch index 6729bd9..6ef716e 100644 --- a/debian/patches/ftbfs-glibc210.patch +++ b/debian/patches/ftbfs-glibc210.patch @@ -3,35 +3,37 @@ Description: Fix FTBFS using g++-4.4 and libc 2.10 due to missing const keywords non-const without an explicit cast. As glibc 2.10 provides a more strict declaration of strstr and mupen64plus doesn't use const in that places, it will fail hard. -Origin: upstream, commit:1407 +Origin: backported, commit:1407 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=261 Bug-Debian: http://bugs.debian.org/545462 -Author: Sven Eckelmann <[email protected]> +Author: Adam Sampson <[email protected]> --- diff --git a/glide64/Combine.cpp b/glide64/Combine.cpp -index 7033f608d364444e45672843397043c80cb2d121..a7cbba61d770f89f2602ccaa0644f2d242ef1e2b 100644 +index 7033f608d364444e45672843397043c80cb2d121..102a42d8dee76aaad30d0b55e97bc4d8049975d5 100644 --- a/glide64/Combine.cpp +++ b/glide64/Combine.cpp -@@ -11873,7 +11873,7 @@ void InitCombine () +@@ -11873,7 +11873,8 @@ void InitCombine () LOG ("InitCombine() "); memset(&cmb, 0, sizeof(cmb)); const char *extensions = grGetString (GR_EXTENSION); - if (char * extstr = strstr(extensions, "COMBINE")) { -+ if (const char * extstr = strstr(extensions, "COMBINE")) { ++ const char *extstr = strstr(extensions, "COMBINE"); ++ if (extstr) { if (!strncmp(extstr, "COMBINE", 7)) { LOG ("extensions "); cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt"); diff --git a/glide64/Main.cpp b/glide64/Main.cpp -index eb96438d899eadaa00eb494ff41980f23d6f1231..d013f1da37bd4cd7cdfc484942ceaaa618d2fc10 100644 +index eb96438d899eadaa00eb494ff41980f23d6f1231..6550d2ef709faf3327974342187e0816a3fc2e46 100644 --- a/glide64/Main.cpp +++ b/glide64/Main.cpp -@@ -784,7 +784,7 @@ BOOL InitGfx (BOOL evoodoo_using_window) +@@ -784,7 +784,8 @@ BOOL InitGfx (BOOL evoodoo_using_window) printf("bebefore2\n"); if (settings.fb_hires) { - if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) -+ if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) ++ const char * extstr = strstr(extensions, "TEXTUREBUFFER"); ++ if (extstr) { if (!strncmp(extstr, "TEXTUREBUFFER", 13)) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
