[mupen64plus-core] 295/310: Merge branch 'experimental'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:58:24 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 4124058710c139adcc4bd4638302ffbe14a21129
Merge: c1fbf64 2362a99
Author: Sven Eckelmann <sven at narfation.org>
Date: Tue Apr 28 22:12:34 2015 +0200
Merge branch 'experimental'
Conflicts:
debian/copyright
.gitattributes | 38 +
.gitignore | 2 +
.travis.yml | 22 +
data/mupen64plus.cht | 15366 -------------------
data/mupen64plus.ini | 303 +-
data/mupencheat.txt | 101 +-
debian/changelog | 31 +
debian/control | 1 +
debian/copyright | 17 +-
debian/libmupen64plus2.symbols | 1 +
debian/patches/bitstream-font.patch | 6 +-
debian/patches/cheat_multiconditions.patch | 130 -
debian/patches/cheatengine_workarounds.patch | 249 -
debian/patches/complete_resolve_romdb.patch | 121 -
debian/patches/config_currentstateslot.patch | 18 -
debian/patches/counter_per_op.patch | 245 -
debian/patches/countperop_hydrothunter.patch | 32 -
debian/patches/countperop_romdb.patch | 1232 --
debian/patches/countperop_rominfo.patch | 137 -
debian/patches/delay_si.patch | 105 -
.../patches/disable_recompiler_disassembler.patch | 12 +-
debian/patches/duplicates_cheatdb.patch | 151 -
debian/patches/flashram_read_handing.patch | 17 -
debian/patches/format_eeprom.patch | 18 -
.../interpreter_cmd_link_unconditionally.patch | 90 -
debian/patches/invalid_reference_romdb.patch | 54 -
debian/patches/mario64_levitate.patch | 81 -
debian/patches/multiple_main.patch | 22 -
debian/patches/n64_cic_nus_6105_reset.patch | 19 -
debian/patches/nfl_duplicates_cheatdb.patch | 80 -
debian/patches/nondefault_resolve_romdb.patch | 217 -
debian/patches/obsolete_variable.patch | 60 -
debian/patches/oot_subscreen_delay_fix.patch | 111 -
debian/patches/pilotwings_workarounds_romdb.patch | 51 -
.../patches/pokemon_snap_workarounds_romdb.patch | 126 -
debian/patches/printf_fixup.patch | 4 +-
debian/patches/revert_wii64_eeprom.patch | 43 -
debian/patches/sdl2_destroywindow.patch | 22 -
debian/patches/sdl2_keysym.patch | 1372 --
debian/patches/sdl2_no_surface.patch | 490 -
debian/patches/sdl2_no_unicode.patch | 38 -
debian/patches/sdl2_select_saveslot.patch | 79 -
debian/patches/self_reference_romdb.patch | 80 -
debian/patches/series | 34 -
debian/patches/turok2_duplicates_cheatdb.patch | 36 -
debian/patches/two_events_interrupt.patch | 4 +-
debian/patches/whitelist_cheatdb.patch | 267 -
debian/patches/workarounds_romdb.patch | 330 -
debian/patches/zelda_workarounds_romdb.patch | 160 -
.../Mupen64Plus_Core_Parameters.txt | 8 +
.../Mupen64Plus_v2.0_API_Versioning.txt | 2 +
.../Mupen64Plus_v2.0_Core_Config.txt | 15 +
.../Mupen64Plus_v2.0_Core_Debugger.txt | 6 +-
doc/emuwiki-api-doc/Mupen64Plus_v2.0_headers.txt | 25 +-
projects/msvc11/mupen64plus-core.vcxproj | 480 +-
projects/msvc8/mupen64plus-core.vcproj | 1418 +-
projects/unix/Makefile | 46 +-
src/api/api_export.ver | 1 +
src/api/config.c | 28 +
src/api/debugger.c | 13 +-
src/api/m64p_config.h | 10 +
src/api/m64p_debugger.h | 4 +-
src/api/m64p_types.h | 29 +-
src/api/vidext.c | 3 +
src/api/vidext_sdl2_compat.h | 395 +-
src/debugger/dbg_breakpoints.c | 79 +-
src/debugger/dbg_breakpoints.h | 6 +-
src/debugger/dbg_memory.c | 4 +
src/debugger/dbg_memory.h | 4 +-
src/debugger/debugger.c | 27 +-
src/main/cheat.c | 229 +-
src/main/cheat.h | 1 +
src/main/eventloop.c | 114 +-
src/main/list.h | 4 +-
src/main/main.c | 79 +-
src/main/main.h | 2 +
src/{r4300 => main}/profile.c | 47 +-
src/{r4300/x86_64/gcop0.c => main/profile.h} | 44 +-
src/main/rom.c | 214 +-
src/main/rom.h | 26 +
src/main/savestates.c | 42 +-
src/main/sdl_key_converter.c | 652 +
.../x86_64/gcop0.c => main/sdl_key_converter.h} | 43 +-
src/main/version.h | 2 +-
src/main/workqueue.c | 2 +-
src/memory/dma.c | 22 +-
src/memory/flashram.c | 1 +
src/memory/memory.c | 57 +-
src/memory/memory.h | 7 +-
src/memory/pif.c | 4 +-
src/osal/dynamiclib_win32.c | 70 +-
src/osal/files_win32.c | 412 +-
src/osal/preproc.h | 16 +-
src/osd/osd.cpp | 6 +-
src/osd/screenshot.cpp | 1 -
src/r4300/cached_interp.c | 584 +
src/r4300/{x86_64/gcop0.c => cached_interp.h} | 39 +-
src/r4300/{x86_64/gcop0.c => cp0.c} | 62 +-
src/r4300/{x86_64/gcop0.c => cp0.h} | 58 +-
src/r4300/cp1.c | 120 +
src/r4300/{new_dynarec/new_dynarec.h => cp1.h} | 25 +-
src/r4300/exception.c | 47 +-
src/r4300/exception.h | 6 +-
src/r4300/fpu.h | 19 +-
src/r4300/instr_counters.c | 104 +
src/r4300/{exception.h => instr_counters.h} | 14 +-
src/r4300/interpreter_cop0.def | 99 +-
src/r4300/interpreter_special.def | 2 +-
src/r4300/interpreter_tlb.def | 59 +-
src/r4300/interupt.c | 196 +-
src/r4300/interupt.h | 4 +
src/r4300/macros.h | 33 +-
src/r4300/new_dynarec/assem_arm.c | 30 +-
src/r4300/new_dynarec/assem_arm.h | 5 +
src/r4300/new_dynarec/assem_x86.c | 30 +-
src/r4300/new_dynarec/assem_x86.h | 5 +
src/r4300/new_dynarec/linkage_arm.S | 84 +-
src/r4300/new_dynarec/linkage_x86.S | 66 +-
src/r4300/new_dynarec/new_dynarec.c | 123 +-
src/r4300/new_dynarec/new_dynarec.h | 6 +-
src/r4300/ops.h | 6 +-
src/r4300/pure_interp.c | 29 +-
src/r4300/{exception.h => pure_interp.h} | 12 +-
src/r4300/r4300.c | 742 +-
src/r4300/r4300.h | 55 +-
src/r4300/recomp.c | 18 +-
src/r4300/recomp.h | 8 +-
src/r4300/recomph.h | 13 +-
src/r4300/reset.c | 1 +
src/r4300/reset.h | 6 +-
src/{memory => r4300}/tlb.c | 12 +-
src/{memory => r4300}/tlb.h | 9 +-
src/r4300/x86/assemble.h | 6 +-
src/r4300/x86/assemble_struct.h | 6 +-
src/r4300/x86/gbc.c | 2 +
src/r4300/x86/gcop0.c | 1 +
src/r4300/x86/gcop1.c | 1 +
src/r4300/x86/gcop1_d.c | 1 +
src/r4300/x86/gcop1_l.c | 1 +
src/r4300/x86/gcop1_s.c | 1 +
src/r4300/x86/gcop1_w.c | 1 +
src/r4300/x86/gr4300.c | 42 +-
src/r4300/x86/gregimm.c | 1 +
src/r4300/x86/gspecial.c | 5 +-
src/r4300/x86/gtlb.c | 1 +
src/r4300/x86/interpret.h | 6 +-
src/r4300/x86/regcache.h | 6 +-
src/r4300/x86/rjump.c | 10 +
src/r4300/x86_64/assemble.h | 11 +-
src/r4300/x86_64/assemble_struct.h | 6 +-
src/r4300/x86_64/gbc.c | 6 +
src/r4300/x86_64/gcop0.c | 5 +
src/r4300/x86_64/gcop1.c | 5 +
src/r4300/x86_64/gcop1_d.c | 5 +
src/r4300/x86_64/gcop1_l.c | 5 +
src/r4300/x86_64/gcop1_s.c | 5 +
src/r4300/x86_64/gcop1_w.c | 5 +
src/r4300/x86_64/gr4300.c | 73 +-
src/r4300/x86_64/gregimm.c | 5 +
src/r4300/x86_64/gspecial.c | 9 +-
src/r4300/x86_64/gtlb.c | 5 +
src/r4300/x86_64/interpret.h | 8 +-
src/r4300/x86_64/regcache.h | 8 +-
src/r4300/x86_64/rjump.c | 1 +
tools/build_bundle_bin.sh | 18 +-
tools/build_bundle_src.sh | 18 +-
tools/build_modules_src.sh | 9 +-
tools/gen_sdl_key_converter.c | 496 +
tools/install_binary_bundle.sh | 26 +-
tools/m64p_helper_scripts.tar.gz | Bin 1629 -> 1765 bytes
tools/regtests/daily-tests.cfg | 12 +-
tools/regtests/regression-video.py | 18 +-
tools/uninstall_binary_bundle.sh | 23 +-
173 files changed, 5328 insertions(+), 25201 deletions(-)
diff --cc debian/changelog
index 94a237f,1785e4a..3e74173
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,34 +1,43 @@@
+ mupen64plus-core (2.0+144+ga6ab125-2) UNRELEASED; urgency=medium
+
+ * Update debian/copyright
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 28 Sep 2014 23:57:04 +0200
+
+ mupen64plus-core (2.0+144+ga6ab125-1) experimental; urgency=medium
+
+ * New Upstream Snapshot from a6ab125a6a25263e6e1a66f834c3bfb9ebaf2275
+ * debian/patches:
+ - Remove upstream merged patches cheat_multiconditions.patch,
+ cheatengine_workarounds.patch, complete_resolve_romdb.patch,
+ config_currentstateslot.patch, counter_per_op.patch,
+ countperop_hydrothunter.patch, countperop_romdb.patch,
+ countperop_rominfo.patch, delay_si.patch, duplicates_cheatdb.patch,
+ flashram_read_handing.patch, format_eeprom.patch,
+ interpreter_cmd_link_unconditionally.patch, invalid_reference_romdb.patch,
+ mario64_levitate.patch, multiple_main.patch, n64_cic_nus_6105_reset.patch,
+ nfl_duplicates_cheatdb.patch, nondefault_resolve_romdb.patch,
+ obsolete_variable.patch, oot_subscreen_delay_fix.patch,
+ pilotwings_workarounds_romdb.patch, pokemon_snap_workarounds_romdb.patch,
+ revert_wii64_eeprom.patch, sdl2_destroywindow.patch, sdl2_keysym.patch,
+ sdl2_no_surface.patch, sdl2_no_unicode.patch, sdl2_select_saveslot.patch,
+ self_reference_romdb.patch, turok2_duplicates_cheatdb.patch,
+ whitelist_cheatdb.patch, workarounds_romdb.patch,
+ zelda_workarounds_romdb.patch
+ * Provide new mupen64plus-config-abi-2.3 virtual package in debian/control
+ * Add new symbol ConfigSetParameterHelp to libmupen64plus2
+
+ -- Sven Eckelmann <sven at narfation.org> Fri, 05 Sep 2014 10:32:04 +0200
+
+mupen64plus-core (2.0-8) UNRELEASED; urgency=medium
+
+ * Upgraded to policy 3.9.6, no changes required
+ * debian/copyright:
+ - Update years
+ - Fix errors in paths to specific files
+
+ -- Sven Eckelmann <sven at narfation.org> Sat, 20 Sep 2014 11:04:34 +0200
+
mupen64plus-core (2.0-7) unstable; urgency=medium
* debian/rules:
--
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