r13630 - in packages/tags/asc: . 2.4.0.0-3/debian 2.4.0.0-3/debian/patches
Dmitrijs Ledkovs
xnox at alioth.debian.org
Sun May 27 21:53:55 UTC 2012
Author: xnox
Date: 2012-05-27 21:53:54 +0000 (Sun, 27 May 2012)
New Revision: 13630
Added:
packages/tags/asc/2.4.0.0-3/
packages/tags/asc/2.4.0.0-3/debian/changelog
packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7-part2.diff
packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7.diff
packages/tags/asc/2.4.0.0-3/debian/patches/series
Removed:
packages/tags/asc/2.4.0.0-3/debian/changelog
packages/tags/asc/2.4.0.0-3/debian/patches/010_boost_libs.diff
packages/tags/asc/2.4.0.0-3/debian/patches/series
Log:
[svn-buildpackage] Tagging asc 2.4.0.0-3
Deleted: packages/tags/asc/2.4.0.0-3/debian/changelog
===================================================================
--- packages/trunk/asc/debian/changelog 2012-05-27 18:07:52 UTC (rev 13628)
+++ packages/tags/asc/2.4.0.0-3/debian/changelog 2012-05-27 21:53:54 UTC (rev 13630)
@@ -1,223 +0,0 @@
-asc (2.4.0.0-2) unstable; urgency=low
-
- [ Felix Geyer ]
- * Team upload.
- * Drop build-dependency on libparagui1.1-dev since it's not actually used.
- - Add libexpat1-dev which was previously pulled in by libparagui1.1-dev.
- * Add build-arch and build-indep targets.
- * Fix Vcs-Browser link.
- * Explicitly build-depend on libjpeg-dev, libfreetype6-dev and libpng-dev.
- * Bump Standards-Version to 3.9.3, no changes needed.
-
- [ Sam Hocevar ]
- * A few e-mail address updates.
-
- -- Felix Geyer <debfx-pkg at fobos.de> Sat, 24 Mar 2012 12:23:18 +0100
-
-asc (2.4.0.0-1) unstable; urgency=low
-
- [ Moritz Muehlenhoff ]
- * New upstream release. (2.4.0)
- - Drop obsolete patches
- - Initializes map_edit properly. (Closes: #534171).
- * Update to standards version 3.8.3
- * Switch to source format 3.0 (quilt) (Closes: #538430)
- * Adding myself to uploaders
-
- [ Barry deFreese ]
- * New upstream release. (2.2.0)
-
- [ Alexander Reichle-Schmehl ]
- * Adopt debian/control to my new name.
-
- -- Moritz Muehlenhoff <jmm at debian.org> Fri, 01 Jan 2010 22:11:14 +0100
-
-asc (2.1.0.0-2) unstable; urgency=low
-
- [ Barry deFreese ]
- * Update my e-mail address.
- * Remove unnecessary build-dep on libartsc0-dev.
- * 010_boost_libs.diff - Look for boost_regex-mt for newer boost libs.
- * Build-depend on libparagui1.1-dev instead of 1.0. (Closes: #529562).
- * Bump Standards Version to 3.8.1. (No changes needed).
-
- -- Barry deFreese <bdefreese at debian.org> Thu, 28 May 2009 13:49:52 -0400
-
-asc (2.1.0.0-1) unstable; urgency=low
-
- [ Barry deFreese ]
- * New upstream release.
- + Remove gcc-4.3 patch. Fixed upstream. (Closes: #478838).
- * Bump Standards Version to 3.8.0. (No changes needed).
-
- -- Barry deFreese <bddebian at comcast.net> Tue, 17 Jun 2008 12:29:22 -0400
-
-asc (2.0.1.0-2) unstable; urgency=low
-
- [ Ansgar Burchardt ]
- * Use quilt for patch management
- * Fix build with g++-4.3 (Closes: #417112)
- * Improve debian/copyright
-
- -- Barry deFreese <bddebian at comcast.net> Sun, 23 Mar 2008 17:55:48 -0400
-
-asc (2.0.1.0-1) unstable; urgency=low
-
- [ Eddy Petrișor ]
- * fixed Homepage semifield
-
- [ Gonéri Le Bouder ]
- * add a watchfile
- * move homepage from the description to the new Homepage field
-
- [ Cyril Brulebois ]
- * Added Vcs-Svn and Vcs-Browser fields in the control file.
-
- [ Barry deFreese ]
- * Fix make-clean lintian warning
- * New upstream release
- * Bump debhelper build-dep to match compat
- * Add desktop file
- * Update watch file for new upstream naming
- * Remove nostrip check from rules
- * Bump Standards Version to 3.7.3
- * Add myself to uploaders
-
- -- Barry deFreese <bddebian at comcast.net> Tue, 08 Jan 2008 19:54:18 -0500
-
-asc (1.16.3.0-3) unstable; urgency=low
-
- * Adopted package and moved it to the Debian Games Team repository.
- * Set Bartosz Fenski, Alexander Schmehl and myself as uploaders.
-
- * debian/control:
- + Set policy to 3.7.2.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 15 Jun 2006 17:43:41 +0200
-
-asc (1.16.3.0-2) unstable; urgency=low
-
- * Orphanage upload.
-
- -- Bartosz Fenski <fenio at debian.org> Fri, 17 Mar 2006 17:02:53 +0100
-
-asc (1.16.3.0-1) unstable; urgency=low
-
- * New upstream bugfix release.
-
- -- Bartosz Fenski <fenio at debian.org> Mon, 23 Jan 2006 15:57:32 +0100
-
-asc (1.16.2.0-3) unstable; urgency=low
-
- * Depends on ${Upstream-Version} of asc-data. (Closes: #343216)
-
- -- Bartosz Fenski <fenio at debian.org> Sun, 25 Dec 2005 06:17:38 +0100
-
-asc (1.16.2.0-2) unstable; urgency=low
-
- * Seems that asc (at least without networking support) works on all archs,
- so we're going to support them again. (Closes: #322198, #309677)
-
- -- Bartosz Fenski <fenio at debian.org> Wed, 10 Aug 2005 11:07:34 +0200
-
-asc (1.16.2.0-1) unstable; urgency=low
-
- * New upstream release.
- * Added kfreebsd-i386 to the list of supported archs (Closes: #321353)
-
- -- Bartosz Fenski <fenio at debian.org> Mon, 8 Aug 2005 12:27:56 +0200
-
-asc (1.16.1.0-1) unstable; urgency=low
-
- * New upstream release.
- * Transition upload for both G++ / aalib. (Closes: #320889)
- * Upstream officially supports only three archs, so we build only
- for them for now.
- * Bumped Standards-Version (no changes needed).
-
- -- Bartosz Fenski <fenio at debian.org> Thu, 4 Aug 2005 19:43:39 +0200
-
-asc (1.16.0.0-1) unstable; urgency=low
-
- * New upstream version.
- - AMD64 platform is now officially supported. (Closes: #297556)
-
- -- Bartosz Fenski <fenio at debian.org> Sat, 30 Apr 2005 15:33:21 +0200
-
-asc (1.15.3.0-1) unstable; urgency=low
-
- * New upstream release.
- Contains fixes for AMD64 arch, so dpatch and Andreas's patches
- are now removed.
- * Copyright file extended a little.
-
- -- Bartosz Fenski <fenio at debian.org> Fri, 18 Feb 2005 14:37:21 +0100
-
-asc (1.15.2.1-5) unstable; urgency=low
-
- * Added libesd0-dev to build dependencies.
-
- -- Bartosz Fenski <fenio at debian.org> Tue, 18 Jan 2005 00:48:22 +0100
-
-asc (1.15.2.1-4) unstable; urgency=low
-
- * Added libartsc0-dev to build dependencies.
-
- -- Bartosz Fenski <fenio at debian.org> Mon, 17 Jan 2005 16:55:22 +0100
-
-asc (1.15.2.1-3) unstable; urgency=low
-
- * Added patch to fix problems with building on amd64 using gcc-4.0.
- Thanks to Andreas Jochens for provided patch (Closes: #285482)
-
- -- Bartosz Fenski <fenio at debian.org> Fri, 14 Jan 2005 16:05:23 +0100
-
-asc (1.15.2.1-2) unstable; urgency=low
-
- * Added libxt-dev to Build-Depends.
-
- -- Bartosz Fenski <fenio at debian.org> Sat, 2 Jan 2005 02:21:24 +0100
-
-asc (1.15.2.1-1) unstable; urgency=low
-
- * New upstream version.
- * s/fenio at o2.pl/fenio at debian.org/ ;)
-
- -- Bartosz Fenski <fenio at debian.org> Sat, 1 Jan 2005 20:14:21 +0100
-
-asc (1.15.1.0-2) unstable; urgency=low
-
- * Using -jX switch for make wasn't good idea. Reverted this change.
-
- -- Bartosz Fenski <fenio at o2.pl> Tue, 9 Nov 2004 10:11:23 +0100
-
-asc (1.15.1.0-1) unstable; urgency=low
-
- * New upstream release:
- - hopefully fixes at least some of the endianness problems,
- but it has to be checked on autobuilders.
- * debian/control:
- - recommends asc-music (Closes: #274670)
- * debian/rules:
- - I started using distcc so we're now launching make with -j4
-
- -- Bartosz Fenski <fenio at o2.pl> Sat, 9 Oct 2004 20:22:24 +0200
-
-asc (1.15.0.0-2) unstable; urgency=medium
-
- * Urgency medium due to libtiff transition.
- * debian/control:
- - added libparagui1.0 dependency
- - added dependency on the explicit libsdl-image1.2-dev (Closes: #262789)
- - added libphysfs-dev dependency (waiting for fixed libparagui)
- * debian/rules:
- - removed --disable-paragui from configure switches
-
- -- Bartosz Fenski <fenio at o2.pl> Mon, 1 Aug 2004 22:12:21 +0200
-
-asc (1.15.0.0-1) unstable; urgency=low
-
- * Initial Release, finally (Closes: #77705)
-
- -- Bartosz Fenski <fenio at o2.pl> Wed, 23 Jun 2004 06:01:36 +0200
-
Copied: packages/tags/asc/2.4.0.0-3/debian/changelog (from rev 13629, packages/trunk/asc/debian/changelog)
===================================================================
--- packages/tags/asc/2.4.0.0-3/debian/changelog (rev 0)
+++ packages/tags/asc/2.4.0.0-3/debian/changelog 2012-05-27 21:53:54 UTC (rev 13630)
@@ -0,0 +1,231 @@
+asc (2.4.0.0-3) unstable; urgency=low
+
+ * Team upload.
+ * Add patches fixing FTBFS with gcc-4.7, thanks to Gregor Jasny
+ (Closes: #674299)
+
+ -- Dmitrijs Ledkovs <xnox at debian.org> Sun, 27 May 2012 21:38:32 +0100
+
+asc (2.4.0.0-2) unstable; urgency=low
+
+ [ Felix Geyer ]
+ * Team upload.
+ * Drop build-dependency on libparagui1.1-dev since it's not actually used.
+ - Add libexpat1-dev which was previously pulled in by libparagui1.1-dev.
+ * Add build-arch and build-indep targets.
+ * Fix Vcs-Browser link.
+ * Explicitly build-depend on libjpeg-dev, libfreetype6-dev and libpng-dev.
+ * Bump Standards-Version to 3.9.3, no changes needed.
+
+ [ Sam Hocevar ]
+ * A few e-mail address updates.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Sat, 24 Mar 2012 12:23:18 +0100
+
+asc (2.4.0.0-1) unstable; urgency=low
+
+ [ Moritz Muehlenhoff ]
+ * New upstream release. (2.4.0)
+ - Drop obsolete patches
+ - Initializes map_edit properly. (Closes: #534171).
+ * Update to standards version 3.8.3
+ * Switch to source format 3.0 (quilt) (Closes: #538430)
+ * Adding myself to uploaders
+
+ [ Barry deFreese ]
+ * New upstream release. (2.2.0)
+
+ [ Alexander Reichle-Schmehl ]
+ * Adopt debian/control to my new name.
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Fri, 01 Jan 2010 22:11:14 +0100
+
+asc (2.1.0.0-2) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Update my e-mail address.
+ * Remove unnecessary build-dep on libartsc0-dev.
+ * 010_boost_libs.diff - Look for boost_regex-mt for newer boost libs.
+ * Build-depend on libparagui1.1-dev instead of 1.0. (Closes: #529562).
+ * Bump Standards Version to 3.8.1. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org> Thu, 28 May 2009 13:49:52 -0400
+
+asc (2.1.0.0-1) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * New upstream release.
+ + Remove gcc-4.3 patch. Fixed upstream. (Closes: #478838).
+ * Bump Standards Version to 3.8.0. (No changes needed).
+
+ -- Barry deFreese <bddebian at comcast.net> Tue, 17 Jun 2008 12:29:22 -0400
+
+asc (2.0.1.0-2) unstable; urgency=low
+
+ [ Ansgar Burchardt ]
+ * Use quilt for patch management
+ * Fix build with g++-4.3 (Closes: #417112)
+ * Improve debian/copyright
+
+ -- Barry deFreese <bddebian at comcast.net> Sun, 23 Mar 2008 17:55:48 -0400
+
+asc (2.0.1.0-1) unstable; urgency=low
+
+ [ Eddy Petrișor ]
+ * fixed Homepage semifield
+
+ [ Gonéri Le Bouder ]
+ * add a watchfile
+ * move homepage from the description to the new Homepage field
+
+ [ Cyril Brulebois ]
+ * Added Vcs-Svn and Vcs-Browser fields in the control file.
+
+ [ Barry deFreese ]
+ * Fix make-clean lintian warning
+ * New upstream release
+ * Bump debhelper build-dep to match compat
+ * Add desktop file
+ * Update watch file for new upstream naming
+ * Remove nostrip check from rules
+ * Bump Standards Version to 3.7.3
+ * Add myself to uploaders
+
+ -- Barry deFreese <bddebian at comcast.net> Tue, 08 Jan 2008 19:54:18 -0500
+
+asc (1.16.3.0-3) unstable; urgency=low
+
+ * Adopted package and moved it to the Debian Games Team repository.
+ * Set Bartosz Fenski, Alexander Schmehl and myself as uploaders.
+
+ * debian/control:
+ + Set policy to 3.7.2.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 15 Jun 2006 17:43:41 +0200
+
+asc (1.16.3.0-2) unstable; urgency=low
+
+ * Orphanage upload.
+
+ -- Bartosz Fenski <fenio at debian.org> Fri, 17 Mar 2006 17:02:53 +0100
+
+asc (1.16.3.0-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Bartosz Fenski <fenio at debian.org> Mon, 23 Jan 2006 15:57:32 +0100
+
+asc (1.16.2.0-3) unstable; urgency=low
+
+ * Depends on ${Upstream-Version} of asc-data. (Closes: #343216)
+
+ -- Bartosz Fenski <fenio at debian.org> Sun, 25 Dec 2005 06:17:38 +0100
+
+asc (1.16.2.0-2) unstable; urgency=low
+
+ * Seems that asc (at least without networking support) works on all archs,
+ so we're going to support them again. (Closes: #322198, #309677)
+
+ -- Bartosz Fenski <fenio at debian.org> Wed, 10 Aug 2005 11:07:34 +0200
+
+asc (1.16.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added kfreebsd-i386 to the list of supported archs (Closes: #321353)
+
+ -- Bartosz Fenski <fenio at debian.org> Mon, 8 Aug 2005 12:27:56 +0200
+
+asc (1.16.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Transition upload for both G++ / aalib. (Closes: #320889)
+ * Upstream officially supports only three archs, so we build only
+ for them for now.
+ * Bumped Standards-Version (no changes needed).
+
+ -- Bartosz Fenski <fenio at debian.org> Thu, 4 Aug 2005 19:43:39 +0200
+
+asc (1.16.0.0-1) unstable; urgency=low
+
+ * New upstream version.
+ - AMD64 platform is now officially supported. (Closes: #297556)
+
+ -- Bartosz Fenski <fenio at debian.org> Sat, 30 Apr 2005 15:33:21 +0200
+
+asc (1.15.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ Contains fixes for AMD64 arch, so dpatch and Andreas's patches
+ are now removed.
+ * Copyright file extended a little.
+
+ -- Bartosz Fenski <fenio at debian.org> Fri, 18 Feb 2005 14:37:21 +0100
+
+asc (1.15.2.1-5) unstable; urgency=low
+
+ * Added libesd0-dev to build dependencies.
+
+ -- Bartosz Fenski <fenio at debian.org> Tue, 18 Jan 2005 00:48:22 +0100
+
+asc (1.15.2.1-4) unstable; urgency=low
+
+ * Added libartsc0-dev to build dependencies.
+
+ -- Bartosz Fenski <fenio at debian.org> Mon, 17 Jan 2005 16:55:22 +0100
+
+asc (1.15.2.1-3) unstable; urgency=low
+
+ * Added patch to fix problems with building on amd64 using gcc-4.0.
+ Thanks to Andreas Jochens for provided patch (Closes: #285482)
+
+ -- Bartosz Fenski <fenio at debian.org> Fri, 14 Jan 2005 16:05:23 +0100
+
+asc (1.15.2.1-2) unstable; urgency=low
+
+ * Added libxt-dev to Build-Depends.
+
+ -- Bartosz Fenski <fenio at debian.org> Sat, 2 Jan 2005 02:21:24 +0100
+
+asc (1.15.2.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * s/fenio at o2.pl/fenio at debian.org/ ;)
+
+ -- Bartosz Fenski <fenio at debian.org> Sat, 1 Jan 2005 20:14:21 +0100
+
+asc (1.15.1.0-2) unstable; urgency=low
+
+ * Using -jX switch for make wasn't good idea. Reverted this change.
+
+ -- Bartosz Fenski <fenio at o2.pl> Tue, 9 Nov 2004 10:11:23 +0100
+
+asc (1.15.1.0-1) unstable; urgency=low
+
+ * New upstream release:
+ - hopefully fixes at least some of the endianness problems,
+ but it has to be checked on autobuilders.
+ * debian/control:
+ - recommends asc-music (Closes: #274670)
+ * debian/rules:
+ - I started using distcc so we're now launching make with -j4
+
+ -- Bartosz Fenski <fenio at o2.pl> Sat, 9 Oct 2004 20:22:24 +0200
+
+asc (1.15.0.0-2) unstable; urgency=medium
+
+ * Urgency medium due to libtiff transition.
+ * debian/control:
+ - added libparagui1.0 dependency
+ - added dependency on the explicit libsdl-image1.2-dev (Closes: #262789)
+ - added libphysfs-dev dependency (waiting for fixed libparagui)
+ * debian/rules:
+ - removed --disable-paragui from configure switches
+
+ -- Bartosz Fenski <fenio at o2.pl> Mon, 1 Aug 2004 22:12:21 +0200
+
+asc (1.15.0.0-1) unstable; urgency=low
+
+ * Initial Release, finally (Closes: #77705)
+
+ -- Bartosz Fenski <fenio at o2.pl> Wed, 23 Jun 2004 06:01:36 +0200
+
Deleted: packages/tags/asc/2.4.0.0-3/debian/patches/010_boost_libs.diff
===================================================================
--- packages/trunk/asc/debian/patches/010_boost_libs.diff 2012-05-27 18:07:52 UTC (rev 13628)
+++ packages/tags/asc/2.4.0.0-3/debian/patches/010_boost_libs.diff 2012-05-27 21:53:54 UTC (rev 13630)
@@ -1,30 +0,0 @@
-Index: asc-2.1.0.0/configure
-===================================================================
---- asc-2.1.0.0.orig/configure 2009-05-28 14:04:15.000000000 -0400
-+++ asc-2.1.0.0/configure 2009-05-28 14:05:21.000000000 -0400
-@@ -22721,13 +22721,13 @@
- #AC_MSG_RESULT("yes")
-
-
--{ echo "$as_me:$LINENO: checking for main in -lboost_regex" >&5
--echo $ECHO_N "checking for main in -lboost_regex... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for main in -lboost_regex-mt" >&5
-+echo $ECHO_N "checking for main in -lboost_regex-mt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_boost_regex_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lboost_regex $LIBS"
-+LIBS="-lboost_regex-mt $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22777,7 +22777,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_boost_regex_main" >&5
- echo "${ECHO_T}$ac_cv_lib_boost_regex_main" >&6; }
- if test $ac_cv_lib_boost_regex_main = yes; then
-- BOOST_LIBS="-lboost_regex"
-+ BOOST_LIBS="-lboost_regex-mt"
- else
- BOOSTERR=yes
- fi
Copied: packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7-part2.diff (from rev 13629, packages/trunk/asc/debian/patches/gcc-4.7-part2.diff)
===================================================================
--- packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7-part2.diff (rev 0)
+++ packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7-part2.diff 2012-05-27 21:53:54 UTC (rev 13630)
@@ -0,0 +1,146 @@
+Description: Fix remaining GCC 4.7 build failures
+Author: Gregor Jasny <gjasny at googlemail.com>
+
+--- a/source/graphics/blitter.h
++++ b/source/graphics/blitter.h
+@@ -30,6 +30,7 @@
+ #include "../misc.h"
+ #include "../palette.h"
+ #include "../basegfx.h"
++#include "lighten.h"
+
+ typedef SDLmm::Color Color;
+
+--- a/source/graphics/drawing.h
++++ b/source/graphics/drawing.h
+@@ -31,6 +31,7 @@
+ #include "../misc.h"
+ #include "../palette.h"
+ // #include "../basegfx.h"
++#include "lighten.h"
+
+
+
+@@ -128,30 +129,6 @@
+
+ extern char saturationTranslationTable[256][256];
+
+-
+-inline SDLmm::Color lighten_Color( SDLmm::Color color, int factor16 )
+-{
+- return saturationTranslationTable[color & 0xff][factor16] |
+- (saturationTranslationTable[(color >> 8) & 0xff][factor16] << 8 ) |
+- (saturationTranslationTable[(color >> 16) & 0xff][factor16] << 16 ) |
+- (color & 0xff000000);
+-}
+-
+-inline void lighten_Color( SDLmm::Color* color, int factor16 )
+-{
+- *color = lighten_Color( *color, factor16 );
+-};
+-
+-inline SDL_Color lighten_Color( const SDL_Color& color, int factor16 )
+-{
+- SDL_Color c = color;
+- c.r = saturationTranslationTable[color.r & 0xff][factor16];
+- c.g = saturationTranslationTable[color.g & 0xff][factor16];
+- c.b = saturationTranslationTable[color.b & 0xff][factor16];
+- return c;
+-}
+-
+-
+ template< int pixelsize,
+ template<int> class ColorMerger >
+ class PutPixel: public ColorMerger<pixelsize>
+@@ -169,7 +146,7 @@
+ PixelType* pix = (PixelType*)( surf.pixels() );
+ pix += pos.y * surf.pitch()/pixelsize + pos.x;
+
+- assign ( src, pix );
++ this->assign ( src, pix );
+ };
+ };
+
+--- a/source/itemrepository.cpp
++++ b/source/itemrepository.cpp
+@@ -88,7 +88,7 @@
+ t->filename = fileName;
+ t->location = location;
+ t->archive = prc.getArchive();
+- add ( t );
++ this->add ( t );
+ }
+
+
+@@ -110,7 +110,7 @@
+ t->archive = stream.readString();
+ dataLoaderTicker();
+
+- add ( t );
++ this->add ( t );
+ // add ( T::newFromStream(stream ));
+ }
+ }
+--- /dev/null
++++ b/source/graphics/lighten.h
+@@ -0,0 +1,60 @@
++/*
++ This file is part of Advanced Strategic Command; http://www.asc-hq.de
++ Copyright (C) 1994-2004 Martin Bickel and Marc Schellenberger
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
++ Boston, MA 02111-1307 USA
++*/
++
++#ifndef lightenH
++ #define lightenH
++
++#include <cmath>
++ #include <map>
++ #include "loki/static_check.h"
++ #include "../libs/sdlmm/src/sdlmm.h"
++ #include "surface.h"
++
++#include "../misc.h"
++ #include "../palette.h"
++ // #include "../basegfx.h"
++
++extern char saturationTranslationTable[256][256];
++
++
++inline SDLmm::Color lighten_Color( SDLmm::Color color, int factor16 )
++{
++ return saturationTranslationTable[color & 0xff][factor16] |
++ (saturationTranslationTable[(color >> 8) & 0xff][factor16] << 8 ) |
++ (saturationTranslationTable[(color >> 16) & 0xff][factor16] << 16 ) |
++ (color & 0xff000000);
++}
++
++inline void lighten_Color( SDLmm::Color* color, int factor16 )
++{
++ *color = lighten_Color( *color, factor16 );
++};
++
++inline SDL_Color lighten_Color( const SDL_Color& color, int factor16 )
++{
++ SDL_Color c = color;
++ c.r = saturationTranslationTable[color.r & 0xff][factor16];
++ c.g = saturationTranslationTable[color.g & 0xff][factor16];
++ c.b = saturationTranslationTable[color.b & 0xff][factor16];
++ return c;
++}
++
++#endif
++
Copied: packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7.diff (from rev 13629, packages/trunk/asc/debian/patches/gcc-4.7.diff)
===================================================================
--- packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7.diff (rev 0)
+++ packages/tags/asc/2.4.0.0-3/debian/patches/gcc-4.7.diff 2012-05-27 21:53:54 UTC (rev 13630)
@@ -0,0 +1,83 @@
+Description: Fixed gcc 4.7 compilation problems
+Origin: upstream, 205e73929e9576f4abfdde7188bef381396b8ce1
+Author: Martin Bickel <martin at asc-hq.org>
+
+diff -r 83e224cdaf50 -r 205e73929e95 source/graphics/blitter.h
+--- a/source/graphics/blitter.h Sun May 13 15:41:46 2012 +0200
++++ b/source/graphics/blitter.h Wed May 16 19:17:17 2012 +0200
+@@ -749,7 +749,7 @@
+
+ void assign ( PixelType src, PixelType* dest )
+ {
+- if ( isOpaque(src ) ) {
++ if ( this->isOpaque(src ) ) {
+ *dest = src;
+ }
+ };
+@@ -769,7 +769,7 @@
+
+ void assign ( PixelType src, PixelType* dest )
+ {
+- if ( isOpaque(src ) ) {
++ if ( this->isOpaque(src ) ) {
+ *dest = src;
+ }
+ };
+@@ -846,7 +846,7 @@
+ void assign ( PixelType src, PixelType* dest )
+ {
+ // STATIC_CHECK ( pixelsize == 1, wrong_pixel_size );
+- if ( isOpaque(src ) ) {
++ if ( this->isOpaque(src ) ) {
+ *dest = table[*dest];
+ }
+ };
+@@ -873,7 +873,7 @@
+
+ void assign ( PixelType src, PixelType* dest )
+ {
+- if ( isOpaque(src ) ) {
++ if ( this->isOpaque(src ) ) {
+ *dest = ((*dest >> 1) & 0x7f7f7f7f) | (*dest & 0xff000000 );
+ }
+ };
+@@ -901,7 +901,7 @@
+ protected:
+ void assign ( PixelType src, PixelType* dest )
+ {
+- if ( isOpaque(src ) )
++ if ( this->isOpaque(src ) )
+ *dest = colormixbufchar[*dest + src*256 ];
+ };
+ public:
+@@ -918,7 +918,7 @@
+ void assign ( PixelType src, PixelType* dest )
+ {
+ // STATIC_CHECK ( pixelsize == 1, wrong_pixel_size );
+- if ( isOpaque(src ) ) {
++ if ( this->isOpaque(src ) ) {
+ *dest = ((*dest >> 1) & 0x7f7f7f7f) + ((src >> 1) & 0x7f7f7f7f);
+ }
+ };
+@@ -975,7 +975,7 @@
+ void assign ( PixelType src, PixelType* dest )
+ {
+ // STATIC_CHECK ( pixelsize == 1, wrong_pixel_size );
+- if ( isOpaque(src ) ) {
++ if ( this->isOpaque(src ) ) {
+ *dest = table[ *dest + src*256 ];
+ }
+ };
+diff -r 83e224cdaf50 -r 205e73929e95 source/graphics/surface.cpp
+--- a/source/graphics/surface.cpp Sun May 13 15:41:46 2012 +0200
++++ b/source/graphics/surface.cpp Wed May 16 19:17:17 2012 +0200
+@@ -579,7 +579,7 @@
+
+ void assign ( PixelType src, PixelType* dest )
+ {
+- if ( !isOpaque(src ) )
++ if ( !this->isOpaque(src ) )
+ *dest &= alphamask;
+ };
+
+
Deleted: packages/tags/asc/2.4.0.0-3/debian/patches/series
===================================================================
--- packages/trunk/asc/debian/patches/series 2012-05-27 18:07:52 UTC (rev 13628)
+++ packages/tags/asc/2.4.0.0-3/debian/patches/series 2012-05-27 21:53:54 UTC (rev 13630)
@@ -1 +0,0 @@
-
Copied: packages/tags/asc/2.4.0.0-3/debian/patches/series (from rev 13629, packages/trunk/asc/debian/patches/series)
===================================================================
--- packages/tags/asc/2.4.0.0-3/debian/patches/series (rev 0)
+++ packages/tags/asc/2.4.0.0-3/debian/patches/series 2012-05-27 21:53:54 UTC (rev 13630)
@@ -0,0 +1,2 @@
+gcc-4.7.diff
+gcc-4.7-part2.diff
More information about the Pkg-games-commits
mailing list