[ioquake3] 03/05: New upstream snapshot
Simon McVittie
smcv at debian.org
Sun Jul 12 22:13:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository ioquake3.
commit aa52be9d70e0043c77529033c53de2a42ef16a4e
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jul 12 22:30:12 2015 +0100
New upstream snapshot
* Includes the upstream parts of Martin Michlmayr's patch to support
arm64 (Closes: #790668)
* Drop patches that have been applied upstream since previous snapshot
- GNU/Hurd support
- fix for crash if SDL reports many video modes
---
debian/changelog | 11 +++++
...Add-support-for-the-GNU-Hurd-architecture.patch | 51 --------------------
...rash-if-more-than-128-modes-are-available.patch | 55 ----------------------
debian/patches/series | 2 -
debian/rules | 4 +-
5 files changed, 13 insertions(+), 110 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5cf4a3a..2a1b56c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ioquake3 (1.36+u20150710+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - includes the upstream parts of Martin Michlmayr's patch to support
+ arm64 (Closes: #790668)
+ * Drop patches that have been applied upstream since previous snapshot
+ - GNU/Hurd support
+ - fix for crash if SDL reports many video modes
+
+ -- Simon McVittie <smcv at debian.org> Sun, 12 Jul 2015 22:23:16 +0100
+
ioquake3 (1.36+u20150412+dfsg1-2) unstable; urgency=medium
* Another try at making the build reproducible: force TZ=UTC so the
diff --git a/debian/patches/Add-support-for-the-GNU-Hurd-architecture.patch b/debian/patches/Add-support-for-the-GNU-Hurd-architecture.patch
deleted file mode 100644
index 8ce89d3..0000000
--- a/debian/patches/Add-support-for-the-GNU-Hurd-architecture.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Svante Signell <svante.signell at telia.com>
-Date: Sun, 12 May 2013 12:22:20 +0100
-Subject: Add support for the GNU/Hurd architecture
-
-[Rejected upstream (at least I assume so, the pull request was closed
-without any comments or changes) but hey, we tried. -smcv]
-
-Origin: vendor, Debian
-Bug-Debian: http://bugs.debian.org/679330
-Forwarded: https://github.com/ioquake/ioq3/pull/4
----
- Makefile | 2 +-
- code/qcommon/q_platform.h | 6 ++++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d4d4229..15677e9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -314,7 +314,7 @@ MKDIR=mkdir
- EXTRA_FILES=
- CLIENT_EXTRA_FILES=
-
--ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
-+ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
-
- ifeq ($(ARCH),x86_64)
- LIB=lib64
-diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
-index 999dd39..9ae85d5 100644
---- a/code/qcommon/q_platform.h
-+++ b/code/qcommon/q_platform.h
-@@ -169,14 +169,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- //================================================================= LINUX ===
-
--#if defined(__linux__) || defined(__FreeBSD_kernel__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-
- #include <endian.h>
-
- #if defined(__linux__)
- #define OS_STRING "linux"
--#else
-+#elif defined(__FreeBSD_kernel__)
- #define OS_STRING "kFreeBSD"
-+#else
-+#define OS_STRING "GNU"
- #endif
-
- #define ID_INLINE inline
diff --git a/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch b/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch
deleted file mode 100644
index 8ce0c0d..0000000
--- a/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 1 Oct 2014 09:35:49 +0100
-Subject: Don't crash if more than 128 modes are available
-
-Forwarded: https://github.com/ioquake/ioq3/pull/105
----
- code/sdl/sdl_glimp.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
-index df20168..a9a1247 100644
---- a/code/sdl/sdl_glimp.c
-+++ b/code/sdl/sdl_glimp.c
-@@ -130,7 +130,8 @@ static void GLimp_DetectAvailableModes(void)
- {
- int i, j;
- char buf[ MAX_STRING_CHARS ] = { 0 };
-- SDL_Rect modes[ 128 ];
-+ size_t numSDLModes;
-+ SDL_Rect *modes;
- int numModes = 0;
-
- int display = SDL_GetWindowDisplayIndex( SDL_window );
-@@ -142,7 +143,14 @@ static void GLimp_DetectAvailableModes(void)
- return;
- }
-
-- for( i = 0; i < SDL_GetNumDisplayModes( display ); i++ )
-+ numSDLModes = SDL_GetNumDisplayModes( display );
-+ modes = SDL_calloc( numSDLModes, sizeof( SDL_Rect ));
-+ if ( !modes )
-+ {
-+ ri.Error( ERR_FATAL, "Out of memory\n" );
-+ }
-+
-+ for( i = 0; i < numSDLModes; i++ )
- {
- SDL_DisplayMode mode;
-
-@@ -152,6 +160,7 @@ static void GLimp_DetectAvailableModes(void)
- if( !mode.w || !mode.h )
- {
- ri.Printf( PRINT_ALL, "Display supports any resolution\n" );
-+ SDL_free( modes );
- return;
- }
-
-@@ -193,6 +202,7 @@ static void GLimp_DetectAvailableModes(void)
- ri.Printf( PRINT_ALL, "Available modes: '%s'\n", buf );
- ri.Cvar_Set( "r_availableModes", buf );
- }
-+ SDL_free( modes );
- }
-
- /*
diff --git a/debian/patches/series b/debian/patches/series
index dc13cdd..648f6dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,5 @@ Add-a-special-vmMagic-that-causes-equivalent-native-.patch
Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
Let-servers-set-sv_fps-too.patch
Run-in-a-window-by-default-on-new-installations.patch
-Add-support-for-the-GNU-Hurd-architecture.patch
-Don-t-crash-if-more-than-128-modes-are-available.patch
ui-reinstate-minimal-code-to-determine-whether-this-.patch
Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
diff --git a/debian/rules b/debian/rules
index f009207..56dae82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,10 +84,10 @@ override_dh_strip:
ORIG_REPO ?= https://github.com/ioquake/ioq3/
ORIG_REL = 1.36
# Empty if packaging a tagged release
-ORIG_REV = 10c5f0b5a9f2978764bafeda41b2d5b29f54ee4e
+ORIG_REV = 1bb2bc370d250101baf048a6edd1cc349aa996e9
# Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
# or empty if ORIG_REV is
-ORIG_DATE = 20150412
+ORIG_DATE = 20150710
ORIG_SUFFIX = +dfsg1
ifeq (${ORIG_REV},)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list