[mupen64plus-core] 100/310: Merge commit 'upstream/1.99.5_hg20110828' into experimental

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:57:28 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 4565e9826b2af627c79747c3a0d1e6a104ef1c33
Merge: 7332d10 63b3f0d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Aug 28 18:46:25 2011 +0200

    Merge commit 'upstream/1.99.5_hg20110828' into experimental

 LICENSES                                           |    5 +-
 debian/changelog                                   |    5 +-
 .../Mupen64Plus_Plugin_Parameters.txt              |   12 +-
 .../Mupen64Plus_v2.0_Core_API_v1.0.txt             |   10 +-
 .../Mupen64Plus_v2.0_Core_Basic.txt                |   16 +-
 .../Mupen64Plus_v2.0_Core_Front-End.txt            |    5 +
 .../Mupen64Plus_v2.0_Core_Video_Extension.txt      |   15 +
 .../Mupen64Plus_v2.0_Design_Proposal_3.txt         |    2 +-
 doc/emuwiki-api-doc/Mupen64Plus_v2.0_headers.txt   |   33 +-
 doc/module-api-versions.txt                        |  131 +
 projects/msvc8/mupen64plus-core.vcproj             |   16 +-
 projects/unix/Makefile                             |  198 +-
 src/api/api_export.ver                             |    2 +
 src/api/callbacks.h                                |    5 +-
 src/api/common.c                                   |   22 +-
 src/api/config.c                                   |    4 +-
 src/api/config.h                                   |   27 -
 src/api/debugger.c                                 |    2 +
 src/api/frontend.c                                 |   54 +-
 src/api/m64p_common.h                              |   29 +
 src/api/m64p_config.h                              |   59 +
 src/api/m64p_debugger.h                            |   56 +
 src/api/m64p_frontend.h                            |   46 +-
 src/api/m64p_plugin.h                              |   58 +-
 src/api/m64p_types.h                               |    7 +-
 src/api/m64p_vidext.h                              |   45 +
 src/api/vidext.c                                   |   56 +-
 src/api/vidext.h                                   |    4 +-
 src/debugger/dbg_decoder_local.h                   | 2986 ++++++++++----------
 src/main/adler32.c                                 |    2 +
 src/main/eventloop.c                               |   30 +-
 src/main/ini_reader.c                              |    2 +-
 src/main/main.c                                    |   63 +-
 src/main/main.h                                    |    3 +
 src/main/rom.c                                     |   14 +-
 src/main/rom.h                                     |    2 +-
 src/main/savestates.c                              |   35 +-
 src/main/util.c                                    |    3 -
 src/main/version.h                                 |    7 +-
 src/main/zip/unzip.c                               |    2 +-
 src/main/zip/zip.c                                 |    4 +-
 src/memory/dma.c                                   |    8 +-
 src/memory/memory.c                                |    2 +-
 src/memory/memory.h                                |    2 +-
 src/memory/n64_cic_nus_6105.c                      |  119 +
 src/memory/n64_cic_nus_6105.h                      |   98 +
 src/memory/pif.c                                   |   80 +-
 src/memory/pif2.h                                  | 1369 ---------
 src/osd/osd.cpp                                    |   52 +-
 src/osd/osd.h                                      |    3 +-
 src/osd/screenshot.cpp                             |    2 +
 src/plugin/plugin.c                                |    8 +-
 src/plugin/plugin.h                                |    8 +-
 src/r4300/cop1.c                                   |    8 +-
 src/r4300/cop1_d.c                                 |  126 +-
 src/r4300/cop1_l.c                                 |    9 +-
 src/r4300/cop1_s.c                                 |  126 +-
 src/r4300/cop1_w.c                                 |    8 +-
 src/r4300/fpu.h                                    |  459 +++
 src/r4300/interupt.c                               |   30 +-
 src/r4300/macros.h                                 |   16 +-
 src/r4300/pure_interp.c                            |  271 +-
 src/r4300/r4300.c                                  |   21 +-
 src/r4300/recomp.c                                 |   78 +-
 src/r4300/recomp.h                                 |    5 +-
 src/r4300/x86/rjump.c                              |   74 +-
 src/r4300/x86_64/rjump.c                           |  118 +-
 tools/build_bundle_bin.sh                          |    2 +-
 tools/build_bundle_src.sh                          |    2 +-
 tools/build_modules_src.sh                         |    4 +-
 tools/install_binary_bundle.sh                     |   22 +-
 tools/m64p_helper_scripts.tar.gz                   |  Bin 1696 -> 1701 bytes
 tools/uninstall_binary_bundle.sh                   |    7 +-
 73 files changed, 3499 insertions(+), 3715 deletions(-)

