[iortcw] 05/17: New upstream snapshot
Simon McVittie
smcv at debian.org
Sun Aug 16 19:35:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository iortcw.
commit 5127bb7544f72fb00883fb293b37ef9b76147615
Author: Simon McVittie <smcv at debian.org>
Date: Tue Jul 14 10:43:53 2015 +0100
New upstream snapshot
- also exclude Freetype
- drop a patch that went upstream (via ioquake3)
---
debian/changelog | 6 +-
debian/copyright | 1 +
...rash-if-more-than-128-modes-are-available.patch | 102 ---------------------
debian/patches/series | 1 -
debian/rules | 7 +-
5 files changed, 7 insertions(+), 110 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 402e5ac..8606d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-iortcw (1.42b+20150316+dfsg2-1) UNRELEASED; urgency=low
+iortcw (1.42b+20150713+dfsg1-1) UNRELEASED; urgency=low
* New package for Return to Castle Wolfenstein (Closes: #773742)
- game-data-packager (>= 40) can package the required non-free data
@@ -10,9 +10,7 @@ iortcw (1.42b+20150316+dfsg2-1) UNRELEASED; urgency=low
from iortcw at the same time it downloads the official patch)
- exclude Free third-party libraries too, to simplify license compliance,
and use system copies of those libraries instead:
- cURL, libjpeg, libogg, OpenAL, libopus, SDL2, libvorbis, zlib
- - add patch (submitted to ioquake3) to avoid stack overflow if the
- windowing system offers > 128 modes
+ cURL, Freetype, libjpeg, libogg, OpenAL, libopus, SDL2, libvorbis, zlib
- run in a window by default per Games Team policy
-- Simon McVittie <smcv at debian.org> Tue, 17 Mar 2015 23:01:37 +0000
diff --git a/debian/copyright b/debian/copyright
index fb9732a..3853492 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ License: GPL-3+-RTCW
Files-Excluded:
*/code/AL
*/code/SDL2
+ */code/freetype-*
*/code/jpeg-*
*/code/libcurl-*
*/code/libogg-*
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 acac01f..0000000
--- a/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Tue, 17 Mar 2015 23:20:02 +0000
-Subject: Don't crash if more than 128 modes are available
-
-Forwarded: https://github.com/ioquake/ioq3/pull/105
----
- MP/code/sdl/sdl_glimp.c | 14 ++++++++++++--
- SP/code/sdl/sdl_glimp.c | 14 ++++++++++++--
- 2 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/MP/code/sdl/sdl_glimp.c b/MP/code/sdl/sdl_glimp.c
-index 1f3cb63..ec92466 100644
---- a/MP/code/sdl/sdl_glimp.c
-+++ b/MP/code/sdl/sdl_glimp.c
-@@ -157,7 +157,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 );
-@@ -169,7 +170,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;
-
-@@ -179,6 +187,7 @@ static void GLimp_DetectAvailableModes(void)
- if( !mode.w || !mode.h )
- {
- ri.Printf( PRINT_ALL, "Display supports any resolution\n" );
-+ SDL_free( modes );
- return;
- }
-
-@@ -220,6 +229,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/SP/code/sdl/sdl_glimp.c b/SP/code/sdl/sdl_glimp.c
-index 1f3cb63..ec92466 100644
---- a/SP/code/sdl/sdl_glimp.c
-+++ b/SP/code/sdl/sdl_glimp.c
-@@ -157,7 +157,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 );
-@@ -169,7 +170,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;
-
-@@ -179,6 +187,7 @@ static void GLimp_DetectAvailableModes(void)
- if( !mode.w || !mode.h )
- {
- ri.Printf( PRINT_ALL, "Display supports any resolution\n" );
-+ SDL_free( modes );
- return;
- }
-
-@@ -220,6 +229,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 7521a76..a06a8f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-Don-t-crash-if-more-than-128-modes-are-available.patch
Default-to-non-fullscreen.patch
diff --git a/debian/rules b/debian/rules
index fef3ef0..fe84ae7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,10 +107,10 @@ maintainer-update-icons: \
ORIG_REPO ?= https://github.com/iortcw/iortcw
ORIG_REL = 1.42b
# Empty if packaging a release
-ORIG_REV = ec3318172a827f75c60940ed1a798273db5db72b
+ORIG_REV = dee9cd8afdfef50e94c401cdc637b7135decf99c
# Empty if ORIG_REV is
-ORIG_DATE = 20150316
-ORIG_SUFFIX = +dfsg2
+ORIG_DATE = 20150713
+ORIG_SUFFIX = +dfsg1
ifeq (${ORIG_REV},)
ORIG_VER := ${ORIG_REL}${ORIG_SUFFIX}
@@ -137,6 +137,7 @@ get-orig-source:
fi
rm -rf iortcw-${ORIG_VER}.orig/*/code/AL
rm -rf iortcw-${ORIG_VER}.orig/*/code/SDL2
+ rm -rf iortcw-${ORIG_VER}.orig/*/code/freetype-*
rm -rf iortcw-${ORIG_VER}.orig/*/code/jpeg-*
rm -rf iortcw-${ORIG_VER}.orig/*/code/libcurl-*
rm -rf iortcw-${ORIG_VER}.orig/*/code/libogg-*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list