[mupen64plus-video-glide64] 50/172: Merge commit 'upstream/1.99.4'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:11:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.
commit e33a3945b713060a765f09caaf4a81739ec7514c
Merge: 9805517 9ea5d2a
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jan 22 10:23:50 2011 +0100
Merge commit 'upstream/1.99.4'
debian/changelog | 7 ++---
debian/patches/default-optimisations.patch | 8 +++---
debian/patches/glide64_hurd.patch | 18 -------------
debian/patches/hurd_os.patch | 4 +--
debian/patches/path_max.patch | 41 ------------------------------
debian/patches/printf_fixup.patch | 8 +++---
debian/patches/series | 2 --
projects/unix/Makefile | 5 ++++
src/3dmath.cpp | 0
src/3dmath.h | 0
src/Combine.cpp | 0
src/Combine.h | 0
src/Config.cpp | 0
src/Config.h | 0
src/Debugger.cpp | 0
src/DepthBufferRender.cpp | 0
src/Gfx1.3.h | 0
src/Ini.cpp | 5 ++++
src/Ini.h | 2 --
src/Main.cpp | 16 ++++++------
src/TexBuffer.cpp | 0
src/TexBuffer.h | 0
src/TexCache.cpp | 0
src/Util.cpp | 0
src/Util.h | 0
src/m64p.h | 0
src/osal_dynamiclib.h | 0
src/osal_dynamiclib_unix.c | 0
src/osal_dynamiclib_win32.c | 0
src/rdp.cpp | 0
src/rdp.h | 0
src/ucode06.h | 0
src/wrapper/glidesys.h | 2 +-
src/wrapper/main.cpp | 0
34 files changed, 31 insertions(+), 87 deletions(-)
diff --cc debian/changelog
index b3215f7,0000000..1da75e6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,271 -1,0 +1,268 @@@
- mupen64plus-video-glide64 (1.99.4~hg20101124-1) UNRELEASED; urgency=low
++mupen64plus-video-glide64 (1.99.4-1) UNRELEASED; urgency=low
+
- * New Upstream Snapshot from revision 4d3507ad4c0e
++ * New Upstream Version
+ * Updated my maintainer e-mail address
+ * Split source package to match upstreams modular release packages
+ * debian/copyright:
+ - Update to DEP5 revision 164
+ - Update copyright years
+ * debian/patches:
- - Add hurd_os.patch, Add GNU/Hurd as operating system with "linux" userland
+ - Add printf_fixup.patch, Correct usage of printf format strings
- - Rebase default-optimisations.patch, path_max.patch and glide64_hurd.patch
- against 1.99.4~hg20101124
+ - Remove upstream merged patches: as-needed.patch,
+ correct_fpr32_mapping.patch, correct_security_printf.patch,
+ debian-archs.patch, dejavu-font.patch, destdir.patch,
+ dont-install-unneeded.patch, fix-7z-subfolder.patch,
+ fix-desktop-file.patch, fix_r0_override.patch, fix_readpng.patch,
+ ftbfs-debugger.patch, ftbfs-dynarec.patch, ftbfs-glibc210.patch,
+ ftbfs-gvariant-type-conflicts.patch, ftbfs-kfreebsd.patch,
+ glide64-noasm.patch, gtk-open-filter.patch, interpreter_x86_fldcw.patch,
+ jttl_fix_romclosed.patch, link_gdk.patch, load_aidacrate.patch,
+ load_vistatus.patch, noexecstack.patch, optional_signinfo.patch,
+ osd-pause-crash.patch, pie_support.patch, plugin-searchpath.patch,
+ remove-gln64.patch, remove-nondfsg-icons.patch, resume_on_start.patch,
+ rice-ati-symbols.patch, rice-crash-vendorstring.patch, rice_fog.patch,
+ rice_nodebug.patch, rice-screenflickering.patch,
+ rice-texturepack-crash.patch, rsp_hle_bigendian.patch,
+ rsp_ucode2_reset.patch, static-binutils-libs.patch, system-libbz2.patch,
+ system-liblzma.patch, system-libpng.patch, system-zlib.patch,
+ version-string.patch, xdg-basedir.patch
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 15 Feb 2010 18:40:00 +0100
+
+mupen64plus (1.5+dfsg1-14) experimental; urgency=low
+
+ * Upgraded to policy 3.9.1, no changes required
+ * Upgrade debhelper compat to v8
+ * debian/rules:
+ - set *FLAGS using dpkg-buildflags in debian/rules to work like
+ dpkg-buildpackage when called directly
+ - Use hardening-includes for CFLAGS and LDFLAGS hardened builds
+ - Use externally provided LDFLAGS
+ - Disable support for debugger due to missing pic/pie support of
+ libopcodes.a
+ * debian/patches:
+ - Add correct_security_printf.patch, Correct possible printf format string
+ vulnerability
+ - Add pie_support.patch, Add support for PIE/PIC
+
+ -- Sven Eckelmann <sven at narfation.org> Thu, 23 Sep 2010 13:52:32 +0200
+
+mupen64plus (1.5+dfsg1-13) unstable; urgency=low
+
+ * debian/patches:
+ - Add path_max.patch, Add dummy PATH_MAX on systems without it (Closes:
+ #588066)
+ - Add optional_signinfo.patch, Only use siginfo subsystem if system offers
+ it (Closes: #588066)
+ - Add glide64_hurd.patch, Define GNU/Hurd as UNIX system for glide64
+ (Closes: #588066)
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 12 Jul 2010 23:20:02 +0200
+
+mupen64plus (1.5+dfsg1-12) unstable; urgency=low
+
+ * Use googlecode.debian.net instead of complex own filters for debian/watch
+ * Upgraded to policy 3.9.0, no changes required
+ * Build only on i386/amd64 because upstream doesn't to support more
+ * debian/patches:
+ - Add link_gdk.patch, Link directly against gdk-2.0 instead indirectly
+ through gtk+-2.0
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 28 Jun 2010 21:31:48 +0200
+
+mupen64plus (1.5+dfsg1-11) unstable; urgency=low
+
+ * debian/patches:
+ - Rename ftbfs-gvariant-type-conflicts.path to
+ ftbfs-gvariant-type-conflicts.patch
+ - Add rice-ati-symbols.patch, Allow to load rice on systems with missing
+ opengl extensions
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 23 May 2010 11:55:23 +0200
+
+mupen64plus (1.5+dfsg1-10) unstable; urgency=low
+
+ [ Sven Eckelmann ]
+ * debian/patches:
+ - Add rsp_ucode2_reset.patch, Reset status of specific ucode2 hacks after
+ starting again
+ - Add rsp_hle_bigendian.patch, Fix wrong high level emulation of rsp on big
+ endian systems
+ - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor
+ string (Closes: #580480, LP: #575968)
+
+ [ Piotr Ożarowski ]
+ * DMUA flag set to yes
+
+ -- Sven Eckelmann <sven at narfation.org> Thu, 06 May 2010 11:34:46 +0200
+
+mupen64plus (1.5+dfsg1-9) unstable; urgency=low
+
+ * debian/patches:
+ - Add ftbfs-gvariant-type-conflicts.path, Fix FTBFS due to glib's gvariant.h
+ type definitions (Closes: #577329)
+ - Add dont-install-unneeded.patch, Don't install files which aren't used by
+ us
+ * debian/rules:
+ - Enable parallel builds using dh's --parallel
+ - Inform about missing installed files using dh's --list-missing
+ - Share options between dh_auto_build and dh_auto_install
+ * debian/control:
+ - Depend on debhelper 7.4.10 for --parallel and --list-missing
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 11 Apr 2010 12:23:04 +0200
+
+mupen64plus (1.5+dfsg1-8) unstable; urgency=low
+
+ * debian/patches:
+ - Add rice_fog.patch, Reduce flickering when enabling fog in rice
+ - Update fix_readpng.patch, Fix FTBFS with libpng14 and remove coding style
+ only changes
+ * Convert to 3.0 (quilt) source format
+ * Remove outdated README.source
+ * debian/control:
+ - Remove shlibs:Depends for binary packages without shared libs dependencies
+ - Remove unneeded build dependency to quilt
+ - Upgraded to policy 3.8.4, no changes required
+ * Correct spelling errors found by lintian
+ * debian/copyright: Update copyright years
+ * Check all files ever published on the download page in debian/watch
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 15 Mar 2010 16:22:03 +0100
+
+mupen64plus (1.5+dfsg1-7) unstable; urgency=low
+
+ * debian/patches:
+ - Correct minor dep3 patch tagging format problems
+ - Update correct_fpr32_mapping.patch, prevent corruption of upper registers
+ in a register pair due to sign extension
+ - Add system-liblzma.patch, use liblzma from debian instead of buildin
+ (Closes: #543552)
+ * debian/control:
+ - Depend on liblzma-dev for lzma and xz support
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 19 Oct 2009 12:38:26 +0200
+
+mupen64plus (1.5+dfsg1-6) unstable; 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
+ - Update noexecstack.patch, Backport actual commit from upstream
+ - Update jttl_fix_romclosed.patch, Backport actual commit from upstream
+ - Add correct_fpr32_mapping.patch, Correct emulation of shared 32 bit wide
+ and 64 bit wide FPR in MIPS I and MIPS III mode
+ - Remove load-fpr-location.patch which is replaced by
+ correct_fpr32_mapping.patch
+ - Add load_aidacrate.patch, Set aiDacrate during savestate load to fix
+ slowdowns after savestate load
+ - Add load_vistatus.patch, Set video width and status during savestate load
+ - Add fix_r0_override.patch, Don't allow to override r0 register
+ - Add resume_on_start.patch, Resume when pressing on start when in pause
+ mode to prevent corruption
+ - Add osd-pause-crash.patch, Fix OSD crash after pause-stop-start-pause of
+ emulator
+
+ -- Sven Eckelmann <sven at narfation.org> Thu, 08 Oct 2009 13:29:25 +0200
+
+mupen64plus (1.5+dfsg1-5) unstable; urgency=low
+
+ * debian/patches:
+ - Change to dep3 patch tagging guidelines
+ - Remove number before patches as order is given by debian/patches/series
+ - Add gtk-open-filter.patch, Show files with .n64 and .v64 extension in
+ filtered open file dialog (Closes: #546046)
+ - Add noexecstack.patch, Don't enable executable stack by default
+ (Closes: #547644)
+ - Add fix_readpng.patch, Fix crash when loading png due to reordering
+ optimizer
+ - Add jttl_fix_romclosed.patch, Stop audio processing thread before freeing
+ buffers to fix segfault during stop of emulation
+ - Add rice_nodebug.patch, Don't enable excessive debug functionality in
+ rice_video
+ - Add interpreter_x86_fldcw.patch, Correctly set floating point control word
+ - Add load-fpr-location.patch, Set register bank location when loading
+ savestate
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 28 Sep 2009 15:23:17 +0200
+
+mupen64plus (1.5+dfsg1-4) unstable; urgency=low
+
+ * debian/patches;
+ - Update 119-debian-archs.patch, Correct detection of armel cpu endianness
+ (Closes: #545463)
+ - Add 120-ftbfs-glibc210, Fix FTBFS using g++-4.4 and glibc 2.10 due to
+ missing const keywords (Closes: #545462)
+ - Add 121-version-string.patch, remove misleading "-development" in version
+ string
+ - Add 122-default-optimisations.patch, Don't override optimisations set by
+ debian build environment
+
+ -- Sven Eckelmann <sven at narfation.org> Tue, 08 Sep 2009 22:17:00 +0200
+
+mupen64plus (1.5+dfsg1-3) unstable; urgency=low
+
+ * debian/rules:
+ - Set host architecture to support build of i386 running on x86_64 kernel
+ (Closes: #544670)
+ - Don't set NO_ASM parameter anymore as it is handled by
+ 119-debian-archs.patch
+ * debian/patches:
+ - Add 119-debian-archs.patch, Define wordsize and endianness of
+ architectures supported by debian (Closes: #544673)
+ - Update 118-ftbfs-debugger.patch, define dummy functions to decompile
+ recompiled code on non-x86 architectures (Closes: #544662)
+
+ -- Sven Eckelmann <sven at narfation.org> Wed, 02 Sep 2009 23:18:11 +0200
+
+mupen64plus (1.5+dfsg1-2) unstable; urgency=low
+
+ * debian/patches
+ - Add 114-fix-7z-subfolder.patch, fix crash in romcache when reading 7zip
+ archive with subfolders
+ - Add 115-xdg-basedir.patch, Use "XDG Base Directory" compliant directories
+ for files for each user (Closes: #544428)
+ - Add 116-ftbfs-dynarec.patch, Don't try to compile dynarec on architectures
+ without support (Closes: #544548)
+ - Add 117-ftbfs-kfreebsd.patch, Don't stop compilation due to unknown OS
+ kFreeBSD (Closes: #544550)
+ - Add 118-ftbfs-debugger.patch, Define CHECK_MEM for non-x86 systems to
+ prevent FTBFS due to dynarec checks (Closes: #544549)
+ * debian/control:
+ - Depend on libxdg-basedir-dev and pkg-config to support xdg-basedir
+ specification
+ * debian/rules:
+ - Disable assembler optimized parts on unsupported architectures
+ * Add README.source with information about patch management
+ * Add NEWS.Debian with information about migration of old data and
+ configuration to new xdg compliant directories
+
+ -- Sven Eckelmann <sven at narfation.org> Tue, 01 Sep 2009 20:40:30 +0200
+
+mupen64plus (1.5+dfsg1-1) unstable; urgency=low
+
+ * Initial release (Closes: #513322)
+ * debian/patches:
+ - Add 100-fix-desktop-file.patch, fix desktop file
+ - Add 101-destdir.patch, fix usage of DESTDIR in install target
+ - Add 102-plugin-searchpath.patch, add search path for plugins
+ - Add 103-dejavu-font.patch, use font from ttf-dejavu-core package
+ - Add 104-as-needed.patch, allow --as-needed to reduce number of linked
+ libraries
+ - Add 105-system-libpng.patch, use libpng from debian instead of buildin
+ - Add 106-system-zlib.patch, use zlib from debian instead of buildin
+ - Add 107-system-libbz2.patch, use libbz2 from debian instead of buildin
+ - Add 108-remove-gln64.patch, don't try to build glN64 removed from dfsg tar
+ - Add 109-remove-nondfsg-icons.patch, don't include non-dfsg icons which are
+ removed from dfsg tarball
+ - Add 110-glide64-noasm.patch, don't use x86-asm on non-x86 plattforms
+ in glide64
+ - Add 111-rice-texturepack-crash.patch, Fix crash when loading textures
+ from texturepacks with rice_video
+ - Add 112-rice-screenflickering.patch, Reduce screenflickering in some games
+ when using rice_video
+ - Add 113-static-binutils-libs.patch, Link static against binutils libraries
+ with unstable abi
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 17 Aug 2009 10:18:49 +0200
diff --cc debian/patches/default-optimisations.patch
index c4f61be,0000000..c560ca4
mode 100644,000000..100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@@ -1,40 -1,0 +1,40 @@@
+Description: Don't override optimisations set by build environment
+Forwarded: not-needed
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
- index f1f2dbcea9ee403b0c1a952192cef153139907e2..24e68a36ce46053da66aff336d1876545eeb0fad 100644
++index 0e8bf208113b0449193a8746d8e0b88d7259692f..9e4a873e27ceafea5485331dbeb22ed117351b90 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
- @@ -85,7 +85,7 @@ ifeq ("$(CPU)","NONE")
++@@ -90,7 +90,7 @@ ifeq ("$(CPU)","NONE")
+ endif
+
+ # base CFLAGS, LIBS, and LDFLAGS
+-CFLAGS += -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/wrapper -DGCC
++CFLAGS += -Wall -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/wrapper -DGCC
+ CXXFLAGS += -fvisibility-inlines-hidden
+ LDFLAGS += -ldl
+
- @@ -113,9 +113,9 @@ ifeq ($(OS), LINUX)
++@@ -118,9 +118,9 @@ ifeq ($(OS), LINUX)
+ LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver
+ ifeq ($(CPU), X86)
+ ifeq ($(ARCH_DETECTED), 64BITS)
+- CFLAGS += -pipe -O3 -march=athlon64
++ CFLAGS += -pipe
+ else
+- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
++ CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
+ endif
+ endif
+ endif
- @@ -130,9 +130,6 @@ ifeq ($(OS), OSX)
++@@ -135,9 +135,6 @@ ifeq ($(OS), OSX)
+ endif
+ endif
+ endif
+-ifeq ($(CPU), PPC)
+- CFLAGS += -mcpu=powerpc
+-endif
+
+ # test for presence of SDL
+ ifeq ($(shell which sdl-config 2>/dev/null),)
diff --cc debian/patches/hurd_os.patch
index d7e86f4,0000000..61ec34a
mode 100644,000000..100644
--- a/debian/patches/hurd_os.patch
+++ b/debian/patches/hurd_os.patch
@@@ -1,20 -1,0 +1,20 @@@
+Description: Add GNU/Hurd as operating system with "linux" userland
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
- index 24e68a36ce46053da66aff336d1876545eeb0fad..9e4a873e27ceafea5485331dbeb22ed117351b90 100644
++index 9e4a873e27ceafea5485331dbeb22ed117351b90..1efec199f79146b04005a501e3bc01acd9fb3bcb 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
- @@ -35,6 +35,11 @@ ifeq ("$(UNAME)","linux")
++@@ -40,6 +40,11 @@ ifneq ("$(filter GNU hurd,$(UNAME))","")
+ SO_EXTENSION = so
+ SHARED = -shared
+ endif
++ifneq ("$(filter GNU hurd,$(UNAME))","")
++ OS = LINUX
++ SO_EXTENSION = so
++ SHARED = -shared
++endif
+ ifeq ("$(UNAME)","Darwin")
+ OS = OSX
+ SO_EXTENSION = dylib
diff --cc debian/patches/printf_fixup.patch
index dc81ae9,0000000..a69818e
mode 100644,000000..100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@@ -1,167 -1,0 +1,167 @@@
+Description: Add printf-format attribute
+ The compiler needs to get more information for function declaration to
+ help to find printf specific format attacks.
+Forwarded: not-needed
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/Debugger.cpp b/src/Debugger.cpp
- index 88b2faad4394909c2bf9f99b23929e7ff68cb6ba..1dd50d683258449572d648acbe894b99c8f48f34 100644
++index 88b2faad4394909c2bf9f99b23929e7ff68cb6ba..1dd50d683258449572d648acbe894b99c8f48f34 100755
+--- a/src/Debugger.cpp
++++ b/src/Debugger.cpp
+@@ -1013,7 +1013,6 @@ void debug_keys ()
+ //
+ // output - output debugger text
+ //
+-
+ void output (float x, float y, BOOL scale, const char *fmt, ...)
+ {
+ va_list ap;
+diff --git a/src/Debugger.h b/src/Debugger.h
+index 15539be4f59a8b0f3d87bb8a8c6287b40c7068c4..875c6deeeacd17fc2c1c66647646b89920737fa0 100644
+--- a/src/Debugger.h
++++ b/src/Debugger.h
+@@ -133,5 +133,5 @@ void debug_capture ();
+ void debug_cacheviewer ();
+ void debug_mouse ();
+ void debug_keys ();
+-void output (float x, float y, BOOL scale, const char *fmt, ...);
++void output (float x, float y, BOOL scale, const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
+
+diff --git a/src/Gfx1.3.h b/src/Gfx1.3.h
- index e76d54ad45b3b2eea7087de20038151b5bcc3c40..9e5463b3ffa5d8244e423058a6e04e94ca2a0550 100644
++index e76d54ad45b3b2eea7087de20038151b5bcc3c40..9e5463b3ffa5d8244e423058a6e04e94ca2a0550 100755
+--- a/src/Gfx1.3.h
++++ b/src/Gfx1.3.h
+@@ -233,7 +233,7 @@ extern __int64 perf_next;
+ extern std::ofstream loga;
+ #define LOG(x) loga.open("log.txt",ios::app); loga << x; loga.flush(); loga.close();
+ #else
+-#define LOG(x) WriteLog(M64MSG_VERBOSE, x);
++#define LOG(x) WriteLog(M64MSG_VERBOSE, "%s", x);
+ #endif
+
+
+@@ -273,6 +273,7 @@ extern std::ofstream rdp_err;
+
+
+ #ifdef RDP_LOGGING
++__inline void FRDP (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+ __inline void FRDP (const char *fmt, ...)
+ {
+ #ifdef RDP_LOGGING
+@@ -289,6 +290,7 @@ __inline void FRDP (const char *fmt, ...)
+ va_end(ap);
+ #endif
+ }
++__inline void FRDP_E (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+ __inline void FRDP_E (const char *fmt, ...)
+ {
+ #ifdef RDP_ERROR_LOG
+diff --git a/src/m64p.h b/src/m64p.h
- index fc22fbf157b7c9e1507c6a2430268afc71d4c4f8..af6e1bbb8be0772b38eeee282b9ee459c4a9815e 100644
++index fc22fbf157b7c9e1507c6a2430268afc71d4c4f8..af6e1bbb8be0772b38eeee282b9ee459c4a9815e 100755
+--- a/src/m64p.h
++++ b/src/m64p.h
+@@ -28,7 +28,7 @@
+ #include "m64p_vidext.h"
+ #include <stdio.h>
+
+-void WriteLog(m64p_msg_level level, const char *msg, ...);
++void WriteLog(m64p_msg_level level, const char *msg, ...) __attribute__ ((format (printf, 2, 3)));
+
+ //The Glide API originally used an integer to pick an enumerated resolution.
+ //To accomodate arbitrary resolutions, pack it into a 32-bit struct
+diff --git a/src/wrapper/combiner.cpp b/src/wrapper/combiner.cpp
+index 6f2f189083942180eb331d155ea84494ddbeb84f..484a880f4a0d07dfc55c64200d5487b22b7f90c1 100644
+--- a/src/wrapper/combiner.cpp
++++ b/src/wrapper/combiner.cpp
+@@ -371,11 +371,11 @@ void init_combiner()
+ if(!log_length)
+ {
+ glGetInfoLogARB(fragment_shader_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ glGetInfoLogARB(vertex_shader_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ glGetInfoLogARB(program_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ }
+
+ texture0_location = glGetUniformLocationARB(program_object, "texture0");
+@@ -421,11 +421,11 @@ void init_combiner()
+ if(!log_length)
+ {
+ glGetInfoLogARB(fragment_shader_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ glGetInfoLogARB(vertex_shader_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ glGetInfoLogARB(program_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ }
+
+ texture0_location = glGetUniformLocationARB(program_object, "texture0");
+@@ -661,12 +661,12 @@ void compile_shader()
+ {
+ glGetInfoLogARB(shader_programs[number_of_programs].fragment_shader_object,
+ 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ glGetInfoLogARB(vertex_shader_object, 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ glGetInfoLogARB(program_object,
+ 2048, &log_length, shader_log);
+- if(log_length) display_warning(shader_log);
++ if(log_length) display_warning("%s", shader_log);
+ }
+
+ texture0_location = glGetUniformLocationARB(program_object, "texture0");
+diff --git a/src/wrapper/main.cpp b/src/wrapper/main.cpp
- index bbffe11a7a3522d1dd77aa6cb76b88c7eb712dca..12da5cb47ac58c7734c83c4a3b917a2202922a5a 100644
++index bbffe11a7a3522d1dd77aa6cb76b88c7eb712dca..12da5cb47ac58c7734c83c4a3b917a2202922a5a 100755
+--- a/src/wrapper/main.cpp
++++ b/src/wrapper/main.cpp
+@@ -230,7 +230,7 @@ void display_warning(const char *text, ...)
+ vsprintf((char*)buf, (char*)text, ap);
+ va_end(ap);
+
+- WriteLog(M64MSG_WARNING, buf);
++ WriteLog(M64MSG_WARNING, "%s", buf);
+ first_message--;
+ }
+ }
+@@ -1283,7 +1283,7 @@ void updateTexture()
+
+ // nothing changed, don't update the texture
+ if (!buffer_cleared) {
+- WriteLog(M64MSG_VERBOSE, "update cancelled\n", pBufferAddress);
++ WriteLog(M64MSG_VERBOSE, "update cancelled\n");
+ return;
+ }
+
+diff --git a/src/wrapper/main.h b/src/wrapper/main.h
+index a5333f27162b89703241bf126f0c61b6125d8026..28c045a3fef9a03741199a1bc66016aa5df44b37 100644
+--- a/src/wrapper/main.h
++++ b/src/wrapper/main.h
+@@ -92,8 +92,7 @@ extern int buffer_cleared; // mark that the buffer has been cleared, used to che
+
+ #include "glide.h"
+
+-void display_warning(const unsigned char *text, ...);
+-void display_warning(const char *text, ...);
++void display_warning(const char *text, ...) __attribute__ ((format (printf, 1, 2)));
+ void init_geometry();
+ void init_textures();
+ void init_combiner();
+@@ -283,7 +282,7 @@ grConstantColorValueExt(GrChipID_t tmu,
+ #ifdef LOGGING
+ void OPEN_LOG();
+ void CLOSE_LOG();
+-void LOG(char *text, ...);
++void LOG(char *text, ...) __attribute__ ((format (printf, 1, 2)));
+ #else // LOGGING
+ #define OPEN_LOG()
+ #define CLOSE_LOG()
diff --cc debian/patches/series
index 73069d6,0000000..eb30664
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,3 @@@
+default-optimisations.patch
+hurd_os.patch
- path_max.patch
- glide64_hurd.patch
+printf_fixup.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git
More information about the Pkg-games-commits
mailing list