[mupen64plus-core] 141/310: Merge tag 'debian/1.99.4+99+7f1880795b02-2'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:57:40 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 7aa47564bde26c69adc2c1ed6ce7f82fa09bf6af
Merge: 0294129 ddfdca8
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Mar 11 11:48:21 2012 +0100
Merge tag 'debian/1.99.4+99+7f1880795b02-2'
Debian release 1.99.4+99+7f1880795b02-2
Conflicts:
debian/changelog
LICENSES | 5 +-
data/mupen64plus.ini | 248 +-
debian/changelog | 40 +
debian/control | 12 +-
debian/copyright | 29 +
debian/get-orig-source.sh | 26 +
debian/libmupen64plus2.symbols | 2 +
debian/patches/allocate_mmap.patch | 210 -
debian/patches/api_header.patch | 46 -
debian/patches/big_endian_conflict.patch | 67 -
debian/patches/conflicting_symbol.patch | 31 -
debian/patches/dejavu-font.patch | 16 +-
debian/patches/double_percentage.patch | 17 -
debian/patches/ftgl_fontrendering.patch | 1906 -------
debian/patches/info_configuration_failure.patch | 18 -
debian/patches/interpreter_fpu_modes.patch | 1990 -------
debian/patches/interpreter_rw_memory.patch | 63 -
debian/patches/mipmapping_doc.patch | 42 -
debian/patches/n64_cic_nus_6105.patch | 1698 ------
debian/patches/n64_romswap.patch | 18 -
debian/patches/new_minizip.patch | 5549 --------------------
debian/patches/osd_memory_corruption.patch | 205 -
debian/patches/printf_fixup.patch | 38 +-
debian/patches/privilege_segfault.patch | 77 -
debian/patches/rewrite_makefile.patch | 368 --
debian/patches/rjump_globber.patch | 231 -
debian/patches/rtc.patch | 79 -
debian/patches/savestatepath_config.patch | 50 -
debian/patches/series | 19 -
debian/rules | 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 | 19 +-
.../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 | 222 +-
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 | 60 +-
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 | 106 +-
src/main/main.h | 5 +-
src/main/rom.c | 14 +-
src/main/rom.h | 2 +-
src/main/savestates.c | 44 +-
src/main/util.c | 3 -
src/main/version.h | 7 +-
src/main/zip/crypt.h | 48 +-
src/main/zip/ioapi.c | 229 +-
src/main/zip/ioapi.h | 189 +-
src/main/zip/unzip.c | 1299 +++--
src/main/zip/unzip.h | 130 +-
src/main/zip/zip.c | 1829 +++++--
src/main/zip/zip.h | 175 +-
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/OGLFT.cpp | 31 +-
src/osd/OGLFT.h | 16 +-
src/osd/osd.cpp | 61 +-
src/osd/osd.h | 3 +-
src/osd/screenshot.cpp | 4 +-
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 | 4 +-
tools/build_bundle_src.sh | 4 +-
tools/build_modules_src.sh | 18 +-
tools/install_binary_bundle.sh | 22 +-
tools/m64p_helper_scripts.tar.gz | Bin 1696 -> 1701 bytes
tools/uninstall_binary_bundle.sh | 7 +-
108 files changed, 6624 insertions(+), 17742 deletions(-)
diff --cc debian/changelog
index c72f7ba,9d16c15..0fb9fb5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,43 +1,58 @@@
+mupen64plus-core (1.99.4-6) UNRELEASED; urgency=low
+
+ * Enable all hardening flags in debian/rules
+ * Upgraded to policy 3.9.3, no changes required
+ * Upgrade debhelper compat to v9
+
+ -- Sven Eckelmann <sven at narfation.org> Wed, 07 Mar 2012 22:30:41 +0100
+
+ mupen64plus-core (1.99.4+99+7f1880795b02-2) experimental; urgency=low
+
+ * Fix freetype initialization in debian/patches/dejavu-font.patch
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 13 Nov 2011 09:42:34 +0100
+
+ mupen64plus-core (1.99.4+99+7f1880795b02-1) experimental; urgency=low
+
+ * New upstream snapshot from revision 7f1880795b0235062a466c973d76333d258c2241
+ * debian/patches:
+ - Rebase dejavu-font.patch and printf_fixup.patch on top of
+ 1.99.4+99+7f1880795b02
+ - Remove upstream merged double_percentage.patch, new_minizip.patch and
+ savestatepath_config.patch
+ - Remove ftgl_fontrendering.patch which was rejected by upstream
+ * Remove unnecessary --as-needed from linker flags in debian/rules
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 13 Nov 2011 01:46:58 +0100
+
+ mupen64plus-core (1.99.4+77+8bb0e6b3ae3a-1) experimental; urgency=low
+
+ * New upstream snapshot from revision 8bb0e6b3ae3a4020c12e601cfddf028fbb44a6ea
+ * debian/control:
+ - Depend on mupen64plus-*-abi-2
+ * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patches: allocate_mmap.patch, api_header.patch,
+ big_endian_conflict.patch, conflicting_symbol.patch,
+ info_configuration_failure.patch, interpreter_fpu_modes.patch,
+ interpreter_rw_memory.patch, mipmapping_doc.patch,
+ n64_cic_nus_6105.patch, n64_romswap.patch, osd_memory_corruption.patch,
+ privilege_segfault.patch, rewrite_makefile.patch, rjump_globber.patch,
+ rtc.patch
+ - Rebase dejavu-font.patch and printf_fixup.patch against
+ 1.99.4+77+8bb0e6b3ae3a
+ * Add new files to debian/copyright
+ * Add debian/get-orig-source.sh for snapshots
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 29 Aug 2011 17:05:24 +0200
+
+mupen64plus-core (1.99.4-5) unstable; urgency=low
+
+ * Update copyright years in debian/copyright
+ * Change dependency libpng12-dev to new name libpng-dev (Closes: #662439)
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 05 Mar 2012 09:34:19 +0100
+
mupen64plus-core (1.99.4-4) unstable; urgency=low
* debian/control:
diff --cc debian/control
index 46b1672,7c8c9f2..c4467b4
--- a/debian/control
+++ b/debian/control
@@@ -10,12 -10,12 +10,12 @@@ Vcs-Git: git://anonscm.debian.org/colla
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-core.git
Build-Depends:
binutils-dev,
- debhelper (>= 8.1.3),
+ debhelper (>= 9),
dpkg-dev (>= 1.16.0),
- libftgl-dev,
+ libfreetype6-dev,
libgl1-mesa-dev | libgl-dev,
libglu1-mesa-dev | libglu-dev,
- libpng12-dev | libpng-dev,
+ libpng-dev,
libsdl1.2-dev | libsdl-dev,
pkg-config,
zlib1g-dev | libz-dev,
diff --cc debian/rules
index d243aec,71bca9e..09411c2
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,12 +1,9 @@@
#!/usr/bin/make -f
# -*- makefile -*-
-export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
-export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
- LDFLAGS += -Wl,--as-needed
-
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS=""
--
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