diff --cc debian/changelog
index bb2c8fe,0000000..19760fb
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,330 -1,0 +1,331 @@@
- mupen64plus-core (1.99.4-4) UNRELEASED; urgency=low
++mupen64plus-core (1.99.5~hg20110828-1) UNRELEASED; urgency=low
 +
++  * New upstream snapshot from revision 1452df5744c9
 +  * debian/control:
 +    - Add virtual package libsdl-dev as alternative build dependency
 +  * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
 +
-  -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Aug 2011 21:53:01 +0200
++ -- Sven Eckelmann <sven at narfation.org>  Sun, 28 Aug 2011 18:58:27 +0200
 +
 +mupen64plus-core (1.99.4-3) unstable; urgency=low
 +
 +  * Upload to unstable
 +  * debian/control:
 +    - Fix spelling of "Flexible" (Closes: #633693)
 +    - Depend on pkg-config for new Makefile
 +  * debian/rules:
 +    - Mark all targets as phony
 +    - Force PIC using Makefile option
 +    - Remove unintended optimization flags
 +    - Automatically create the libmupen64plus.so.2 symlink
 +  * debian/patches:
 +    - Remove obsolete default-optimisations.patch
 +    - Rebase debian/patches/dejavu-font.patch
 +    - Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking
 +    - Add big_endian_conflict.patch, Don't use _BIG_ENDIAN to check for
 +      endianness
 +    - Add privilege_segfault.patch, Prevent segfault when
 +      .local/share/mupen64plus/ owned by root
 +    - Add info_configuration_failure.patch, Changed warning to info message when
 +      core can not open config
 +    - Add conflicting_symbol.patch, Don't define variable isGoldeneyeRom in each
 +      file
 +    - Add osd_memory_corruption.patch, Prevent data corruption with caller
 +      managed OSD text
 +    - Add allocate_mmap.patch, Allocate exec memory using mmap
 +    - Add interpreter_fpu_modes.patch, Use common fpu implementation for
 +      interpreter modes to fix missing round/trunc/ceil/floor/set_rounding
 +    - Add interpreter_rw_memory.patch, Don't require executable memory for
 +      cached interpreter
 +    - Add n64_cic_nus_6105.patch, use X-Scale's PIF-CIC algorithm instead of the
 +      hard-coded challenge-response pairs
 +    - Add mipmapping_doc.patch, Synchronize MipMapping options in Arachnoid and
 +      Rice
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 24 Jul 2011 14:23:31 +0200
 +
 +mupen64plus-core (1.99.4-2) experimental; urgency=low
 +
 +  * debian/patches:
 +    - Add rtc.patch, Add support for n64 internal clock
 +    - Add n64_romswap.patch, Fix swapping of n64 images
 +    - Add rjump_globber.patch. Prevent over-optimization of rjump related data
 +  * Upgraded to policy 3.9.2, no changes required
 +  * Update Vcs-* fields to new anonscm.debian.org URLs in debian/control
 +  * Add multiarch support (Closes: #623765)
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sat, 11 Jun 2011 17:28:34 +0200
 +
 +mupen64plus-core (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
 +    - Add api_header.patch, Ensure all definition for front-ends is in public
 +      headers
 +    - Rebase default-optimisations.patch and dejavu-font.patch
 +      against 1.99.4
 +    - Remove upstream merged patches: as-needed.patch,
 +      correct_fpr32_mapping.patch, correct_security_printf.patch,
 +      debian-archs.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 <sven at narfation.org>  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 <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

-- 
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