Skip to Content.
Sympa Menu

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

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 (9069151151f1b7d6bd5f98229da22564f4a7a805)
  • Date: Mon, 9 Apr 2012 11:15:18 -0500

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

games-simulation/vegastrike/BUILD | 14 --
games-simulation/vegastrike/CONFIGURE | 6
games-simulation/vegastrike/DEPENDS | 26 ---
games-simulation/vegastrike/DETAILS | 53 ++-----
games-simulation/vegastrike/HISTORY | 8 +
games-simulation/vegastrike/INSTALL | 51 ++-----
games-simulation/vegastrike/PREPARE | 6
games-simulation/vegastrike/PRE_BUILD | 15 --
games-simulation/vegastrike/vegastrike-gcc.diff | 164
------------------------
games-simulation/vegastrike/vsinstall | 14 --
10 files changed, 48 insertions(+), 309 deletions(-)

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

games-simulation/vegastrike: removed obsolete script

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

games-simulation/vegastrike: version 0.5.1.r1

diff --git a/games-simulation/vegastrike/BUILD
b/games-simulation/vegastrike/BUILD
index 47d56f1..e013b8d 100755
--- a/games-simulation/vegastrike/BUILD
+++ b/games-simulation/vegastrike/BUILD
@@ -1,13 +1 @@
-#if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-#cd ${SPELL}-svn
-#else
-#cd ${SPELL}-${VERSION}
-#fi
-#OPTS="$VS_OPTS --datadir=/usr/share/games/vegastrike/data${VERSION2} $OPTS"
-if [[ $VEGASTRIKE_DEBUG == "n" ]]; then
- OPTS="--enable-release --disable-debug $OPTS"
-else
- OPTS="--disable-release --enable-debug $OPTS"
-fi
-OPTS="$VS_OPTS --datadir=${INSTALL_ROOT}/usr/share/games/vegastrike/$VERSION
$OPTS"
-default_games_build
+cmake_build
diff --git a/games-simulation/vegastrike/CONFIGURE
b/games-simulation/vegastrike/CONFIGURE
deleted file mode 100755
index c8d82d4..0000000
--- a/games-simulation/vegastrike/CONFIGURE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query VEGASTRIKE_DEBUG "Do you want to build debug version?" n &&
-#passing --disable actually enables it :/
-config_query_option VS_OPTS \
- "Do you want support for stencil buffer?" n \
- "--enable-stencil-buffer" \
- ""
diff --git a/games-simulation/vegastrike/DEPENDS
b/games-simulation/vegastrike/DEPENDS
index 3789974..003b381 100755
--- a/games-simulation/vegastrike/DEPENDS
+++ b/games-simulation/vegastrike/DEPENDS
@@ -14,26 +14,8 @@ depends libpng &&
depends JPEG &&
depends perl &&
depends OPENAL &&
-#--with-boost-system makes it fail here
-#depends -sub PYTHON boost "--with-boost=system" &&
+depends cmake &&
+depends ogre &&
+depends cegui &&
depends -sub PYTHON boost "" &&
-if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
- depends SVN
-fi &&
-#passing --enable actually disables for ogre and cegui :/
-optional_depends ogre \
- "" \
- "--disable-ogre" \
- "Enable mesher" &&
-optional_depends cegui \
- "" \
- "--disable-cegui" \
- "Enable cegui" &&
-optional_depends libvorbis \
- "" \
- "--disable-vorbis" \
- "Enable ingame ogg support" &&
-optional_depends blender \
- "" \
- "" \
- "install blender python scripts"
+depends libvorbis
diff --git a/games-simulation/vegastrike/DETAILS
b/games-simulation/vegastrike/DETAILS
index d192f4c..3e0f279 100755
--- a/games-simulation/vegastrike/DETAILS
+++ b/games-simulation/vegastrike/DETAILS
@@ -1,38 +1,23 @@
SPELL=vegastrike
- VERSION2=4.x
-if [[ $VEGASTRIKE_DEVEL == "n" ]]; then
- VERSION=0.5.0
-# SOURCE=$SPELL-$VERSION.tar.bz2
-# SOURCE2=$SPELL-data$VERSION2-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE_HINTS=old_svn_compat
-# SOURCE2_HINTS=old_svn_compat
-#
SOURCE_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_$VERSION/vegastrike:vegastrike-$VERSION
-#
SOURCE2_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_$VERSION/data$VERSION2:vegastrike-data$VERSION2-$VERSION
-# SOURCE_IGNORE=volatile
-# SOURCE2_IGNORE=volatile
- SOURCE=$SPELL-source-$VERSION.tar.bz2
- SOURCE2=$SPELL-linux-$VERSION.tar.bz2
- SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE2_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE2
-
SOURCE_HASH=sha512:d0088df1f49b8600e1e6dc8b216001b0302de19675ba8da6ec0761b55d15624ffb6a8689f40593b844b89eee7d76202ba421a30d498d5d2ac54b66ccd576dd31
-
SOURCE2_HASH=sha512:5c4bebd323809c03a59827970e49fc160f9dad059ef46dd3b708c3dfe59f2e1edadce510dd65f461b953b4aee78825edaa714a9d07556b65b4675da084836c5a
-else
-if [[ $VEGASTRIKE_UPDATE == "y" ]]; then
- VERSION=$(date +%Y-%m-%d)
-else
- VERSION=svn
-fi
- SOURCE=$SPELL-svn.tar.bz2
- SOURCE2=$SPELL-data$VERSION2-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_HINTS=old_svn_compat
- SOURCE2_HINTS=old_svn_compat
-
SOURCE_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk/vegastrike:vegastrike-svn
-
SOURCE2_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk/data$VERSION2:vegastrike-data$VERSION2-svn
- SOURCE_IGNORE=volatile
- SOURCE2_IGNORE=volatile
-fi
+ XVERSION=0.5.1
+ RELEASE=r1
+ VERSION=${XVERSION}.${RELEASE}
+ SOURCE=$SPELL-src-$VERSION.tar.bz2
+ SOURCE2=$SPELL-data-$VERSION.tar.bz2
+ SOURCE3=$SPELL-speech-$VERSION.tar
+ SOURCE4=$SPELL-music-$VERSION.tar
+ SOURCE5=$SPELL-extra-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
+ SOURCE_URL=$SOURCEFORGE_URL/$SPELL/${XVERSION}/$SOURCE
+ SOURCE2_URL=$SOURCEFORGE_URL/$SPELL/${XVERSION}/$SOURCE2
+ SOURCE3_URL=$SOURCEFORGE_URL/$SPELL/${XVERSION}/$SOURCE3
+ SOURCE4_URL=$SOURCEFORGE_URL/$SPELL/${XVERSION}/$SOURCE4
+ SOURCE5_URL=$SOURCEFORGE_URL/$SPELL/${XVERSION}/$SOURCE5
+
SOURCE_HASH=sha512:64fffdd5905dceefd37181cc636e3aa7f8c6c52c2dc0dcc13c5bde44c4203cb7f04db0d599eadcf16ca230c04d56ca8fbce4bc9f1ffc56d39961842ec47acaa7
+
SOURCE2_HASH=sha512:5071ad8fdaf30ea98da960bbf2f2a2e76088f3f4b0a19651671e8ded1e9619dc3942c5a4c1cb5248137d935f9811df28936aed31f8f529f9b279f20276d0f2c8
+
SOURCE3_HASH=sha512:345910d17455bd3e11c51889bab3aec600cb85a6827e6406fe02cf661107ee126645192f657a80b89b152e1dd3bec2cd422784bca8c554cb42f27f66564ae128
+
SOURCE4_HASH=sha512:3912e771321c720064f490d1c03f1ffa50042bbd2c7b1f6950a3950725c20972aa549d32f2fde256cfd15fad6a2d9d0c62b14102d748595f130c5674f394278a
+
SOURCE5_HASH=sha512:345910d17455bd3e11c51889bab3aec600cb85a6827e6406fe02cf661107ee126645192f657a80b89b152e1dd3bec2cd422784bca8c554cb42f27f66564ae128
WEB_SITE=http://vegastrike.sourceforge.net/
ENTERED=20040502
LICENSE[0]=GPL
diff --git a/games-simulation/vegastrike/HISTORY
b/games-simulation/vegastrike/HISTORY
index cac0c13..42e4fd1 100644
--- a/games-simulation/vegastrike/HISTORY
+++ b/games-simulation/vegastrike/HISTORY
@@ -1,3 +1,11 @@
+2012-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, INSTALL: version 0.5.1.r1
+ * BUILD: switched to cmake
+ * DEPENDS: made dependencies on ogre and cegui mandatory, added
dependency on cmake
+ * CONFIGURE, PREPARE, PRE_BUILD, vegastrike-gcc.diff: removed, not
+ necessary anymore
+ * vsinstall: removed obsolete script
+
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
diff --git a/games-simulation/vegastrike/INSTALL
b/games-simulation/vegastrike/INSTALL
index 1598dda..3b12b3d 100755
--- a/games-simulation/vegastrike/INSTALL
+++ b/games-simulation/vegastrike/INSTALL
@@ -1,44 +1,25 @@
-#mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
-#if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-#install -v -o root -g games -m 0750 \
-# ${SOURCE_DIRECTORY}/vegastrike-svn/vssetup \
-# ${INSTALL_ROOT}/usr/games &&
-#cp -vR ${SOURCE_DIRECTORY}/$SPELL-data$VERSION2-svn/* \
-# ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
-#cd ${SOURCE_DIRECTORY}/vegastrike-svn
-#else
-#fi
-mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/ &&
-cd ${INSTALL_ROOT}/usr/share/games/vegastrike/ &&
-unpack_file 2 &&
-mv $SPELL-$VERSION $VERSION &&
-install -v -o root -g games -m 0750 \
- ${SOURCE_DIRECTORY}/vssetup \
- ${SOURCE_DIRECTORY}/mesher \
- ${SOURCE_DIRECTORY}/vegaserver \
- ${SOURCE_DIRECTORY}/vegastrike \
- ${INSTALL_ROOT}/usr/games &&
-mv ${INSTALL_ROOT}/usr/games/vegastrike \
- ${INSTALL_ROOT}/usr/games/vegastrike-bin &&
-install -v -o root -g games -m 0750 \
- ${SPELL_DIRECTORY}/vsinstall \
- ${INSTALL_ROOT}/usr/games &&
-#if is_depends_enabled $SPELL blender; then
-# for i in import export; do
-# install -m 755 \
-# ${SOURCE_DIRECTORY}/$SPELL-svn/objconv/blender_xmesh_${i}.py \
-# ${INSTALL_ROOT}/usr/share/blender/scripts/${i}_xmesh.py
-# done
-#fi
+mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/${VERSION} &&
+cd ${INSTALL_ROOT}/usr/share/games/vegastrike/${VERSION} &&
+tar -xvjf ${SOURCE_CACHE}/${SOURCE2} --strip-components=1 &&
+tar -xvf ${SOURCE_CACHE}/${SOURCE3} --strip-components=1 &&
+tar -xvf ${SOURCE_CACHE}/${SOURCE4} --strip-components=1 &&
+tar -xvjf ${SOURCE_CACHE}/${SOURCE5} --strip-components=1 &&
+mv ${SOURCE_DIRECTORY}/build/vegastrike
${SOURCE_DIRECTORY}/build/vegastrike-bin &&
+install -v -o root -g games -m 0750 \
+ ${SOURCE_DIRECTORY}/build/setup/vssetup \
+ ${SOURCE_DIRECTORY}/build/objconv/mesh_tool \
+ ${SOURCE_DIRECTORY}/build/vegaserver \
+ ${SOURCE_DIRECTORY}/build/vegastrike-bin \
+ ${INSTALL_ROOT}/usr/games &&
cd ${INSTALL_ROOT}/usr/share/games/vegastrike &&
find_and_scam &&
touch ${INSTALL_ROOT}/usr/games/vegastrike &&
-chown root:games ${INSTALL_ROOT}/usr/games/vegastrike &&
+chown root:games ${INSTALL_ROOT}/usr/games/vegastrike &&
chmod 0750 ${INSTALL_ROOT}/usr/games/vegastrike &&
cat > ${INSTALL_ROOT}/usr/games/vegastrike << EOF
#!/bin/sh

