[mupen64plus-video-glide64mk2] 48/60: Merge tag 'upstream/2.5'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:16:17 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-video-glide64mk2.
commit 3eda04cc87c78322bbed08874c1c6b6d4f0e9fb7
Merge: 74397aa a95a6c5
Author: Sven Eckelmann <sven at narfation.org>
Date: Tue Apr 28 22:27:10 2015 +0200
Merge tag 'upstream/2.5'
Upstream version 2.5
.gitattributes | 38 +
.gitignore | 2 +
.travis.yml | 21 +
LICENSES | 8 +-
RELEASE | 19 +
data/Glide64mk2.ini | 440 +---
debian/changelog | 3 +-
.../mupen64plus-video-glide64mk2.vcxproj | 408 ++--
.../mupen64plus-video-glide64mk2.vcxproj.filters | 290 +--
projects/unix/Makefile | 99 +-
src/Glide64/3dmath.cpp | 40 +-
src/Glide64/Config.cpp | 66 +-
src/Glide64/Config.h | 1 +
src/Glide64/Debugger.cpp | 6 +-
src/Glide64/FrameSkipper.cpp | 76 +
src/Glide64/{osal_dynamiclib.h => FrameSkipper.h} | 38 +-
src/Glide64/Gfx_1.3.h | 33 +-
src/Glide64/Ini.cpp | 8 +-
src/Glide64/Ini.h | 0
src/Glide64/Keys.cpp | 33 -
src/Glide64/Main.cpp | 616 ++---
src/Glide64/TexBuffer.cpp | 4 +-
src/Glide64/Util.h | 4 +-
src/Glide64/m64p.h | 19 +-
src/Glide64/osal_dynamiclib.h | 8 +-
src/Glide64/osal_dynamiclib_unix.c | 36 +-
src/Glide64/osal_dynamiclib_win32.c | 7 +-
src/Glide64/rdp.cpp | 69 +-
src/Glide64/rdp.h | 60 +
src/Glide64/winlnxdefs.h | 2 +-
src/GlideHQ/Ext_TxFilter.h | 2 +-
src/GlideHQ/TxDbg.cpp | 8 +-
src/GlideHQ/TxFilter.cpp | 59 +-
src/GlideHQ/TxHiResCache.cpp | 8 +-
src/GlideHQ/TxImage.cpp | 10 +-
src/GlideHQ/TxImage.h | 2 +-
src/GlideHQ/TxInternal.h | 2 +-
src/GlideHQ/TxQuantize.cpp | 227 +-
src/GlideHQ/TxQuantize.h | 43 +-
src/GlideHQ/TxUtil.cpp | 8 +-
src/GlideHQ/TxUtil.h | 4 +-
src/GlideHQ/tc-1.1+/dxtn.c | 884 -------
src/GlideHQ/tc-1.1+/dxtn.h | 62 -
src/GlideHQ/tc-1.1+/fxt1.c | 2500 ++++++++++----------
src/GlideHQ/tc-1.1+/fxt1.h | 8 +-
src/GlideHQ/tc-1.1+/internal.h | 137 +-
src/GlideHQ/tc-1.1+/s2tc/s2tc_algorithm.cpp | 1467 ++++++++++++
.../tc-1.1+/{fxt1.h => s2tc/s2tc_algorithm.h} | 67 +-
src/GlideHQ/tc-1.1+/s2tc/s2tc_common.h | 161 ++
src/GlideHQ/tc-1.1+/s2tc/s2tc_libtxc_dxtn.cpp | 303 +++
src/GlideHQ/tc-1.1+/s2tc/s2tc_license.h | 27 +
src/GlideHQ/tc-1.1+/s2tc/txc_dxtn.h | 55 +
src/GlideHQ/tc-1.1+/texstore.c | 117 +-
src/GlideHQ/tc-1.1+/wrapper.c | 123 +-
src/Glitch64/{combiner.cpp => OGLEScombiner.cpp} | 635 +++--
src/Glitch64/{geometry.cpp => OGLESgeometry.cpp} | 341 +--
.../{glitchmain.cpp => OGLESglitchmain.cpp} | 308 +--
src/Glitch64/{textures.cpp => OGLEStextures.cpp} | 53 +-
src/Glitch64/OGLESwrappers.h | 360 +++
src/Glitch64/{combiner.cpp => OGLcombiner.cpp} | 2 +-
src/Glitch64/{geometry.cpp => OGLgeometry.cpp} | 17 +-
src/Glitch64/{glitchmain.cpp => OGLglitchmain.cpp} | 91 +-
src/Glitch64/{textures.cpp => OGLtextures.cpp} | 4 +-
src/Glitch64/{main.h => glitchmain.h} | 70 +-
src/Glitch64/inc/glide.h | 6 +-
src/Glitch64/inc/glidesys.h | 3 +-
todo!.txt | 1 -
67 files changed, 5995 insertions(+), 4634 deletions(-)
diff --cc debian/changelog
index 6dd169e,0000000..304e660
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,0 +1,50 @@@
- mupen64plus-video-glide64mk2 (2.0-4) UNRELEASED; urgency=medium
++mupen64plus-video-glide64mk2 (2.5-1) UNRELEASED; urgency=medium
+
++ * New Upstream Version
+ * Upgraded to policy 3.9.6, no changes required
+ * debian/copyright:
+ - Update years
+ - Fix errors in paths to specific files
+ * debian/patches:
+ - Add reproducible_nodate.patch, Don't include the build date in the binary
+
+ -- Sven Eckelmann <sven at narfation.org> Sat, 20 Sep 2014 11:04:52 +0200
+
+mupen64plus-video-glide64mk2 (2.0-3) unstable; urgency=low
+
+ * Upgraded to policy 3.9.5, no changes required
+ * debian/patches:
+ - Add shader_reset.patch, Set shader again after displaying OSD
+ - Add empty_dlist.patch, Handle empty display list to avoid infinite loop
+ - Add old_glgethandlearb_program_object.patch, Use glGetHandleARB to get
+ program object
+ - Add DEP-3 origin information
+ * debian/watch:
+ - Change upstream check from bitbucket to github
+ * debian/copyright:
+ - Change upstream source to github
+ * debian/get-orig-source.sh
+ - Change upstream repository to github
+ - Change SCM from Mercurial to Git
+ * Update copyright years in debian/copyright
+ * Move keyring for signature verification to new debian/upstream/
+ * debian/rules:
+ - Use Largefile Support enabled C API
+
+ -- Sven Eckelmann <sven at narfation.org> Sat, 30 Aug 2014 18:10:37 +0200
+
+mupen64plus-video-glide64mk2 (2.0-2) unstable; urgency=low
+
+ * debian/patches:
+ - Add load_hires_cache.patch, Enable the dump_cache to allow loading of
+ *.dat files
+ - Add kfreebsd_hurd_support.patch, Allow to compile under kFreeBSD and Hurd
+ - Add path_max_war.patch, Add a workaround for systems not defining PATH_MAX
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 01 Sep 2013 13:06:09 +0200
+
+mupen64plus-video-glide64mk2 (2.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #714994)
+
+ -- Sven Eckelmann <sven at narfation.org> Wed, 10 Jul 2013 23:25:40 +0200
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64mk2.git
More information about the Pkg-games-commits
mailing list