[mupen64plus-core] 124/310: Reformat patches with histogram diff
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:57:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.
commit ecbf70e1b7b81269d37d1360b34d7d017e3a7b24
Author: Sven Eckelmann <sven at narfation.org>
Date: Mon Oct 24 12:19:58 2011 +0200
Reformat patches with histogram diff
---
debian/patches/ftgl_fontrendering.patch | 50 ++---
debian/patches/new_minizip.patch | 312 +++++++++++++++--------------
debian/patches/osd_memory_corruption.patch | 8 +-
debian/patches/rewrite_makefile.patch | 25 +--
4 files changed, 206 insertions(+), 189 deletions(-)
diff --git a/debian/patches/ftgl_fontrendering.patch b/debian/patches/ftgl_fontrendering.patch
index e833426..6124fec 100644
--- a/debian/patches/ftgl_fontrendering.patch
+++ b/debian/patches/ftgl_fontrendering.patch
@@ -1734,45 +1734,49 @@ index 29bea2d2475e91a51e79c37a2876d0f040e09fdd..d95eec6a842cab25bb2e2127ab962388
+ msg->sizebox[2] = upper.Xf();
+ msg->sizebox[3] = upper.Yf();
+ }
++
++ switch(msg->corner)
++ {
++ default:
++ case OSD_TOP_LEFT:
++ case OSD_MIDDLE_LEFT:
++ case OSD_BOTTOM_LEFT:
++ x = 0.;
++ x_adjust = -msg->sizebox[0];
++ break;
++ case OSD_TOP_CENTER:
++ case OSD_MIDDLE_CENTER:
++ case OSD_BOTTOM_CENTER:
++ x = ((float)width) / 2.0f;
++ x_adjust = (-msg->sizebox[0] - msg->sizebox[2]) / 2.f;
++ break;
++ case OSD_TOP_RIGHT:
++ case OSD_MIDDLE_RIGHT:
++ case OSD_BOTTOM_RIGHT:
++ x = (float)width;
++ x_adjust = -msg->sizebox[2];
++ break;
++ }
- // set justification based on corner
switch(msg->corner)
{
-+ default:
case OSD_TOP_LEFT:
- l_font->setVerticalJustification(OGLFT::Face::TOP);
- l_font->setHorizontalJustification(OGLFT::Face::LEFT);
-+ case OSD_MIDDLE_LEFT:
-+ case OSD_BOTTOM_LEFT:
- x = 0.;
+- x = 0.;
- y = (float)height;
-+ x_adjust = -msg->sizebox[0];
- break;
+- break;
case OSD_TOP_CENTER:
- l_font->setVerticalJustification(OGLFT::Face::TOP);
- l_font->setHorizontalJustification(OGLFT::Face::CENTER);
- x = ((float)width)/2.0f;
- y = (float)height;
-+ case OSD_MIDDLE_CENTER:
-+ case OSD_BOTTOM_CENTER:
-+ x = ((float)width) / 2.0f;
-+ x_adjust = (-msg->sizebox[0] - msg->sizebox[2]) / 2.f;
- break;
+- break;
case OSD_TOP_RIGHT:
- l_font->setVerticalJustification(OGLFT::Face::TOP);
- l_font->setHorizontalJustification(OGLFT::Face::RIGHT);
-+ case OSD_MIDDLE_RIGHT:
-+ case OSD_BOTTOM_RIGHT:
- x = (float)width;
-+ x_adjust = -msg->sizebox[2];
-+ break;
-+ }
-+
-+ switch(msg->corner)
-+ {
-+ case OSD_TOP_LEFT:
-+ case OSD_TOP_CENTER:
-+ case OSD_TOP_RIGHT:
+- x = (float)width;
y = (float)height;
+ y_adjust = - msg->sizebox[3];
break;
diff --git a/debian/patches/new_minizip.patch b/debian/patches/new_minizip.patch
index b087f4f..f0d883d 100644
--- a/debian/patches/new_minizip.patch
+++ b/debian/patches/new_minizip.patch
@@ -132,7 +132,7 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+ return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
+ }
+}
-
++
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+{
+ if (pfilefunc->zfile_func64.zseek64_file != NULL)
@@ -146,8 +146,7 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+ return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
+ }
+}
-
--/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
++
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+{
+ if (pfilefunc->zfile_func64.zseek64_file != NULL)
@@ -161,10 +160,7 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+ return tell_uLong;
+ }
+}
-
--#ifndef SEEK_CUR
--#define SEEK_CUR 1
--#endif
++
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+ p_filefunc64_32->zfile_func64.zopen64_file = NULL;
@@ -181,18 +177,12 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+ p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
--#ifndef SEEK_END
--#define SEEK_END 2
--#endif
--#ifndef SEEK_SET
--#define SEEK_SET 0
--#endif
+-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
--voidpf ZCALLBACK fopen_file_func OF((
-- voidpf opaque,
-- const char* filename,
-- int mode));
+-#ifndef SEEK_CUR
+-#define SEEK_CUR 1
+-#endif
+static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
+static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
@@ -201,6 +191,19 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+-#ifndef SEEK_END
+-#define SEEK_END 2
+-#endif
+-
+-#ifndef SEEK_SET
+-#define SEEK_SET 0
+-#endif
+-
+-voidpf ZCALLBACK fopen_file_func OF((
+- voidpf opaque,
+- const char* filename,
+- int mode));
+-
-uLong ZCALLBACK fread_file_func OF((
- voidpf opaque,
- voidpf stream,
@@ -240,7 +243,7 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
{
FILE* file = NULL;
const char* mode_fopen = NULL;
-@@ -98,44 +98,78 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
+@@ -98,44 +98,55 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
return file;
}
@@ -312,6 +315,23 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+}
+
+static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
+ {
+ int fseek_origin=0;
+ long ret;
+@@ -153,22 +164,45 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
+ default: return -1;
+ }
+ ret = 0;
+- fseek((FILE *)stream, offset, fseek_origin);
++ if (fseek((FILE *)stream, offset, fseek_origin) != 0)
++ ret = -1;
+ return ret;
+ }
+
+-int ZCALLBACK fclose_file_func (opaque, stream)
+- voidpf opaque;
+- voidpf stream;
++static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
+{
+ int fseek_origin=0;
+ long ret;
@@ -329,30 +349,13 @@ index 7e552869c63e373f1296d5e30179372cabf8e0c7..49958f61ffd660c96031aa49dbcffd08
+ default: return -1;
+ }
+ ret = 0;
-+ if (fseek((FILE *)stream, offset, fseek_origin) != 0)
-+ ret = -1;
-+ return ret;
-+}
-+
-+static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
- {
- int fseek_origin=0;
- long ret;
-@@ -153,22 +187,22 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
- default: return -1;
- }
- ret = 0;
-- fseek((FILE *)stream, offset, fseek_origin);
+
+ if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
+ ret = -1;
+
- return ret;
- }
-
--int ZCALLBACK fclose_file_func (opaque, stream)
-- voidpf opaque;
-- voidpf stream;
++ return ret;
++}
++
+
+static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
{
@@ -403,6 +406,14 @@ index e7510f1f9e86a2d8dcf8c35883b448dbbfdf46a6..8309c4cf8f4b512b144568a6d5b66234
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
+ For more info read MiniZip_info.txt
++
++ Changes
++
++ Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
++ Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
++ More if/def section may be needed to support other platforms
++ Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
++ (but you should use iowin32.c for windows instead)
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
@@ -411,16 +422,10 @@ index e7510f1f9e86a2d8dcf8c35883b448dbbfdf46a6..8309c4cf8f4b512b144568a6d5b66234
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-+ Changes
-+
-+ Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
-+ Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
-+ More if/def section may be needed to support other platforms
-+ Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
-+ (but you should use iowin32.c for windows instead)
-+
-+*/
-+
+ */
+
+-#ifndef _ZLIBIOAPI_H
+-#define _ZLIBIOAPI_H
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
@@ -473,10 +478,8 @@ index e7510f1f9e86a2d8dcf8c35883b448dbbfdf46a6..8309c4cf8f4b512b144568a6d5b66234
+ #define ZPOS64_T uint64_t
+ #endif
+#endif
- */
-
--#ifndef _ZLIBIOAPI_H
--#define _ZLIBIOAPI_H
++*/
++
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
@@ -1636,38 +1639,42 @@ index 0d9234dbba73dad39097ea8e6b0a8afc1bc22ed0..7617f41f1ccf9c54ad8e002a956c1b42
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+ if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
- err=UNZ_ERRNO;
++ err=UNZ_ERRNO;
+ file_info.compressed_size = uL;
-
-- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
++
+ if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
- err=UNZ_ERRNO;
++ err=UNZ_ERRNO;
+ file_info.uncompressed_size = uL;
-
-- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
++
+ if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
err=UNZ_ERRNO;
-- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+ if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
err=UNZ_ERRNO;
-- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+ if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
err=UNZ_ERRNO;
-- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+ if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
err=UNZ_ERRNO;
-- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+ if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
err=UNZ_ERRNO;
-- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+ if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
err=UNZ_ERRNO;
+- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+- err=UNZ_ERRNO;
+-
+- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+- err=UNZ_ERRNO;
+-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+ // relative offset of local header
+ if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
@@ -2759,19 +2766,20 @@ index faa23af51a1334d00d383d27c25fc84cf42e24bb..3183968b771e3c261fdcc7a0f50bd743
3. This notice may not be removed or altered from any source distribution.
+ ---------------------------------------------------------------------------------
-
--*/
++
+ Changes
+
+ See header of unzip64.c
+ */
+
-/* for more info about .ZIP format, see
- http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
- http://www.info-zip.org/pub/infozip/doc/
- PkWare has also a specification at :
- ftp://ftp.pkware.com/probdesc.zip
- */
-
+-*/
+-
-#ifndef _unz_H
-#define _unz_H
+#ifndef _unz64_H
@@ -3405,6 +3413,14 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
- uBackRead = 4;
- while (uBackRead<uMaxBack)
+- {
+- uLong uReadSize,uReadPos ;
+- int i;
+- if (uBackRead+BUFREADCOMMENT>uMaxBack)
+- uBackRead = uMaxBack;
+- else
+- uBackRead+=BUFREADCOMMENT;
+- uReadPos = uSizeFile-uBackRead ;
+ uBackRead = 4;
+ while (uBackRead<uMaxBack)
+ {
@@ -3416,15 +3432,28 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ else
+ uBackRead+=BUFREADCOMMENT;
+ uReadPos = uSizeFile-uBackRead ;
-+
+
+- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+- (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
+- if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+- break;
+ uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+ (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+ if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ break;
-+
+
+- if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+- break;
+ if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+ break;
-+
+
+- for (i=(int)uReadSize-3; (i--)>0;)
+- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+- {
+- uPosFound = uReadPos+i;
+- break;
+- }
+ for (i=(int)uReadSize-3; (i--)>0;)
+ if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+ ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
@@ -3432,13 +3461,18 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ uPosFound = uReadPos+i;
+ break;
+ }
-+
+
+- if (uPosFound!=0)
+- break;
+- }
+- TRYFREE(buf);
+- return uPosFound;
+ if (uPosFound!=0)
+ break;
+ }
+ TRYFREE(buf);
+ return uPosFound;
-+}
+ }
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
@@ -3489,14 +3523,7 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ break;
+
+ for (i=(int)uReadSize-3; (i--)>0;)
- {
-- uLong uReadSize,uReadPos ;
-- int i;
-- if (uBackRead+BUFREADCOMMENT>uMaxBack)
-- uBackRead = uMaxBack;
-- else
-- uBackRead+=BUFREADCOMMENT;
-- uReadPos = uSizeFile-uBackRead ;
++ {
+ // Signature "0x07064b50" Zip64 end of central directory locater
+ if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+ {
@@ -3590,36 +3617,21 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ if (central_pos==0)
+ err=ZIP_ERRNO;
+*/
-
-- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-- (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-- if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-- break;
++
+ if(hasZIP64Record)
+ {
+ ZPOS64_T sizeEndOfCentralDirectory;
+ if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+ err=ZIP_ERRNO;
-
-- if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-- break;
++
+ /* the signature, already checked */
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
-
-- for (i=(int)uReadSize-3; (i--)>0;)
-- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-- {
-- uPosFound = uReadPos+i;
-- break;
-- }
++
+ /* size of zip64 end of central directory record */
+ if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+ err=ZIP_ERRNO;
-
-- if (uPosFound!=0)
-- break;
++
+ /* version made by */
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+ err=ZIP_ERRNO;
@@ -3732,9 +3744,7 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ {
+ size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+ pziinit->globalcomment[size_comment]=0;
- }
-- TRYFREE(buf);
-- return uPosFound;
++ }
+ }
+
+ byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
@@ -3770,7 +3780,7 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ err=ZIP_ERRNO;
+
+ return err;
- }
++}
+
+
#endif /* !NO_ADDFILEINEXISTINGZIP*/
@@ -4141,17 +4151,18 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
if (file == NULL)
return ZIP_PARAMERROR;
-+
+- if ((method!=0) && (method!=Z_DEFLATED))
+- return ZIP_PARAMERROR;
+
+- zi = (zip_internal*)file;
+#ifdef HAVE_BZIP2
+ if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+ return ZIP_PARAMERROR;
+#else
- if ((method!=0) && (method!=Z_DEFLATED))
-- return ZIP_PARAMERROR;
++ if ((method!=0) && (method!=Z_DEFLATED))
+ return ZIP_PARAMERROR;
+#endif
-
-- zi = (zip_internal*)file;
++
+ zi = (zip64_internal*)file;
if (zi->in_opened_file_inzip == 1)
@@ -4391,9 +4402,9 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
{
- return zipOpenNewFileInZip3 (file, filename, zipfi,
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
++ extrafield_local, size_extrafield_local,
++ extrafield_global, size_extrafield_global,
++ comment, method, level, raw,
+ windowBits, memLevel, strategy,
+ password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
@@ -4434,38 +4445,12 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
+ const char* comment, int method, int level, int raw)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-+ extrafield_local, size_extrafield_local,
-+ extrafield_global, size_extrafield_global,
-+ comment, method, level, raw,
-+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-+ NULL, 0, VERSIONMADEBY, 0, 0);
-+}
-+
-+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-+ const void* extrafield_local, uInt size_extrafield_local,
-+ const void* extrafield_global, uInt size_extrafield_global,
-+ const char* comment, int method, int level, int raw, int zip64)
-+{
-+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-+ extrafield_local, size_extrafield_local,
-+ extrafield_global, size_extrafield_global,
-+ comment, method, level, raw,
-+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-+ NULL, 0, VERSIONMADEBY, 0, zip64);
-+}
-+
-+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-+ const void* extrafield_local, uInt size_extrafield_local,
-+ const void*extrafield_global, uInt size_extrafield_global,
-+ const char* comment, int method, int level, int zip64)
-+{
-+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-+ extrafield_local, size_extrafield_local,
-+ extrafield_global, size_extrafield_global,
-+ comment, method, level, 0,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, raw,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0);
-+ NULL, 0, VERSIONMADEBY, 0, zip64);
++ NULL, 0, VERSIONMADEBY, 0, 0);
}
-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
@@ -4482,23 +4467,49 @@ index 9daaecbdc43571b98b2227fabb4ad59be6e02cfd..3c34fc8bd4925ae4efd0527018bd95c3
- const char* comment;
- int method;
- int level;
-+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
++extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
-+ const void*extrafield_global, uInt size_extrafield_global,
-+ const char* comment, int method, int level)
++ const void* extrafield_global, uInt size_extrafield_global,
++ const char* comment, int method, int level, int raw, int zip64)
{
- return zipOpenNewFileInZip2 (file, filename, zipfi,
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
extrafield_local, size_extrafield_local,
extrafield_global, size_extrafield_global,
- comment, method, level, 0);
-+ comment, method, level, 0,
++ comment, method, level, raw,
+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-+ NULL, 0, VERSIONMADEBY, 0, 0);
++ NULL, 0, VERSIONMADEBY, 0, zip64);
}
-local int zipFlushWriteBuffer(zi)
- zip_internal* zi;
++extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
++ const void* extrafield_local, uInt size_extrafield_local,
++ const void*extrafield_global, uInt size_extrafield_global,
++ const char* comment, int method, int level, int zip64)
++{
++ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
++ extrafield_local, size_extrafield_local,
++ extrafield_global, size_extrafield_global,
++ comment, method, level, 0,
++ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
++ NULL, 0, VERSIONMADEBY, 0, zip64);
++}
++
++extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
++ const void* extrafield_local, uInt size_extrafield_local,
++ const void*extrafield_global, uInt size_extrafield_global,
++ const char* comment, int method, int level)
++{
++ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
++ extrafield_local, size_extrafield_local,
++ extrafield_global, size_extrafield_global,
++ comment, method, level, 0,
++ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
++ NULL, 0, VERSIONMADEBY, 0, 0);
++}
++
+local int zip64FlushWriteBuffer(zip64_internal* zi)
{
int err=ZIP_OK;
@@ -5299,19 +5310,20 @@ index acacce83b9b548feca8c6a314a1a6c4ebeb9102a..8aaebb623430fcba7801c3502f8f94e4
3. This notice may not be removed or altered from any source distribution.
+ ---------------------------------------------------------------------------
-
--*/
++
+ Changes
+
+ See header of zip.h
+ */
+
-/* for more info about .ZIP format, see
- http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
- http://www.info-zip.org/pub/infozip/doc/
- PkWare has also a specification at :
- ftp://ftp.pkware.com/probdesc.zip
- */
-
+-*/
+-
-#ifndef _zip_H
-#define _zip_H
+#ifndef _zip12_H
diff --git a/debian/patches/osd_memory_corruption.patch b/debian/patches/osd_memory_corruption.patch
index 4c4d410..db7415f 100644
--- a/debian/patches/osd_memory_corruption.patch
+++ b/debian/patches/osd_memory_corruption.patch
@@ -166,8 +166,10 @@ index d6775c6a9d45a17a1f0b2728060bed3c564e4491..29bea2d2475e91a51e79c37a2876d0f0
msg->frames = 0;
}
+-// return message pointer if valid (in the OSD list), otherwise return NULL
+// set message so it doesn't automatically get freed when finished transition.
-+extern "C"
+ extern "C"
+-osd_message_t * osd_message_valid(osd_message_t *testmsg)
+void osd_message_set_user_managed(osd_message_t *msg)
+{
+ if (!l_OsdInitialized || !msg) return;
@@ -175,9 +177,7 @@ index d6775c6a9d45a17a1f0b2728060bed3c564e4491..29bea2d2475e91a51e79c37a2876d0f0
+ msg->user_managed = 1;
+}
+
- // return message pointer if valid (in the OSD list), otherwise return NULL
--extern "C"
--osd_message_t * osd_message_valid(osd_message_t *testmsg)
++// return message pointer if valid (in the OSD list), otherwise return NULL
+static osd_message_t * osd_message_valid(osd_message_t *testmsg)
{
if (!l_OsdInitialized || !testmsg) return NULL;
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
index b5cf8f6..a49904c 100644
--- a/debian/patches/rewrite_makefile.patch
+++ b/debian/patches/rewrite_makefile.patch
@@ -345,23 +345,24 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..18a55e455ec1f54306de7eb4e821249f
- Q_LD = @echo ' LD '$@;
-endif
-endif
-+# standard build rules
-+$(OBJDIR)/%.o: $(SRCDIR)/%.c
-+ $(COMPILE.c) -o $@ $<
-+
-+$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
-+ $(COMPILE.cc) -o $@ $<
-
+-
-# build rules
- $(TARGET): $(OBJECTS)
+-$(TARGET): $(OBJECTS)
- $(Q_LD)$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
- $(STRIP) $@
-+ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
- if [ "$(SONAME)" != "" ]; then ln -sf $@ $(SONAME); fi
+- if [ "$(SONAME)" != "" ]; then ln -sf $@ $(SONAME); fi
++# standard build rules
++$(OBJDIR)/%.o: $(SRCDIR)/%.c
++ $(COMPILE.c) -o $@ $<
--$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
+ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
- $(Q_CXX)$(CXX) -o $@ $(CXXFLAGS) -c $<
--
++ $(COMPILE.cc) -o $@ $<
+
-$(OBJDIR)/%.o: $(SRCDIR)/%.c
- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
++$(TARGET): $(OBJECTS)
++ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
++ if [ "$(SONAME)" != "" ]; then ln -sf $@ $(SONAME); fi
++
+.PHONY: all clean install uninstall targets
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git
More information about the Pkg-games-commits
mailing list