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 f29395d0aaf5fb4b7e489aa12c6d6ab8f9f88179 Merge: 0ccaed6 ffd1110 Author: Sven Eckelmann <[email protected]> Date: Fri Sep 9 10:35:52 2011 +0200 Merge commit 'upstream/1.99.4+26+4e8c27128826' into experimental debian/changelog | 5 ++- debian/patches/printf_fixup.patch | 79 --------------------------------------- src/maingl.cpp | 1 - src/rdp.cpp | 2 +- src/rgl.cpp | 6 +-- src/rgl_osdep.cpp | 4 ++ src/rgl_rendermode.cpp | 4 +- src/rgl_tiles.cpp | 2 +- 8 files changed, 14 insertions(+), 89 deletions(-) diff --cc debian/changelog index b8833a4,0000000..d4ce1fd mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,316 -1,0 +1,317 @@@ - mupen64plus-video-z64 (1.99.4+24+81f51799ae45-2) UNRELEASED; urgency=low ++mupen64plus-video-z64 (1.99.4+26+4e8c27128826-1) UNRELEASED; urgency=low + ++ * New upstream snapshot from revision 4e8c2712882684af5233ea66b7033ecf6043a3cb + * debian/patches: - - Fix more warnings in printf_fixup.patch ++ - Rebase printf_fixup.patch against 1.99.4+26+4e8c27128826 + + -- Sven Eckelmann <[email protected]> Sun, 04 Sep 2011 13:27:34 +0200 + +mupen64plus-video-z64 (1.99.4+24+81f51799ae45-1) experimental; urgency=low + + * New upstream snapshot from revision 81f51799ae4560b8a3b644ba992d0ddd747464ac + * debian/control: + - Add virtual package libsdl-dev as alternative build dependency + - Depend on mupen64plus-*-abi-2 + - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1 + * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82 + * debian/patches: + - Remove upstream merged patch rewrite_makefile.patch + - Rebase printf_fixup.patch against 1.99.4+24+81f51799ae45 + * Add debian/get-orig-source.sh for snapshots + + -- Sven Eckelmann <[email protected]> Mon, 29 Aug 2011 17:07:17 +0200 + +mupen64plus-video-z64 (1.99.4-3) unstable; urgency=low + + * Upload to unstable + * debian/control: + - Build against libglew1.6 + - Depend on pkg-config for new Makefile + * debian/rules: + - Mark all targets as phony + - Force PIC using Makefile option + - Remove unintended optimization flags + * debian/patches: + - Remove obsolete default-optimisations.patch + - Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking + + -- Sven Eckelmann <[email protected]> Sun, 24 Jul 2011 14:24:52 +0200 + +mupen64plus-video-z64 (1.99.4-2) experimental; urgency=low + + * Upgraded to policy 3.9.2, no changes required + * Update Vcs-* fields to new anonscm.debian.org URLs in debian/control + * Add multiarch support + + -- Sven Eckelmann <[email protected]> Sat, 11 Jun 2011 16:54:33 +0200 + +mupen64plus-video-z64 (1.99.4-1) experimental; urgency=low + + * 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 printf_fixup.patch, Correct usage of printf format strings + - Rebase default-optimisations.patch against 1.99.4 + - 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_hurd.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, path_max.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 <[email protected]> Sat, 22 Jan 2011 11:05:28 +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Mon, 17 Aug 2009 10:18:49 +0200 diff --cc debian/patches/printf_fixup.patch index 3b7f482,0000000..e6237b5 mode 100644,000000..100644 --- a/debian/patches/printf_fixup.patch +++ b/debian/patches/printf_fixup.patch @@@ -1,122 -1,0 +1,43 @@@ +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 <[email protected]> + +--- - diff --git a/src/rdp.cpp b/src/rdp.cpp - index a986e6cb0da48bf68df0d0e6c3875d718f2793f7..673522b78e4f0e9089e851ccff7d19c484edcb6b 100644 - --- a/src/rdp.cpp - +++ b/src/rdp.cpp - @@ -456,7 +456,7 @@ static void rdp_load_block(uint32_t w1, uint32_t w2) - tl * rdpTiWidth*4 + rdpTiAddress + sl*4, 0, ~0, ~0); - - if (tb+width/4 > 0x1000/4) { - - LOG("load_block : fixup too large width\n", width, 0x1000-tb*4); - + LOG("load_block : fixup too large width\n"); - width = 0x1000-tb*4; - } - +diff --git a/src/rdp.h b/src/rdp.h +index bbad3fd0ae694ed9c39bebd0fee890007c042500..6d21b1e77b4815671ec609d51bfb030f92f40b9f 100644 +--- a/src/rdp.h ++++ b/src/rdp.h +@@ -247,7 +247,7 @@ int rdp_dasm(uint32_t * rdp_cmd_data, int rdp_cmd_cur, int length, char *buffer) + void rdp_process_list(void); + int rdp_store_list(void); + +-void rdp_log(m64p_msg_level level, const char *msg, ...); ++void rdp_log(m64p_msg_level level, const char *msg, ...) __attribute__ ((format (printf, 2, 3))); + + #ifdef RDP_DEBUG + +@@ -258,6 +258,7 @@ extern int rdp_dump; + + #define DUMP if (!rdp_dump) ; else LOG + ++static void LOG(const char * s, ...) __attribute__ ((format (printf, 1, 2))); + static void LOG(const char * s, ...) + { + va_list ap; - diff --git a/src/rgl.cpp b/src/rgl.cpp - index 3150a5feb8ef12dfde4b672a8234196cba3cb501..275bba1c2fe8d0e9412d9ab3b7bc19ddc81f277f 100644 - --- a/src/rgl.cpp - +++ b/src/rgl.cpp - @@ -344,7 +344,7 @@ int rglUseTile(rglTile_t & tile, float & ds, float & dt, float & ss, float & st) - ds = ss - ds; - dt = st - dt; - - - DUMP("texture fb %x shift %g x %g (scale %g x %g) tile %d x %d (sl %d tl %d)\n", - + DUMP("texture fb %p shift %g x %g (scale %g x %g) tile %d x %d (sl %d tl %d)\n", - &hbuf, ds, dt, ss, st, tile.w, tile.h, - tile.sl, tile.tl); - } else { - @@ -435,7 +435,7 @@ void rglPrepareFramebuffer(rglRenderBuffer_t & buffer) - rglDeleteRenderBuffer(buffer); - } - - - DUMP("Render buffer %x at %x --> %x\n", &buffer, - + DUMP("Render buffer %p at %x --> %x\n", &buffer, - buffer.addressStart, buffer.addressStop); - - if (!buffer.fbid) { - @@ -605,7 +605,7 @@ void rglRenderChunks(int upto) - if (lastBuffer != &buffer) - rglPrepareFramebuffer(buffer); - - - DUMP("Buffer %x at %x area %d -> %d x %d -> %d\n", - + DUMP("Buffer %p at %x area %d -> %d x %d -> %d\n", - &buffer, buffer.addressStart, - buffer.area.xh>>2, buffer.area.xl>>2, - buffer.area.yh>>2, buffer.area.yl>>2); +diff --git a/src/rgl_debugger.cpp b/src/rgl_debugger.cpp +index 3a55ea260bbaf8e1b4d9d586417ddc81c5d2148e..0be955f0572cf6726e0a451ea1edec329c388dc6 100644 +--- a/src/rgl_debugger.cpp ++++ b/src/rgl_debugger.cpp +@@ -174,8 +174,8 @@ void gglPrint(int x, int y, const char * text) + + //printf("%s\n", text); + } +- +-void gglPrintf(int x, int y, const char * s, ...) ++static void gglPrintf(int x, int y, const char * s, ...) __attribute__ ((format (printf, 1, 2))); ++static void gglPrintf(int x, int y, const char * s, ...) + { + char buf[1024]; + va_list ap; - diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp - index 651c12770a666b28dbec64ec7318161db82ee15c..e1a33327b7df002984152478fbc71caac7172f12 100644 - --- a/src/rgl_rendermode.cpp - +++ b/src/rgl_rendermode.cpp - @@ -604,7 +604,7 @@ case 0: // c - break; - case 1: // f - LOGERROR("Unsupported src color : FRAG\n"); - - LOGERROR(rglCombiner2String(state)); - + LOGERROR("%s", rglCombiner2String(state)); - break; - case 2: // b - p += sprintf( - @@ -641,7 +641,7 @@ case 3: - c->dstBlend = dst; - } else { - LOGERROR("Unsuported blender :\n"); - - LOGERROR(rglCombiner2String(state)); - + LOGERROR("%s", rglCombiner2String(state)); - } - } - else - diff --git a/src/rgl_tiles.cpp b/src/rgl_tiles.cpp - index 8f471f9656277faf03c33629373c318d685c69c4..7d31bca4632b27d4a9b9d03f7c043a009efbb57f 100644 - --- a/src/rgl_tiles.cpp - +++ b/src/rgl_tiles.cpp - @@ -604,7 +604,7 @@ GL_MIRROR_CLAMP_TO_EDGE_EXT : GL_MIRRORED_REPEAT; - } - - if (packed) { - - DUMP("loading texture %dx%d fmt %s size %x (%x %x %x %x)\n", tile.w, tile.h, rdpImageFormats[tile.format], tile.size, glfmt, glpixfmt, packed, ptr); - + DUMP("loading texture %dx%d fmt %s size %x (%x %x %x %p)\n", tile.w, tile.h, rdpImageFormats[tile.format], tile.size, glfmt, glpixfmt, packed, ptr); - // printf("cycle type = %d\n", chunk.rdpState.otherModes.cycle_type); - if (!glpixfmt) - glpixfmt = glfmt; -- 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
