The following commit has been merged in the master-experimental branch:
commit e021dfdb4b3d13bb2116d8eaf4cc1aa0cb0c0ffd
Author: Stephen Kitt <st...@sk2.org>
Date: Tue Apr 3 00:11:00 2012 +0200
Delete obsolete patches.
diff --git a/debian/patches/gzip-1.2.6-fix.patch
b/debian/patches/gzip-1.2.6-fix.patch
deleted file mode 100644
index fd4f7ac..0000000
--- a/debian/patches/gzip-1.2.6-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Use gzFile as appropriate for zlib 1.2.6 and later
-Origin: http://forum.fobby.net/index.php?t=rview&goto=2411#msg_2411
-
---- mednafen.orig/src/file.cpp
-+++ mednafen/src/file.cpp
-@@ -293,7 +293,7 @@
- goto doret;
- }
-
-- while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
-+ while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced -
cur_size)) > 0)
- {
- cur_size += howmany;
- cur_alloced <<= 1;
-@@ -320,7 +320,7 @@
- {
- int gzerrnum = 0;
- const char *gzerrstring;
-- if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum
!= Z_STREAM_END)
-+ if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK &&
gzerrnum != Z_STREAM_END)
- {
- if(gzerrnum != Z_ERRNO)
- {
-@@ -365,7 +365,7 @@
- }
- else if(type == MDFN_FILETYPE_GZIP)
- {
-- gzclose(tz);
-+ gzclose((gzFile)tz);
- }
- else if(type == MDFN_FILETYPE_ZIP)
- {
diff --git a/debian/patches/shader-fix.patch b/debian/patches/shader-fix.patch
deleted file mode 100644
index b4e91db..0000000
--- a/debian/patches/shader-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Pass correct argument to texture2D() in interpolation shader
-Origin: http://forum.fobby.net/index.php?t=rview&goto=2420#msg_2420
-
---- mednafen.orig/src/drivers/shader.cpp
-+++ mednafen/src/drivers/shader.cpp
-@@ -70,7 +70,7 @@
- switch(ipolate_axis & 3)
- {
- case 0:
-- ret += std::string("gl_FragColor = texture2D(Tex0, gl_TexCoord[0]);\n");
-+ ret += std::string("gl_FragColor = texture2D(Tex0,
vec2(gl_TexCoord[0]));\n");
- break;
-
- case 1:
diff --git a/debian/patches/spelling-fixes.patch
b/debian/patches/spelling-fixes.patch
deleted file mode 100644
index c32fe43..0000000
--- a/debian/patches/spelling-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Spelling fixes
-Author: Stephen Kitt <st...@sk2.org>
-
---- mednafen.orig/src/vb/vb.cpp
-+++ mednafen/src/vb/vb.cpp
-@@ -969,7 +969,7 @@
-
- static const MDFNSetting_EnumList VB3DMode_List[] =
- {
-- { "anaglyph", VB3DMODE_ANAGLYPH, gettext_noop("Anaglyph"),
gettext_noop("Used in conjuction with classic dual-lens-color glasses.") },
-+ { "anaglyph", VB3DMODE_ANAGLYPH, gettext_noop("Anaglyph"),
gettext_noop("Used in conjunction with classic dual-lens-color glasses.") },
- { "cscope", VB3DMODE_CSCOPE, gettext_noop("CyberScope"),
gettext_noop("Intended for use with the CyberScope 3D device.") },
- { "sidebyside", VB3DMODE_SIDEBYSIDE, gettext_noop("Side-by-Side"),
gettext_noop("The left-eye image is displayed on the left, and the right-eye
image is displayed on the right.") },
- // { "overunder", VB3DMODE_OVERUNDER },
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
