Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77432 by Andra?? "ruskie" Levstik for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77432 by Andra?? "ruskie" Levstik for review
  • Date: Sat, 8 Apr 2006 10:15:01 +0100 (BST)

Change 77432 by andraž_levstik AT omega.mages.ath.cx on 2006/04/08 10:14:56

Security update to freeciv ani a little expansion on scummvm

Affected files ...

... //sgl/grimoires/games/games-emulators/scummvm/BUILD#3 edit
... //sgl/grimoires/games/games-emulators/scummvm/CONFIGURE#1 add
... //sgl/grimoires/games/games-emulators/scummvm/DEPENDS#3 edit
... //sgl/grimoires/games/games-emulators/scummvm/HISTORY#10 edit
... //sgl/grimoires/games/games-strategy-tbs/freeciv/BUILD#2 edit
... //sgl/grimoires/games/games-strategy-tbs/freeciv/CONFIGURE#2 edit
... //sgl/grimoires/games/games-strategy-tbs/freeciv/DEPENDS#2 edit
... //sgl/grimoires/games/games-strategy-tbs/freeciv/DETAILS#7 edit
... //sgl/grimoires/games/games-strategy-tbs/freeciv/HISTORY#9 edit
... //sgl/grimoires/games/games-strategy-tbs/freeciv/INSTALL#2 edit
...
//sgl/grimoires/games/games-strategy-tbs/freeciv/freeciv-2.0.7.tar.bz2.sig#2
delete

Differences ...

==== //sgl/grimoires/games/games-emulators/scummvm/BUILD#3 (xtext) ====

@@ -1,3 +1,14 @@
-cd $SOURCE_DIRECTORY &&
-./configure $OPTS &&
+local SCUMMVM_OPTS_TMP="$SCUMMVM_OPTS" &&
+list_remove SCUMMVM_OPTS_TMP "--enable-scumm" \
+ "--enable-he" "--enable-hq-scalers" \
+ "--enable-mt32emu" "--enable-gob" \
+ "--enable-saga" "--enable-queen" \
+ "--enable-sword2" "--enable-sword1" \
+ "--enable-sky" "--enable-simon" \
+ "--enable-scumm-7-8" "--enable-kyra" &&
+OPTS="$SCUMMVM_OPTS_TMP --backend=$SCUMMVM_BACKEND $OPTS" &&
+./configure --bindir=$INSTALL_ROOT/usr/games \
+ --mandir=$INSTALL_ROOT/usr/share/man \
+ --prefix=$INSTALL_ROOT/usr \
+ $OPTS &&
make

==== //sgl/grimoires/games/games-emulators/scummvm/DEPENDS#3 (xtext) ====

@@ -1,31 +1,35 @@
-depends sdl &&
-
-optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
- "Enable alsa sound support" &&
-
-optional_depends mpeg2dec \
- "" \
- "--disable-mpeg2" \
- "Enable mpeg2 decoding - for example Broken Sword needs it
for cutscenes" &&
-
-optional_depends libvorbis \
- "--enable-vorbis" \
- "--disable-vorbis" \
- "Enable Vorbis audio support - also needed by some games
for cutscenes" &&
-
-optional_depends libmad \
- "--enable-mad" \
- "--disable-mad" \
- "Enable MAD mpeg audio support - for storing game cd-audio
to mp3 file" &&
-
-optional_depends flac \
- "--enable-flac" \
- "--disable-flac" \
- "Enable FLAC audio decoding - for storing game cd-audio to
flac file" &&
-
-
-if [ "$SCUMMVM_CVS" == "y" ]; then
- depends CVS
+optional_depends nasm
\
+ ""
\
+ "--disable-nasm"
\
+ "Enable assembly language optimizations"
&&
+optional_depends alsa-lib
\
+ ""
\
+ "--disable-alsa"
\
+ "Enable alsa sound support"
&&
+optional_depends mpeg2dec
\
+ ""
\
+ "--disable-mpeg2"
\
+ "Enable mpeg2 decoding - for example Broken Sword needs it
for cutscenes" &&
+optional_depends libvorbis
\
+ ""
\
+ "--disable-vorbis"
\
+ "Enable Vorbis audio support - also needed by some games
for cutscenes" &&
+optional_depends libmad
\
+ ""
\
+ "--disable-mad"
\
+ "Enable MAD mpeg audio support - for storing game cd-audio
to mp3 file" &&
+optional_depends flac
\
+ ""
\
+ "--disable-flac"
\
+ "Enable FLAC audio decoding - for storing game cd-audio to
flac file" &&
+depends zlib
&&
+depends g++
&&
+depends X11-LIBS
&&
+if [[ "$SCUMMVM_BACKEND" == "sdl" ]]
+then
+depends sdl
+fi
&&
+if [[ "$SCUMMVM_CVS" == "y" ]]
+then
+depends CVS
fi

==== //sgl/grimoires/games/games-emulators/scummvm/HISTORY#10 (text) ====

@@ -1,3 +1,8 @@
+2006-04-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * CONFIGURE: expaned
+ * BUILD: changed a tad
+ * DEPENDS: expanded
+
2006-02-11 Neuron <vlmarek AT volny.cz>
* DETAILS: Updated to 0.8.2


