[mupen64plus-core] 21/310: Merge commit 'upstream/1.99.4.hg20100403'

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:56:56 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 d43ed611d5a8703ba2f136b68013550c5d457e7f
Merge: b696b35 2b85d65
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 21:38:11 2010 +0200

    Merge commit 'upstream/1.99.4.hg20100403'

 LICENSES                                           |    3 +
 debian/changelog                                   |    3 +-
 .../Mupen64Plus_Plugin_Parameters.txt              |   11 +-
 .../Mupen64Plus_v2.0_Core_Front-End.txt            |    2 +-
 .../Mupen64Plus_v2.0_Plugin_API.txt                |    6 +-
 doc/emuwiki-api-doc/Mupen64Plus_v2.0_headers.txt   |    4 +-
 projects/msvc8/mupen64plus-core.vcproj             |   20 +-
 projects/unix/Makefile                             |   38 +-
 src/api/api_export.ver                             |   62 +
 src/api/config.c                                   |    5 +-
 src/api/m64p_plugin.h                              |    2 +-
 src/api/m64p_types.h                               |    5 +-
 src/api/vidext.c                                   |    4 +-
 src/debugger/dbg_decoder.c                         | 1937 ++++++++------------
 src/debugger/dbg_decoder.h                         |   39 +-
 src/debugger/dbg_decoder_local.h                   | 1493 +++++++++++++++
 src/debugger/dbg_memory.h                          |  310 ++--
 src/debugger/dbg_opprintf.c                        |  355 ----
 src/debugger/dbg_opprintf.h                        |   59 -
 src/debugger/debugger.h                            |    6 +-
 src/main/main.c                                    |    8 +-
 src/main/main.h                                    |    4 +-
 src/main/savestates.h                              |   12 +-
 src/memory/dma.c                                   |   12 +-
 src/memory/dma.h                                   |   12 +-
 src/memory/flashram.c                              |    9 +-
 src/memory/flashram.h                              |    8 +-
 src/memory/memory.c                                |  332 ++--
 src/memory/memory.h                                |  336 ++--
 src/memory/pif.c                                   |   16 +-
 src/memory/pif.h                                   |    4 +-
 src/memory/pif2.h                                  |    2 +-
 src/osd/osd.h                                      |    2 +-
 src/osd/screenshot.cpp                             |   17 +-
 src/plugin/dummy_audio.c                           |    1 +
 src/plugin/dummy_input.c                           |    3 +-
 src/plugin/dummy_rsp.c                             |    1 +
 src/plugin/dummy_video.c                           |    3 +-
 src/plugin/dummy_video.h                           |    2 +-
 src/plugin/plugin.c                                |    6 +-
 src/plugin/plugin.h                                |    2 +-
 src/r4300/exception.c                              |    6 -
 src/r4300/exception.h                              |   12 +-
 src/r4300/interupt.h                               |   12 +-
 src/r4300/ops.h                                    |  482 ++---
 src/r4300/pure_interp.c                            |   24 +-
 src/r4300/r4300.c                                  |  158 +-
 src/r4300/r4300.h                                  |   22 +-
 src/r4300/recomp.c                                 |    2 +-
 src/r4300/recomp.h                                 |   10 +-
 src/r4300/recomph.h                                |  502 ++---
 src/r4300/x86/assemble.h                           |   24 +-
 src/r4300/x86/regcache.h                           |    6 +-
 src/r4300/x86_64/assemble.h                        |   25 +-
 src/r4300/x86_64/gregimm.c                         |    2 +-
 src/r4300/x86_64/regcache.h                        |   18 +-
 src/r4300/x86_64/rjump.c                           |    4 +-
 tools/build_bundle_bin.sh                          |    2 +-
 tools/build_bundle_src.sh                          |    0
 tools/build_modules_src.sh                         |    0
 tools/install_binary_bundle.sh                     |    0
 tools/regtests/regression-video.py                 |    0
 tools/uninstall_binary_bundle.sh                   |    0
 63 files changed, 3624 insertions(+), 2843 deletions(-)

diff --cc debian/changelog
index 90ab453,0000000..60011ed
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,180 -1,0 +1,181 @@@
- mupen64plus-core (1.99.3-1) UNRELEASED; urgency=low
++mupen64plus-core (1.99.4~hg20100403-1) UNRELEASED; urgency=low
 +
++  * New upstream snapshot from revision 76bacea51f5e
 +  * Split source package to match upstreams modular release packages
 +  * debian/patches:
 +    - Remove upstream merged patches: as-needed.patch,
 +      correct_fpr32_mapping.patch, debian-archs.patch, destdir.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-kfreebsd.patch, glide64-noasm.patch,
 +      gtk-open-filter.patch, interpreter_x86_fldcw.patch,
 +      jttl_fix_romclosed.patch, load_aidacrate.patch, load_vistatus.patch,
 +      noexecstack.patch, osd-pause-crash.patch, plugin-searchpath.patch,
 +      remove-gln64.patch, remove-nondfsg-icons.patch, resume_on_start.patch,
 +      rice_nodebug.patch, rice-screenflickering.patch,
 +      rice-texturepack-crash.patch, system-libbz2.patch, system-liblzma.patch,
 +      system-libpng.patch, system-zlib.patch, version-string.patch,
 +      xdg-basedir.patch, static-binutils-libs.patch, rice_fog.patch
 +    - Rebase default-optimisations.patch and dejavu-font.patch against 1.99.3
 +  * Convert to 3.0 (quilt) source format
 +  * debian/control:
 +    - Remove unneeded build dependency to quilt
 +    - Upgraded to policy 3.8.4, no changes required
 +  * Provide metapackages for audio, input, rsp, ui and video plugins
 +
 + -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 15 Feb 2010 14:44:27 +0100
 +
 +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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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.eckelmann at gmx.de>  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