-cd ${INSTALL_ROOT}/usr/share/games/vegastrike/$VERSION
-/usr/games/vegastrike-bin
+cd /usr/share/games/vegastrike/$VERSION
+/usr/games/vegastrike-bin -d/usr/share/games/vegastrike/$VERSION \$@
EOF

diff --git a/games-simulation/vegastrike/PREPARE
b/games-simulation/vegastrike/PREPARE
deleted file mode 100755
index c3ddb13..0000000
--- a/games-simulation/vegastrike/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query VEGASTRIKE_DEVEL \
- "Do you want the development version?" y &&
-if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-config_query VEGASTRIKE_UPDATE \
- "Automatically update $SPELL on system-update?" n
-fi
diff --git a/games-simulation/vegastrike/PRE_BUILD
b/games-simulation/vegastrike/PRE_BUILD
deleted file mode 100755
index 43f78aa..0000000
--- a/games-simulation/vegastrike/PRE_BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-#mk_source_dir $SOURCE_DIRECTORY &&
-#if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-# cd ${SOURCE_DIRECTORY}/vegastrike-svn &&
-# sedit 's/lboost_python-st/lboost_python/' Makefile.{am,in}
-#fi
-#aclocal &&
-#autoconf -f &&
-#autoheader -f &&
-#automake -acf
-
-cd $BUILD_DIRECTORY &&
-unpack_file &&
-cd ${SOURCE_DIRECTORY} &&
-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
deleted file mode 100644
index b33bfb1..0000000
--- a/games-simulation/vegastrike/vegastrike-gcc.diff
+++ /dev/null
@@ -1,164 +0,0 @@
-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)
diff --git a/games-simulation/vegastrike/vsinstall
b/games-simulation/vegastrike/vsinstall
deleted file mode 100755
index 9fe17bd..0000000
--- a/games-simulation/vegastrike/vsinstall
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-mkdir -p ${HOME}/.vegastrike
-cd ${HOME}/.vegastrike
-#if [ -e save.4.x.txt ] ; then
-# touch save.4.x.txt;
-#else
-# echo "default"> save.4.x.txt ;
-# mkdir -p ${HOME}/.vegastrike/save
-# cp save.4.x.txt save/
-#fi
-cp
/usr/share/games/vegastrike/0.5.0/{setup.config,.vegastrike-0.5.0/*.m3u,vegastrike.config}
.
-/usr/games/vssetup
-



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (9069151151f1b7d6bd5f98229da22564f4a7a805), Florian Franzmann, 04/09/2012

Archive powered by MHonArc 2.6.24.

Top of Page