[SM-Commit] GIT changes to master games grimoire by Andraž Levstik (cc829612fa02de0beb9d88927723588b73a0979c)

Andraž Levstik scm at sourcemage.org
Thu Jun 26 04:32:30 EDT 2008


GIT changes to master games grimoire by Andraž Levstik <ruskie at codemages.net>:

 games-arcade-2d/chromium/BUILD          |    5 -
 games-arcade-2d/chromium/DEPENDS        |    9 ++
 games-arcade-2d/chromium/DETAILS        |   15 +---
 games-arcade-2d/chromium/HISTORY        |    7 ++
 games-arcade-2d/chromium/INSTALL        |   13 ---
 games-arcade-2d/chromium/PRE_BUILD      |    2 
 games-arcade-2d/chromium/chromium       |    4 -
 games-arcade-2d/chromium/chromium.patch |  107 --------------------------------
 games-fps/bzflag/CONFIGURE              |    3 
 games-fps/bzflag/DETAILS                |    4 -
 games-fps/bzflag/HISTORY                |    6 +
 games-fps/bzflag/PRE_BUILD              |    5 +
 games-fps/bzflag/narrowfix.patch        |   12 +++
 13 files changed, 46 insertions(+), 146 deletions(-)

New commits:
commit cc829612fa02de0beb9d88927723588b73a0979c
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    chromium: updated to 0.9.13.1

commit 915a52423016d4541c575016cdeba448aa5b8994
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    bzflag: update to 2.0.12, added an optional patch

diff --git a/games-arcade-2d/chromium/BUILD b/games-arcade-2d/chromium/BUILD
deleted file mode 100755
index ed23616..0000000
--- a/games-arcade-2d/chromium/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-  export  OLDCFLAGS=${CFLAGS} &&
-  export  OLDCXXFLAGS=${CXXFLAGS} &&
-  patch -p1 < $SCRIPT_DIRECTORY/chromium.patch &&
-  make_single &&
-  make
diff --git a/games-arcade-2d/chromium/DEPENDS b/games-arcade-2d/chromium/DEPENDS
index 4d91bf4..d87b67e 100755
--- a/games-arcade-2d/chromium/DEPENDS
+++ b/games-arcade-2d/chromium/DEPENDS
@@ -1,6 +1,11 @@
 depends  openal     &&
 depends  sdl        &&
-depends  smpeg      &&
 depends  libpng     &&
 depends  libvorbis  &&
-depends  tcl
+depends  OPENGL     &&
+depends  ftgl       &&
+depends  fontconfig &&
+depends  GLUT       &&
+depends  freealut   &&
+depends  libglpng   &&
+depends  sdl_mixer  
diff --git a/games-arcade-2d/chromium/DETAILS b/games-arcade-2d/chromium/DETAILS
index 714c6ee..d2f95d1 100755
--- a/games-arcade-2d/chromium/DETAILS
+++ b/games-arcade-2d/chromium/DETAILS
@@ -1,17 +1,12 @@
            SPELL=chromium
-         VERSION=0.9.12
-          SOURCE=$SPELL-src-$VERSION.tar.gz
-         SOURCE2=$SPELL-data-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/C${SPELL/\c/}-${VERSION/\.12/}
-   SOURCE_URL[0]=http://www.reptilelabour.com/software/files/$SPELL/$SOURCE
-  SOURCE2_URL[0]=http://www.reptilelabour.com/software/files/$SPELL/$SOURCE2
-     SOURCE_HASH=sha512:78784759e29c9ba31d5871d4ff4dddd75949ea0ac55ae41f28ba0f59dcd67db800184e59c5b984d46123f03196892b5288b2adb22facb473a184fbf4bfff7988
-    SOURCE2_HASH=sha512:0436a6fdc2781ee4ad4b802c5d67097d254092b9cf4737b763cf3de4f2b94c4a593263b252ec4cfa73d0579781a92e7f966393ef56f3c368249b27776d888560
+         VERSION=0.9.13.1
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL-bsu/$SOURCE
+     SOURCE_HASH=sha512:f273d126101e5c982b55f4d4616fbced0a6deabe667e36e155f6f0a4484dff15e6bab5ca4dcf7e87d9929800be1c116b703fbda5b8260aedfcdbd47b104e32f5
         WEB_SITE=http://www.reptilelabour.com/software/chromium/
          ENTERED=20030614