==== //sgl/grimoires/games/games-strategy-tbs/freeciv/BUILD#2 (xtext) ====

@@ -1,7 +1,7 @@
-OPTS=" --bindir=$INSTALL_ROOT/usr/games \
- --datadir=$INSTALL_ROOT/usr/share/games \
- --localstatedir=$INSTALL_ROOT/var/games \
- --enable-client=$FREECIV_CLIENT \
- $OPTS" &&
-
-default_build
+if [[ $FREECIV_CLIENT == "xaw" ]]; then
+OPTS="--with-xaw3d $OPTS"
+fi &&
+OPTS="--enable-client=$FREECIV_CLIENT \
+ $FREECIV_OPTS \
+ $OPTS" &&
+default_games_build

==== //sgl/grimoires/games/games-strategy-tbs/freeciv/CONFIGURE#2 (xtext) ====

@@ -1,2 +1,7 @@
-config_query_list FREECIV_CLIENT "Use which graphical client?" \
- "gtk2" "gtk" "xaw3d"
+config_query_list FREECIV_CLIENT \
+ "Use which graphical client(if no don't build it)?" \
+ gtk2 gtk xaw3d xaw no &&
+config_query_option FREECIV_OPTS "Build server?" y \
+ "--enable-server" "--disable-server" &&
+config_query_option FREECIV_OPTS "Compile in authentication?" n \
+ "--enable-auth" "--disable-auth"

==== //sgl/grimoires/games/games-strategy-tbs/freeciv/DEPENDS#2 (xtext) ====

@@ -1,23 +1,34 @@
-if [ $FREECIV_CLIENT == "xaw3d" ]; then
- depends Xaw3d
-elif [ $FREECIV_CLIENT == "gtk" ]; then
- depends gtk+ &&
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "Do you want multilanguage support" &&
+optional_depends esound \
+ "" \
+ "--disable-esd" \
+ "for sound support through esound" &&
+optional_depends sdl_mixer \
+ "" \
+ "--disable-sdl-mixer" \
+ "for sound support through SDL" &&
+optional_depends alsa-lib \
+ "" \
+ "--disable-alsa" \
+ "for sound support through SDL" &&
+optional_depends readline \
+ "--with-readline" \
+ "--without-readline" \
+ "support fancy command line editing" &&
+depends zlib &&
+depends X11-LIBS &&
+depends freetype2 &&
+
+if [[ $FREECIV_CLIENT == "xaw3d" ]]; then
+ depends xaw3d "--with-xaw3d"
+elif [[ $FREECIV_CLIENT == "gtk" ]]; then
+ depends glib &&
+ depends gtk+ &&
depends imlib
-elif [ $FREECIV_CLIENT == "gtk2" ]; then
+elif [[ $FREECIV_CLIENT == "gtk2" ]]; then
+ depends glib2 &&
depends gtk+2
-fi &&
-
-optional_depends esound \
- "" \
- "" \
- "for sound support through esound" &&
-
-optional_depends sdl_mixer \
- "" \
- "" \
- "for sound support through SDL" &&
-
-optional_depends zlib \
- "" \
- "" \
- "for compressed savegame support"
+fi

==== //sgl/grimoires/games/games-strategy-tbs/freeciv/DETAILS#7 (xtext) ====

@@ -1,17 +1,18 @@
SPELL=freeciv
- VERSION=2.0.7
+ VERSION=2.0.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=stdsounds3.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=http://www.freeciv.org/ftp/contrib/sounds/sets/$SOURCE2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:b9049273dc8758d8c575b877cf712e1a5b5e73556a3fcd1e2692d22b86eaa5befa616149659133d9664fe13f083a1c6f8c85ea22587d2a697bfac57312988cd9
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
WEB_SITE=http://www.freeciv.org/
ENTERED=20010922
UPDATED=20010922
LICENSE[0]=GPL
LICENSE[1]=GPL
+ SECURITY_PATCH=1
BUILD_API=2
SHORT="Reimplementation of Civilization I/II/III"
cat << EOF

==== //sgl/grimoires/games/games-strategy-tbs/freeciv/HISTORY#9 (text) ====

@@ -1,3 +1,10 @@
+2006-04-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version and security update
+ * BUILD: changed a tad
+ * INSTALL: add -v to the cp command, modified where it installs
+ * CONFIGURE: expanded
+ * DEPENDS: expanded
+
2005-11-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated to 2.0.7
SOURCE2_GPG was using SOURCE instead of SOURCE2

==== //sgl/grimoires/games/games-strategy-tbs/freeciv/INSTALL#2 (xtext) ====

@@ -1,2 +1,2 @@
-default_install &&
-cp -r freeciv-media/* $INSTALL_ROOT/usr/share/games/${SPELL}
+default_install &&
+cp -vr freeciv-media/data/* $INSTALL_ROOT/usr/share/games/${SPELL}



  • [SM-Commit] PERFORCE change 77432 by Andra?? "ruskie" Levstik for review, Perforce Review Daemon, 04/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page