Skip to Content.
Sympa Menu

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

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 (91573bc85714de609a9314123ef9ee5351cad907)
  • Date: Sat, 26 Feb 2011 16:33:39 -0600

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

games-simulation/vegastrike/HISTORY | 4
games-simulation/vegastrike/PRE_BUILD | 3
games-simulation/vegastrike/vegastrike-gcc.diff | 164
++++++++++++++++++++++++
3 files changed, 170 insertions(+), 1 deletion(-)

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

games-simulation/vegastrike: fixed build with gcc 4.5

diff --git a/games-simulation/vegastrike/HISTORY
b/games-simulation/vegastrike/HISTORY
index 04a11bd..cac0c13 100644
--- a/games-simulation/vegastrike/HISTORY
+++ b/games-simulation/vegastrike/HISTORY
@@ -1,3 +1,7 @@
+2011-02-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, vegastrike-gcc.diff: added patch from archlinux to make
+ the spell build with gcc 4.5
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/games-simulation/vegastrike/PRE_BUILD
b/games-simulation/vegastrike/PRE_BUILD
index 830cd95..43f78aa 100755
--- a/games-simulation/vegastrike/PRE_BUILD
+++ b/games-simulation/vegastrike/PRE_BUILD
@@ -11,4 +11,5 @@
cd $BUILD_DIRECTORY &&
unpack_file &&
cd ${SOURCE_DIRECTORY} &&
-./bootstrap-sh
\ No newline at end of file
+patch -p1 < ${SCRIPT_DIRECTORY}/vegastrike-gcc.diff &&
+./bootstrap-sh
diff --git a/games-simulation/vegastrike/vegastrike-gcc.diff
b/games-simulation/vegastrike/vegastrike-gcc.diff
new file mode 100644
index 0000000..b33bfb1
--- /dev/null
+++ b/games-simulation/vegastrike/vegastrike-gcc.diff
@@ -0,0 +1,164 @@
+diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply.hpp
vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply.hpp
+--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply.hpp
2010-06-19 00:39:55.871504363 +0200
++++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply.hpp 2010-06-19
00:40:33.034001174 +0200
+@@ -134,8 +134,10 @@
+ #endif // BOOST_MPL_APPLY_HPP_INCLUDED
+
+ ///// iteration, depth == 1
+-
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -222,4 +224,5 @@
+
+ # undef i_
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply_wrap.hpp
vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply_wrap.hpp
+--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply_wrap.hpp
2010-06-19 00:39:55.901504016 +0200
++++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply_wrap.hpp
2010-06-19 00:40:33.034001174 +0200
+@@ -78,7 +78,8 @@
+
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -197,4 +198,5 @@
+
+ # undef j_
+
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+diff -urN
vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/full_lambda.hpp
vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/full_lambda.hpp
+--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/full_lambda.hpp
2010-06-19 00:39:55.778171895 +0200
++++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/full_lambda.hpp
2010-06-19 00:40:33.070668466 +0200
+@@ -227,7 +227,8 @@
+
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ #define i_ BOOST_PP_FRAME_ITERATION(1)
+
+ #if i_ > 0
+@@ -347,4 +348,5 @@
+ };
+
+ #undef i_
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+diff -urN
vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/numeric_op.hpp
vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/numeric_op.hpp
+--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/numeric_op.hpp
2010-06-19 00:39:55.778171895 +0200
++++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/numeric_op.hpp
2010-06-19 00:40:33.080682668 +0200
+@@ -287,7 +287,8 @@
+
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -308,4 +309,5 @@
+
+ # undef i_
+
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/bind.hpp
vegastrike-source-0.5.0/boost/1_33/boost/mpl/bind.hpp
+--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/bind.hpp 2010-06-19
00:39:55.771505724 +0200
++++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/bind.hpp 2010-06-19
00:40:33.087341644 +0200
+@@ -361,7 +361,8 @@
+
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -544,4 +545,5 @@
+ # endif
+ # undef j_
+
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+diff -urN
vegastrike-source-0.5.0.orig/objconv/basemaker/base_maker_texture.cpp
vegastrike-source-0.5.0/objconv/basemaker/base_maker_texture.cpp
+--- vegastrike-source-0.5.0.orig/objconv/basemaker/base_maker_texture.cpp
2010-06-19 00:39:54.804006242 +0200
++++ vegastrike-source-0.5.0/objconv/basemaker/base_maker_texture.cpp
2010-06-19 00:40:40.978166559 +0200
+@@ -73,7 +73,7 @@
+ png_set_palette_to_rgb(png_ptr);
+
+ if (ctype == PNG_COLOR_TYPE_GRAY && data->bpp < 8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+ png_set_expand (png_ptr);
+ png_read_update_info (png_ptr,info_ptr);
+@@ -211,7 +211,7 @@
+ unsigned char sig[8];
+ fread(sig, sizeof(char), 8, fp);
+ fseek(fp,0,SEEK_SET);
+- if (png_check_sig(sig, 8)) {
++ if (png_sig_cmp(sig, 0, 8)) {
+ return FORMAT_PNG;
+ }
+ }
+diff -urN vegastrike-source-0.5.0.orig/src/cmd/basecomputer.cpp
vegastrike-source-0.5.0/src/cmd/basecomputer.cpp
+--- vegastrike-source-0.5.0.orig/src/cmd/basecomputer.cpp 2010-06-19
00:39:54.850672232 +0200
++++ vegastrike-source-0.5.0/src/cmd/basecomputer.cpp 2010-06-19
00:40:33.097334964 +0200
+@@ -3142,7 +3142,7 @@
+ return s1.st_mtime - s2.st_mtime;
+ }
+
+-#if defined(_WIN32) && !defined(__CYGWIN__)
++#if (__GLIBC__>2 || __GLIBC_MINOR__>=10) || (defined(_WIN32) &&
!defined(CYGWIN))
+ typedef int (*scancompare) ( const struct dirent **v1, const struct dirent
**v2 );
+ #else
+ typedef int (*scancompare) ( const void *v1, const void *v2 );
+diff -urN vegastrike-source-0.5.0.orig/src/gfx/vsimage.cpp
vegastrike-source-0.5.0/src/gfx/vsimage.cpp
+--- vegastrike-source-0.5.0.orig/src/gfx/vsimage.cpp 2010-06-19
00:39:54.940673220 +0200
++++ vegastrike-source-0.5.0/src/gfx/vsimage.cpp 2010-06-19
00:40:40.978166559 +0200
+@@ -147,7 +147,7 @@
+ unsigned char sig[8];
+ file->Begin();
+ file->Read(sig, 8);
+- if (!png_check_sig(sig, 8))
++ if (!(png_sig_cmp(sig, 0, 8)==0))
+ ret = BadFormat;
+
+ return ret;
+@@ -349,7 +349,7 @@
+ png_set_palette_to_rgb(png_ptr);
+
+ if (this->img_color_type == PNG_COLOR_TYPE_GRAY && this->img_depth <
8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+ png_set_expand (png_ptr);
+ png_read_update_info (png_ptr,info_ptr);
+diff -urN vegastrike-source-0.5.0.orig/src/vsfilesystem.h
vegastrike-source-0.5.0/src/vsfilesystem.h
+--- vegastrike-source-0.5.0.orig/src/vsfilesystem.h 2010-06-19
00:39:54.817340330 +0200
++++ vegastrike-source-0.5.0/src/vsfilesystem.h 2010-06-19 00:41:06.867329987
+0200
+@@ -294,7 +294,7 @@
+ VSFile();
+ VSFile( const char * buffer, long size, VSFileType
type=ZoneBuffer, VSFileMode=ReadOnly);
+ VSFile( const char * filename, VSFileType
type=UnknownFile, VSFileMode=ReadOnly);
+- VSFile( const string &filename, VSFileType
type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); }
++ VSFile( const string &filename, VSFileType
type=UnknownFile) { VSFile( filename.c_str(), type); }
+ ~VSFile();
+
+ FILE * GetFP() { return this->fp; } // This is still
needed for special cases (when loading PNG files)



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (91573bc85714de609a9314123ef9ee5351cad907), Florian Franzmann, 02/26/2011

Archive powered by MHonArc 2.6.24.

Top of Page