[mupen64plus-core] 299/310: Merge remote-tracking branch 'origin/master'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:58:27 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 2dabaffc4a52c7f7641f5d61282dd2d6873cf2c9
Merge: f36d56e eafadc2
Author: Sven Eckelmann <sven at narfation.org>
Date: Fri May 1 14:29:02 2015 +0200
Merge remote-tracking branch 'origin/master'
Conflicts:
debian/copyright
.gitattributes | 38 +
.gitignore | 2 +
.travis.yml | 22 +
CREDITS | 189 +
LICENSES | 8 +
README | 7 +-
RELEASE | 16 +
data/mupen64plus.cht | 15366 -------------------
data/mupen64plus.ini | 309 +-
data/mupencheat.txt | 101 +-
debian/backports/precise | 6 +
debian/backports/trusty | 6 +
debian/changelog | 41 +-
debian/control | 3 +-
debian/copyright | 4 +-
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 -
doc/emuwiki-api-doc/Home.mediawiki | 5 +
...s.txt => Mupen64Plus-Core-Parameters.mediawiki} | 8 +
...txt => Mupen64Plus-Plugin-Parameters.mediawiki} | 12 +
...t => Mupen64Plus-v2.0-API-Versioning.mediawiki} | 5 +-
...xt => Mupen64Plus-v2.0-Core-API-v1.0.mediawiki} | 37 +-
...c.txt => Mupen64Plus-v2.0-Core-Basic.mediawiki} | 0
....txt => Mupen64Plus-v2.0-Core-Config.mediawiki} | 16 +-
...xt => Mupen64Plus-v2.0-Core-Debugger.mediawiki} | 10 +-
...t => Mupen64Plus-v2.0-Core-Front-End.mediawiki} | 0
...upen64Plus-v2.0-Core-Video-Extension.mediawiki} | 0
...> Mupen64Plus-v2.0-Design-Proposal-3.mediawiki} | 2 -
...I.txt => Mupen64Plus-v2.0-Plugin-API.mediawiki} | 0
...ders.txt => Mupen64Plus-v2.0-headers.mediawiki} | 44 +-
projects/VisualStudio2013/mupen64plus-core.vcxproj | 650 +
.../mupen64plus-core.vcxproj.filters | 760 +
projects/msvc11/mupen64plus-core.vcxproj | 234 -
projects/msvc8/mupen64plus-core.vcproj | 685 -
projects/unix/Makefile | 141 +-
src/ai/ai_controller.c | 219 +
src/ai/ai_controller.h | 86 +
src/api/api_export.ver | 1 +
src/api/callbacks.c | 7 +-
src/api/callbacks.h | 2 +-
src/api/common.c | 9 +-
src/api/config.c | 79 +-
src/api/debugger.c | 63 +-
src/api/frontend.c | 14 +-
src/api/m64p_config.h | 10 +
src/api/m64p_debugger.h | 8 +-
src/api/m64p_plugin.h | 2 +
src/api/m64p_types.h | 81 +-
src/api/vidext.c | 60 +-
src/api/vidext_sdl2_compat.h | 416 +-
src/debugger/dbg_breakpoints.c | 106 +-
src/debugger/dbg_breakpoints.h | 7 +-
src/debugger/{debugger.c => dbg_debugger.c} | 52 +-
src/debugger/{debugger.h => dbg_debugger.h} | 15 +-
src/debugger/dbg_decoder.c | 22 +-
src/debugger/dbg_decoder.h | 4 +-
src/debugger/dbg_memory.c | 688 +-
src/debugger/dbg_memory.h | 61 -
src/main/cheat.c | 260 +-
src/main/cheat.h | 1 +
src/main/eep_file.c | 79 +
src/{debugger/debugger.h => main/eep_file.h} | 36 +-
src/main/eventloop.c | 126 +-
src/main/fla_file.c | 80 +
src/{memory/pif.h => main/fla_file.h} | 27 +-
src/main/lirc.c | 11 +-
src/main/list.h | 5 +-
src/main/main.c | 349 +-
src/main/main.h | 32 +
src/main/md5.c | 1 +
src/main/mpk_file.c | 81 +
src/main/{cheat.h => mpk_file.h} | 32 +-
src/{r4300 => main}/profile.c | 51 +-
src/{r4300/x86_64/gcop0.c => main/profile.h} | 44 +-
src/main/rom.c | 357 +-
src/main/rom.h | 31 +-
src/main/savestates.c | 1150 +-
src/main/sdl_key_converter.c | 654 +
.../x86_64/gcop0.c => main/sdl_key_converter.h} | 45 +-
src/{osal/dynamiclib_unix.c => main/sra_file.c} | 62 +-
src/{memory/pif.h => main/sra_file.h} | 27 +-
src/main/util.c | 35 +-
src/main/util.h | 5 +-
src/main/version.h | 4 +-
src/main/workqueue.c | 10 +-
src/main/workqueue.h | 2 +
src/main/zip/ioapi.h | 2 +
src/main/zip/unzip.c | 4 +-
src/main/zip/zip.c | 5 +-
src/memory/dma.c | 380 -
src/memory/flashram.c | 216 -
src/memory/memory.c | 3913 +----
src/memory/memory.h | 374 +-
src/memory/pif.c | 592 -
src/osal/dynamiclib_unix.c | 4 +-
src/osal/dynamiclib_win32.c | 70 +-
src/osal/files.h | 1 +
src/osal/files_unix.c | 16 +-
src/osal/files_win32.c | 413 +-
src/osal/preproc.h | 17 +-
src/osd/OGLFT.cpp | 9 +-
src/osd/OGLFT.h | 5 +-
src/osd/osd.cpp | 18 +-
src/osd/screenshot.cpp | 18 +-
src/{main/workqueue.h => pi/cart_rom.c} | 58 +-
src/{r4300/x86_64/gcop0.c => pi/cart_rom.h} | 44 +-
src/pi/flashram.c | 195 +
src/{memory => pi}/flashram.h | 58 +-
src/pi/pi_controller.c | 225 +
src/{debugger/dbg_decoder.h => pi/pi_controller.h} | 88 +-
src/{r4300/reset.c => pi/sram.c} | 78 +-
src/{memory/pif.h => pi/sram.h} | 31 +-
src/plugin/dummy_audio.c | 2 +-
src/plugin/dummy_audio.h | 1 +
src/plugin/dummy_input.c | 2 +-
src/plugin/dummy_input.h | 1 +
src/plugin/dummy_rsp.c | 2 +-
src/plugin/dummy_rsp.h | 1 +
src/plugin/dummy_video.c | 2 +-
src/plugin/dummy_video.h | 1 +
... => emulate_game_controller_via_input_plugin.c} | 54 +-
.../emulate_game_controller_via_input_plugin.h} | 18 +-
.../emulate_speaker_via_audio_plugin.c} | 63 +-
.../emulate_speaker_via_audio_plugin.h} | 15 +-
.../get_time_using_C_localtime.c} | 19 +-
.../pif.h => plugin/get_time_using_C_localtime.h} | 14 +-
src/plugin/plugin.c | 147 +-
src/plugin/plugin.h | 4 +-
.../rumble_via_input_plugin.c} | 60 +-
.../pif.h => plugin/rumble_via_input_plugin.h} | 14 +-
src/r4300/cached_interp.c | 629 +
src/r4300/{x86/gcop0.c => cached_interp.h} | 39 +-
src/r4300/{x86_64/gcop1_w.c => cp0.c} | 83 +-
src/r4300/{x86/gcop0.c => cp0.h} | 55 +-
src/{memory/dma.h => r4300/cp0_private.h} | 19 +-
src/r4300/cp1.c | 178 +
src/r4300/{x86/gcop0.c => cp1.h} | 32 +-
src/{memory/dma.h => r4300/cp1_private.h} | 24 +-
src/r4300/exception.c | 66 +-
src/r4300/exception.h | 10 +-
src/r4300/fpu.h | 298 +-
src/r4300/instr_counters.c | 104 +
src/r4300/{exception.h => instr_counters.h} | 14 +-
src/r4300/interpreter.def | 9 +-
src/r4300/interpreter_cop0.def | 116 +-
src/r4300/interpreter_cop1.def | 91 +-
src/r4300/interpreter_r4300.def | 805 +-
src/r4300/interpreter_special.def | 126 +-
src/r4300/interpreter_tlb.def | 79 +-
src/r4300/interupt.c | 718 +-
src/r4300/interupt.h | 13 +-
src/r4300/macros.h | 59 +-
src/r4300/mi_controller.c | 133 +
.../dbg_decoder.h => r4300/mi_controller.h} | 71 +-
src/r4300/new_dynarec/arm/arm_cpu_features.c | 147 +
.../new_dynarec/arm/arm_cpu_features.h} | 37 +-
src/r4300/new_dynarec/{ => arm}/assem_arm.c | 344 +-
src/r4300/new_dynarec/{ => arm}/assem_arm.h | 5 +
src/r4300/new_dynarec/{ => arm}/linkage_arm.S | 154 +-
src/r4300/new_dynarec/linkage_x86.S | 929 --
src/r4300/new_dynarec/new_dynarec.c | 655 +-
src/r4300/new_dynarec/new_dynarec.h | 16 +-
src/r4300/new_dynarec/{ => x86}/assem_x86.c | 204 +-
src/r4300/new_dynarec/{ => x86}/assem_x86.h | 12 +
src/r4300/new_dynarec/x86/linkage_x86.asm | 876 ++
src/r4300/ops.h | 6 +-
src/r4300/pure_interp.c | 977 +-
src/{memory/pif.h => r4300/pure_interp.h} | 12 +-
src/r4300/r4300.c | 996 +-
src/r4300/r4300.h | 73 +-
src/r4300/r4300_core.c | 116 +
src/{plugin/dummy_rsp.c => r4300/r4300_core.h} | 66 +-
src/r4300/recomp.c | 217 +-
src/r4300/recomp.h | 32 +-
src/r4300/recomph.h | 16 +-
src/r4300/reset.c | 21 +-
src/r4300/reset.h | 6 +-
src/{memory => r4300}/tlb.c | 37 +-
src/{memory => r4300}/tlb.h | 17 +-
src/r4300/x86/assemble.c | 11 +-
src/r4300/x86/assemble.h | 17 +-
src/r4300/x86/assemble_struct.h | 6 +-
src/r4300/x86/gbc.c | 7 +-
src/r4300/x86/gcop0.c | 6 +-
src/r4300/x86/gcop1.c | 19 +-
src/r4300/x86/gcop1_d.c | 6 +-
src/r4300/x86/gcop1_l.c | 6 +-
src/r4300/x86/gcop1_s.c | 8 +-
src/r4300/x86/gcop1_w.c | 6 +-
src/r4300/x86/gr4300.c | 108 +-
src/r4300/x86/gregimm.c | 13 +-
src/r4300/x86/gspecial.c | 14 +-
src/r4300/x86/gtlb.c | 6 +-
src/r4300/x86/interpret.h | 6 +-
src/r4300/x86/regcache.c | 5 +-
src/r4300/x86/regcache.h | 6 +-
src/r4300/x86/rjump.c | 16 +-
src/r4300/x86_64/assemble.c | 13 +-
src/r4300/x86_64/assemble.h | 24 +-
src/r4300/x86_64/assemble_struct.h | 6 +-
src/r4300/x86_64/gbc.c | 13 +-
src/r4300/x86_64/gcop0.c | 10 +-
src/r4300/x86_64/gcop1.c | 23 +-
src/r4300/x86_64/gcop1_d.c | 11 +-
src/r4300/x86_64/gcop1_l.c | 11 +-
src/r4300/x86_64/gcop1_s.c | 13 +-
src/r4300/x86_64/gcop1_w.c | 11 +-
src/r4300/x86_64/gr4300.c | 133 +-
src/r4300/x86_64/gregimm.c | 17 +-
src/r4300/x86_64/gspecial.c | 20 +-
src/r4300/x86_64/gtlb.c | 10 +-
src/r4300/x86_64/interpret.h | 8 +-
src/r4300/x86_64/regcache.c | 10 +-
src/r4300/x86_64/regcache.h | 8 +-
src/r4300/x86_64/rjump.c | 8 +-
src/rdp/fb.c | 176 +
src/{plugin/dummy_rsp.h => rdp/fb.h} | 34 +-
src/rdp/rdp_core.c | 149 +
src/rdp/rdp_core.h | 93 +
src/ri/rdram.c | 84 +
src/{debugger/dbg_decoder.h => ri/rdram.h} | 75 +-
.../x86/gcop0.c => ri/rdram_detection_hack.c} | 33 +-
src/{memory/pif.h => ri/rdram_detection_hack.h} | 12 +-
src/{main/workqueue.h => ri/ri_controller.c} | 54 +-
src/{debugger/dbg_decoder.h => ri/ri_controller.h} | 67 +-
src/rsp/rsp_core.c | 334 +
src/rsp/rsp_core.h | 100 +
src/si/af_rtc.c | 83 +
src/{memory/pif.h => si/af_rtc.h} | 27 +-
src/{osal/dynamiclib_unix.c => si/cic.c} | 52 +-
src/{memory/pif.h => si/cic.h} | 27 +-
src/si/eeprom.c | 98 +
src/{memory/pif.h => si/eeprom.h} | 32 +-
src/si/game_controller.c | 198 +
.../dbg_decoder.h => si/game_controller.h} | 60 +-
src/si/mempak.c | 94 +
src/{memory/pif.h => si/mempak.h} | 29 +-
src/{memory => si}/n64_cic_nus_6105.c | 0
src/{memory => si}/n64_cic_nus_6105.h | 0
src/si/pif.c | 247 +
src/{memory => si}/pif.h | 57 +-
src/{main/workqueue.h => si/rumblepak.c} | 65 +-
src/{r4300/x86/gcop0.c => si/rumblepak.h} | 37 +-
src/si/si_controller.c | 154 +
src/{debugger/dbg_decoder.h => si/si_controller.h} | 74 +-
src/vi/vi_controller.c | 119 +
src/{debugger/dbg_decoder.h => vi/vi_controller.h} | 77 +-
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/osx_build_bundle.sh | 4 +-
tools/osx_build_instructions.txt | 72 +-
tools/regtests/daily-tests.cfg | 59 +-
tools/regtests/regression-video.py | 229 +-
tools/savestate_convert.c | 2 +-
tools/uninstall_binary_bundle.sh | 23 +-
297 files changed, 16447 insertions(+), 35541 deletions(-)
diff --cc debian/changelog
index 2c0e116,79976a1..5135f68
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,39 +1,40 @@@
- mupen64plus-core (2.0-7) UNRELEASED; urgency=medium
+ mupen64plus-core (2.5-1) UNRELEASED; urgency=medium
+
+ * New Upstream Verion
+ * Upgraded to policy 3.9.6, no changes required
+ * debian/copyright:
+ - Update years
+ - Fix errors in paths to specific files
++ - Add new copyright information
+
+ -- 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-7) unstable; urgency=medium
* debian/rules:
- Use Largefile Support enabled C API
diff --cc debian/copyright
index 7cbf509,f7db730..4cdda00
--- a/debian/copyright
+++ b/debian/copyright
@@@ -7,68 -7,8 +7,68 @@@ Files:
Copyright: 2008-2013, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
License: GPL-2+
-Files: tools/*install_binary_bundle.sh src/main/sdl_key_converter.* tools/gen_sdl_key_converter.c
-Copyright: 2007-2014, The Mupen64Plus Development Team
+Files: data/mupen64plus.cht
+Copyright: 2008, Gent
+License: GPL-2+
+
+Files: data/font.ttf
+Copyright: 2003 Bitstream, Inc.
+License: other
+ Copyright (C) 2003 Bitstream, Inc.
+ All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute
+ the Font Software, including without limitation the rights to use, copy,
+ merge, publish, distribute, and/or sell copies of the Font Software, and
+ to permit persons to whom the Font Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright and trademark notices and this permission notice
+ shall be included in all copies of one or more of the Font Software
+ typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may be
+ modified and additional glyphs or characters may be added to the Fonts,
+ only if the fonts are renamed to names not containing either the words
+ "Bitstream" or the word "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or
+ Font Software that has been modified and is distributed under the
+ "Bitstream Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but
+ no copy of one or more of the Font Software typefaces may be sold by
+ itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+ OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+ SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font
+ Software without prior written authorization from the Gnome Foundation
+ or Bitstream Inc., respectively. For further information, contact:
+ <fonts at gnome.org>.
+
+Files: debian/*
- Copyright: 2009-2014, Sven Eckelmann <sven at narfation.org>
- 2009-2014, Tobias Loose <TobiasLoose at gmx.de>
++Copyright: 2009-2015, Sven Eckelmann <sven at narfation.org>
++ 2009-2015, Tobias Loose <TobiasLoose at gmx.de>
+License: GPL-2+
+
+Files: projects/unix/Makefile
+Copyright: 2007-2008, Jesse 'DarkJezter' Dean
+ 2007-2008, Scott 'Tillin9' Knauert
+ 2008-2009, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
License: GPL-2+
Files: src/api/*
--
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