-         UPDATED=20030614
       LICENSE[0]=ART
-      LICENSE[1]=ART
            SHORT="Fast paced, arcade-style, OpenGL, top-scrolling space shooter"
 cat << EOF
 t  h  e    s  t  o  r  y 
diff --git a/games-arcade-2d/chromium/HISTORY b/games-arcade-2d/chromium/HISTORY
index 4169b47..c7891aa 100644
--- a/games-arcade-2d/chromium/HISTORY
+++ b/games-arcade-2d/chromium/HISTORY
@@ -1,3 +1,10 @@
+2008-06-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: update to 0.9.13.1
+	* DEPENDS: tons of depends
+	* BUILD, INSTALL: removed
+	* PRE_BUILD, chromium.patch: removed
+	* chromium: removed
+
 2006-09-21 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/games-arcade-2d/chromium/INSTALL b/games-arcade-2d/chromium/INSTALL
deleted file mode 100755
index fd7e7fd..0000000
--- a/games-arcade-2d/chromium/INSTALL
+++ /dev/null
@@ -1,13 +0,0 @@
-cd ${SOURCE_DIRECTORY}  &&
-mkdir -vp ${INSTALL_ROOT}/usr/share/games/chromium/bin&&
-mkdir -vp ${INSTALL_ROOT}/usr/share/games/chromium/data&&
-cp -vr ${SOURCE_DIRECTORY}/data/* ${INSTALL_ROOT}/usr/share/games/chromium/data&&
-cp -v ${SOURCE_DIRECTORY}/bin/chromium \
-      ${INSTALL_ROOT}/usr/share/games/chromium/bin/chromium &&    
-chmod 0750 ${INSTALL_ROOT}/usr/share/games/chromium/bin/chromium &&
-chown root:games ${INSTALL_ROOT}/usr/share/games/chromium/bin/chromium &&
-cp -v ${SCRIPT_DIRECTORY}/chromium \
-      ${INSTALL_ROOT}/usr/games/chromium &&
-chmod 0750 ${INSTALL_ROOT}/usr/games/chromium &&
-cd ${INSTALL_ROOT}/usr/share/games/chromium/data &&
-find_and_scam
diff --git a/games-arcade-2d/chromium/PRE_BUILD b/games-arcade-2d/chromium/PRE_BUILD
deleted file mode 100755
index 68324e8..0000000
--- a/games-arcade-2d/chromium/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build  &&
-unpack_file '2'
diff --git a/games-arcade-2d/chromium/chromium b/games-arcade-2d/chromium/chromium
deleted file mode 100755
index 6925a2e..0000000
--- a/games-arcade-2d/chromium/chromium
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/share/games/chromium/bin
-./chromium
diff --git a/games-arcade-2d/chromium/chromium.patch b/games-arcade-2d/chromium/chromium.patch
deleted file mode 100644
index 229a41f..0000000
--- a/games-arcade-2d/chromium/chromium.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ruN Chromium-0.9.old/config.mak Chromium-0.9/config.mak
---- Chromium-0.9.old/config.mak	1970-01-01 10:00:00.000000000 +1000
-+++ Chromium-0.9/config.mak	2003-06-14 13:23:18.000000000 +1000
-@@ -0,0 +1,14 @@
-+OPENAL_CONFIG_OPTS = ./configure --enable-sdl --enable-smpeg --enable-vorbis
-+
-+SDL_CONFIG   = /usr/bin/sdl-config
-+SMPEG_CONFIG = /usr/bin/smpeg-config
-+
-+SDL_CFLAGS   = `$(SDL_CONFIG) --cflags` -DUSE_SDL
-+SMPEG_CFLAGS = `$(SMPEG_CONFIG) --cflags`
-+PKG_CFLAGS   = 
-+
-+GL_LIBS      = -lglpng -lGL -lGLU -lm
-+AL_LIBS      = -L../support/openal/lib -lopenal -ldl
-+SDL_LIBS     = `$(SDL_CONFIG) --libs`
-+SMPEG_LIBS   = `$(SMPEG_CONFIG) --libs`
-+VORBIS_LIBS  = -L/usr/lib -lvorbis -lvorbisfile
-diff -ruN Chromium-0.9.old/Makefile Chromium-0.9/Makefile
---- Chromium-0.9.old/Makefile	1970-01-01 10:00:00.000000000 +1000
-+++ Chromium-0.9/Makefile	2003-06-14 13:22:57.000000000 +1000
-@@ -0,0 +1,48 @@
-+SUPPORT_DIRS	=	 \
-+			./support/openal/ \
-+			./support/glpng/src
-+
-+CHROMIUM_DIRS	=	\
-+			./src
-+
-+			
-+all: $(SUPPORT_DIRS) chromium
-+
-+chromium: $(CHROMIUM_DIRS) finish
-+
-+support: $(SUPPORT_DIRS)
-+
-+$(CHROMIUM_DIRS): FORCE
-+	cd $@; $(MAKE)
-+
-+$(SUPPORT_DIRS): FORCE
-+	cd $@; $(MAKE)
-+
-+finish: 
-+	@echo ""
-+	@mv -vf ./src/chromium ./bin
-+	@echo ""
-+	-ls --color ./bin/*
-+	@echo ""
-+	@echo "Now cd to ./bin and run chromium!"
-+	@echo ""
-+
-+clean:
-+	for i in $(SUPPORT_DIRS); do ( cd $$i ; $(MAKE) clean ) ; done
-+	for i in $(CHROMIUM_DIRS); do ( cd $$i ; $(MAKE) clean ) ; done
-+	-rm -f ./bin/*
-+	-rm -f *~ core
-+	-rm -f *.bck
-+
-+distclean: clean
-+	@echo ""
-+	-rm -f scripts/*.bck
-+	@echo -e "\n ** freshen up the doc files **\n--------------------------------"
-+	-cp -f /home/mallan/HTML/mba/software/chromium/faq.htm ./data/doc
-+	-cp -f /home/mallan/HTML/mba/software/chromium/info.htm ./data/doc
-+	@echo ""
-+	-rm -f ./config.mak
-+	-rm -f ./Makefile
-+	@echo ""
-+
-+FORCE:
-diff -ruN Chromium-0.9.old/src/Makefile Chromium-0.9/src/Makefile
---- Chromium-0.9.old/src/Makefile	2001-05-22 15:25:50.000000000 +1000
-+++ Chromium-0.9/src/Makefile	2003-06-14 14:30:46.000000000 +1000
-@@ -10,8 +10,8 @@
- 
- CC	=	gcc
- CXX	=	g++
--CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
--CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
-+CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DAUDIO_OPENAL -D_REENTRANT $(OLDCFLAGS)
-+CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DAUDIO_OPENAL -D_REENTRANT $(OLDCXXFLAGS)
- INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
- LINK	=	g++
- LFLAGS	=	
-diff -ruN Chromium-0.9.old/src/NCString.h Chromium-0.9/src/NCString.h
---- Chromium-0.9.old/src/NCString.h	2001-05-21 03:05:23.000000000 +1000
-+++ Chromium-0.9/src/NCString.h	2003-06-14 13:23:46.000000000 +1000
-@@ -2,6 +2,7 @@
- #define NCString_h
- 
- #include <stream.h>
-+#include <tcl.h>
- 
- typedef unsigned int uint;
- typedef unsigned short ushort;
-diff -ruN Chromium-0.9.old/support/openal/Makefile Chromium-0.9/support/openal/Makefile
---- Chromium-0.9.old/support/openal/Makefile	2001-02-08 16:09:44.000000000 +1100
-+++ Chromium-0.9/support/openal/Makefile	2003-06-14 13:24:02.000000000 +1000
-@@ -4,7 +4,7 @@
- 
- linux: FORCE
- 	mkdir -p ./lib
--	cd linux; sh autogen.sh; $(OPENAL_CONFIG_OPTS); $(MAKE)
-+	cd linux; $(OPENAL_CONFIG_OPTS); $(MAKE)
- 	cp ./linux/src/libopenal.a ./lib
- 
- clean:
diff --git a/games-fps/bzflag/CONFIGURE b/games-fps/bzflag/CONFIGURE
index 8afcebb..ab08596 100755
--- a/games-fps/bzflag/CONFIGURE
+++ b/games-fps/bzflag/CONFIGURE
@@ -2,6 +2,9 @@
 config_query BZF_BZADMIN_PATCH                            \
              "Do you want bzadmin stdboth colors patch?"  \
              n                                            &&
+config_query BZF_NARROWFIX                                \
+             "If you notice issues with rendering when someone has the narrow flag then apply this patch - this happens with some radeon and intel devices"                                                       \
+             n                                            &&
 config_query_option  BZF_OPTS                             \
                      "Build game client?"                 \
                      y                                    \
diff --git a/games-fps/bzflag/DETAILS b/games-fps/bzflag/DETAILS
index b4193f8..564d8b7 100755
--- a/games-fps/bzflag/DETAILS
+++ b/games-fps/bzflag/DETAILS
@@ -33,11 +33,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$BZF_VERSION
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=2.0.10
+         VERSION=2.0.12
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:0239f12b2c108f4a5d02c556c5a782eea590564ea921cb8d60b5da3ff05e83e52cef5198128c3b0cab88a4a0f73cf0a166295482fff07f965066062140d28d1d
+     SOURCE_HASH=sha512:e36a5545468e40983b91566a97e78a62019575a7975c341eae46645ae22fef0b2288948cd92eb3773f4cbe16883c532759523df9d9923e2a653cebabc227d5c0
 fi
         WEB_SITE=http://www.bzflag.org/
          ENTERED=20010922
diff --git a/games-fps/bzflag/HISTORY b/games-fps/bzflag/HISTORY
index 7f7e75c..85766bd 100644
--- a/games-fps/bzflag/HISTORY
+++ b/games-fps/bzflag/HISTORY
@@ -1,3 +1,9 @@
+2008-06-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: updated BZF_VERSION=foo to 2.0.12
+	* narrowfix.patch: added a fix due to some buggy GL with 0 width
+	* CONFIGURE: ask for patch
+	* PRE_BUILD: apply patch
+
 2008-06-09 Thomas Orgis <sobukus at sourcemage.org>
 	* PRE_BUILD, bzflag-cstring.diff: fix build for gcc-4.3
 
diff --git a/games-fps/bzflag/PRE_BUILD b/games-fps/bzflag/PRE_BUILD
index 54d03e1..06fa28e 100755
--- a/games-fps/bzflag/PRE_BUILD
+++ b/games-fps/bzflag/PRE_BUILD
@@ -5,5 +5,8 @@ sedit 's:-Werror::g' configure.ac                             &&
 if [[ $BZF_BZADMIN_PATCH == y ]]; then
 patch -p0 < ${SPELL_DIRECTORY}/bzadmin_stdboth_colors.patch
 fi                                                            &&
-patch -Np0 < "$SPELL_DIRECTORY/bzflag-cstring.diff"           &&
+if [[ $BZF_NARROWFIX == y ]]; then  
+patch -p0 < $SPELL_DIRECTORY/narrowfix.patch
+fi
+#patch -Np0 < "$SPELL_DIRECTORY/bzflag-cstring.diff"           &&
 NOCONFIGURE=X ./autogen.sh
diff --git a/games-fps/bzflag/narrowfix.patch b/games-fps/bzflag/narrowfix.patch
new file mode 100644
index 0000000..bd3c574
--- /dev/null
+++ b/games-fps/bzflag/narrowfix.patch
@@ -0,0 +1,12 @@
+--- src/geometry/TankSceneNode.cxx.orig	2008-04-20 12:47:51.000000000 +0200
++++ src/geometry/TankSceneNode.cxx	2008-04-20 12:50:42.000000000 +0200
+@@ -944,9 +944,6 @@
+       renderParts();
+     }
+   }
+-  else if (narrowWithDepth) {
+-    renderNarrowWithDepth();
+-  }
+   else if (isShadow && (sphere[2] < 0.0f)) {
+     // burrowed or burrowing tank, just render the top shadows
+     renderPart(Turret);



More information about the SM-Commit mailing list