Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (855cb581a8dbf6e28fef32b62fc6e43572b82f62)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (855cb581a8dbf6e28fef32b62fc6e43572b82f62)
  • Date: Sat, 19 Jan 2013 17:01:24 -0600

GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null |binary
games-data/fgfs-base/DETAILS | 4
games-data/fgfs-base/HISTORY | 3
games-strategy-tbs/asc/BUILD | 13 --
games-strategy-tbs/asc/DEPENDS | 18 ++-
games-strategy-tbs/asc/DETAILS | 4
games-strategy-tbs/asc/HISTORY | 9 +
games-strategy-tbs/asc/PRE_BUILD | 4
games-strategy-tbs/asc/asc-2.1.0.0.tar.bz2.sig | 0
games-strategy-tbs/asc/gcc-4.7-2.diff | 146
+++++++++++++++++++++++++
10 files changed, 188 insertions(+), 13 deletions(-)

New commits:
commit 855cb581a8dbf6e28fef32b62fc6e43572b82f62
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-strategy-tbs/asc: version 2.5.0.0

commit 54cc460ccc42bffa3a9338a8b95c064bed3a1f1f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-data/fgfs-base: version 2.8.0

diff --git a/games-data/fgfs-base/DETAILS b/games-data/fgfs-base/DETAILS
index 600b370..9ccacf4 100755
--- a/games-data/fgfs-base/DETAILS
+++ b/games-data/fgfs-base/DETAILS
@@ -1,11 +1,11 @@
SPELL=fgfs-base
- VERSION=2.6.0
+ VERSION=2.8.0
SOURCE=FlightGear-data-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/FlightGear-${VERSION}

SOURCE_URL[0]=ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/${SOURCE}
SOURCE_URL[1]=ftp://flightgear.wo0t.de/Shared/${SOURCE}

SOURCE_URL[2]=ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/${SOURCE}
-
SOURCE_HASH=sha512:477f6ec2c044d122ee07cd9b96c790cfcc8b487f052da60ac00c1d75d234d154cf6429c0c21a3142718a9393cc5200cb06d8aa24d0a8afd4abbdf5ac15208ce6
+
SOURCE_HASH=sha512:ef86b636ed0393ead8e67ad13e3170790bc2373bd77556fe8ec45e55f70d6dc6380be47b8c882299bb5665362352c61c9f3d142fe17e1b76a5e5ae3d6d43dea3
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://flightgear.sourceforge.net
ENTERED=20010922
diff --git a/games-data/fgfs-base/HISTORY b/games-data/fgfs-base/HISTORY
index 033420a..7cd1ee6 100644
--- a/games-data/fgfs-base/HISTORY
+++ b/games-data/fgfs-base/HISTORY
@@ -1,3 +1,6 @@
+2013-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.8.0
+
2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.0

diff --git a/games-strategy-tbs/asc/BUILD b/games-strategy-tbs/asc/BUILD
index 15209c0..3116f00 100755
--- a/games-strategy-tbs/asc/BUILD
+++ b/games-strategy-tbs/asc/BUILD
@@ -1,11 +1,8 @@
CFLAGS="$(echo "$CFLAGS" | sed -e 's/-O3//')" &&
CXXFLAGS="$(echo "$CXXFLAGS" | sed -e 's/-O3//')" &&

-./configure --build=$BUILD \
- --prefix=${INSTALL_ROOT}/usr \
- --datadir=${INSTALL_ROOT}/usr/share/ \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --bindir=${INSTALL_ROOT}/usr/games \
- $OPTS &&
-make
+OPTS+=" --disable-paraguitest" &&
+OPTS+=" --disable-paragui" &&
+OPTS+=" --enable-genparse" &&
+
+default_games_build
diff --git a/games-strategy-tbs/asc/DEPENDS b/games-strategy-tbs/asc/DEPENDS
index ba1d376..15c3eac 100755
--- a/games-strategy-tbs/asc/DEPENDS
+++ b/games-strategy-tbs/asc/DEPENDS
@@ -4,4 +4,20 @@ depends sdlmm &&
depends sdl_image &&
depends sdl_mixer &&
depends paragui "--disable-paraguitest" &&
-depends physfs
+depends physfs &&
+depends lua51 &&
+depends WXWIDGET &&
+depends libvorbis &&
+depends libogg &&
+depends curl &&
+depends freetype2 &&
+depends sdl_sound &&
+depends expat &&
+depends bzip2 &&
+depends libpng &&
+depends -sub CXX gcc &&
+depends boost &&
+depends xvid &&
+depends perl &&
+depends zip &&
+depends JPEG
diff --git a/games-strategy-tbs/asc/DETAILS b/games-strategy-tbs/asc/DETAILS
index 4b4c08c..992e2a4 100755
--- a/games-strategy-tbs/asc/DETAILS
+++ b/games-strategy-tbs/asc/DETAILS
@@ -1,9 +1,9 @@
SPELL=asc
- VERSION=2.1.0.0
+ VERSION=2.5.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL-hq/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:ee1ed1e8fdd0050b016f8cf51d6e3a00a5c3c4d6e5da25fb8ccf136a15ba03ab97a9734e634028cc12330eabd63a275afc825317e2adbe260df23101b4f49881
LICENSE[0]=GPL
WEB_SITE=http://www.asc-hq.org/index.html
ENTERED=20030902
diff --git a/games-strategy-tbs/asc/HISTORY b/games-strategy-tbs/asc/HISTORY
index 8507069..b509db2 100644
--- a/games-strategy-tbs/asc/HISTORY
+++ b/games-strategy-tbs/asc/HISTORY
@@ -1,3 +1,12 @@
+2012-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use default_games_build
+ * DETAILS: version 2.5.0.0
+ * DEPENDS: added dependencies on lua51, WXWIDGET, libvorbis, libogg,
curl,
+ freetype2, sdl_sound, expat, bzip2, libpng, gcc, boost, xvid, perl,
zip
+ and JPEG
+ * gcc-4.7-2.diff, PRE_BUILD: added patch from archlinux to fix
compile errors
+
+no changes added to commit (use "git add" and/or "git commit -a")
2008-12-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 2.1.0
* DEPENDS: added physfs #14959
diff --git a/games-strategy-tbs/asc/PRE_BUILD
b/games-strategy-tbs/asc/PRE_BUILD
new file mode 100755
index 0000000..391c9c6
--- /dev/null
+++ b/games-strategy-tbs/asc/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < $SPELL_DIRECTORY/gcc-4.7-2.diff
diff --git a/games-strategy-tbs/asc/asc-2.1.0.0.tar.bz2.sig
b/games-strategy-tbs/asc/asc-2.1.0.0.tar.bz2.sig
deleted file mode 100644
index 4f0844f..0000000
Binary files a/games-strategy-tbs/asc/asc-2.1.0.0.tar.bz2.sig and /dev/null
differ
diff --git a/games-strategy-tbs/asc/gcc-4.7-2.diff
b/games-strategy-tbs/asc/gcc-4.7-2.diff
new file mode 100644
index 0000000..17b896c
--- /dev/null
+++ b/games-strategy-tbs/asc/gcc-4.7-2.diff
@@ -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
++



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (855cb581a8dbf6e28fef32b62fc6e43572b82f62), Florian Franzmann, 01/19/2013

Archive powered by MHonArc 2.6.24.

Top of Page