r9587 - in packages/trunk/wesnoth: . debian debian/patches
Gerfried Fuchs
alfie at alioth.debian.org
Wed Apr 15 14:14:49 UTC 2009
Author: alfie
Date: 2009-04-15 14:14:49 +0000 (Wed, 15 Apr 2009)
New Revision: 9587
Removed:
packages/trunk/wesnoth/debian/patches/03no-music-endless-loop
Modified:
packages/trunk/wesnoth/
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/patches/series
packages/trunk/wesnoth/debian/rules
Log:
wesnoth (1:1.6.1-1) unstable; urgency=low
* New upstream release.
* Incorporated no-music-endless-loop, patch removed.
* Fixed wqy-zenhei to point to proper target and added versioning to
Recommends on ttf-wqy-zenhei for that change
(closes: #522501, LP: #358590)
Property changes on: packages/trunk/wesnoth
___________________________________________________________________
Modified: svn-bp:origUrl
- http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.6a.orig.tar.gz
+ http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.6.1.orig.tar.gz
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2009-04-15 12:28:50 UTC (rev 9586)
+++ packages/trunk/wesnoth/debian/changelog 2009-04-15 14:14:49 UTC (rev 9587)
@@ -1,3 +1,13 @@
+wesnoth (1:1.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Incorporated no-music-endless-loop, patch removed.
+ * Fixed wqy-zenhei to point to proper target and added versioning to
+ Recommends on ttf-wqy-zenhei for that change
+ (closes: #522501, LP: #358590)
+
+ -- Gerfried Fuchs <rhonda at debian.at> Wed, 15 Apr 2009 16:11:52 +0200
+
wesnoth (1:1.6a-3) unstable; urgency=medium
* Pull fix for endless loop consuming 100% CPU when no music is installed
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2009-04-15 12:28:50 UTC (rev 9586)
+++ packages/trunk/wesnoth/debian/control 2009-04-15 14:14:49 UTC (rev 9587)
@@ -17,7 +17,7 @@
Architecture: all
Depends: ttf-dejavu
Replaces: wesnoth-editor (<< 1:1.5.4-1)
-Recommends: ttf-wqy-zenhei
+Recommends: ttf-wqy-zenhei (>= 0.8.38-1)
Suggests: wesnoth-music
Description: data files for Wesnoth
This package contains the sound files and graphics for Wesnoth. It is required
Deleted: packages/trunk/wesnoth/debian/patches/03no-music-endless-loop
===================================================================
--- packages/trunk/wesnoth/debian/patches/03no-music-endless-loop 2009-04-15 12:28:50 UTC (rev 9586)
+++ packages/trunk/wesnoth/debian/patches/03no-music-endless-loop 2009-04-15 14:14:49 UTC (rev 9587)
@@ -1,88 +0,0 @@
-Author: shadowmaster vim:ft=diff:
-Description: avoid an infinite loop when no music playlist entries are
- valid (upstream bug #13250, upstream svn r34257)
-
-Index: wesnoth-1.6a/src/sound.cpp
-===================================================================
---- wesnoth-1.6a.orig/src/sound.cpp
-+++ wesnoth-1.6a/src/sound.cpp
-@@ -138,6 +138,8 @@ std::list< sound_cache_chunk > sound_cac
- typedef std::list< sound_cache_chunk >::iterator sound_cache_iterator;
- std::map<std::string,Mix_Music*> music_cache;
-
-+struct no_valid_tracks {};
-+
- struct music_track
- {
- music_track(const std::string &tname);
-@@ -186,6 +188,9 @@ struct music_track last_track("");
-
- static bool track_ok(const std::string &name)
- {
-+ if(name.empty()) {
-+ return false;
-+ }
- LOG_AUDIO << "Considering " << name << "\n";
-
- // If they committed changes to list, we forget previous plays, but
-@@ -246,6 +251,17 @@ static const music_track &choose_track()
- {
- assert(!current_track_list.empty());
-
-+ bool all_invalid = true;
-+ foreach(const music_track& mt, current_track_list) {
-+ if(!mt.name.empty()) {
-+ all_invalid = false;
-+ break;
-+ }
-+ }
-+ if(all_invalid) {
-+ throw no_valid_tracks();
-+ }
-+
- std::string name;
- unsigned int track = 0;
-
-@@ -607,23 +623,28 @@ void play_music_config(const config &mus
-
- void music_thinker::process(events::pump_info &info) {
- if(preferences::music_on()) {
-- if(!music_start_time && !current_track_list.empty() && !Mix_PlayingMusic()) {
-- // Pick next track, add ending time to its start time.
-- current_track = choose_track();
-- music_start_time = info.ticks();
-- no_fading=true;
-- fadingout_time=0;
-- }
-+ try {
-+ if(!music_start_time && !current_track_list.empty() && !Mix_PlayingMusic()) {
-+ // Pick next track, add ending time to its start time.
-+ current_track = choose_track();
-+ music_start_time = info.ticks();
-+ no_fading=true;
-+ fadingout_time=0;
-+ }
-
-- if(music_start_time && info.ticks(&music_refresh, music_refresh_rate) >= music_start_time - fadingout_time) {
-- want_new_music=true;
-- }
-+ if(music_start_time && info.ticks(&music_refresh, music_refresh_rate) >= music_start_time - fadingout_time) {
-+ want_new_music=true;
-+ }
-
-- if(want_new_music) {
-- if(Mix_PlayingMusic()) {
-- Mix_FadeOutMusic(fadingout_time);
-+ if(want_new_music) {
-+ if(Mix_PlayingMusic()) {
-+ Mix_FadeOutMusic(fadingout_time);
-+ }
-+ play_new_music();
- }
-- play_new_music();
-+ }
-+ catch(no_valid_tracks const&) {
-+ current_track_list.clear();
- }
- }
- }
Modified: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series 2009-04-15 12:28:50 UTC (rev 9586)
+++ packages/trunk/wesnoth/debian/patches/series 2009-04-15 14:14:49 UTC (rev 9587)
@@ -1,2 +1 @@
02wesnoth-nolog-desktop-file
-03no-music-endless-loop
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2009-04-15 12:28:50 UTC (rev 9586)
+++ packages/trunk/wesnoth/debian/rules 2009-04-15 14:14:49 UTC (rev 9587)
@@ -145,7 +145,7 @@
do ln -s /usr/share/fonts/truetype/$$i \
debian/wesnoth-data/usr/share/games/wesnoth/fonts/`basename $$i`; \
done
- ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf \
+ ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc \
debian/wesnoth-data/usr/share/games/wesnoth/fonts/wqy-zenhei.ttc
for i in wesnoth wesnoth-all wesnoth-editor; do \
More information about the Pkg-games-commits
mailing list