diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2012-08-01 09:34:46 -0300 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-08-14 22:30:34 -0500 |
| commit | ce6ee5983c93f8e769d065fbc8d7d35083cd0ad5 (patch) | |
| tree | d016bd146954c2cf7490d46695fccfd403c68e3b /games/assaultcube | |
| parent | 86849038ea0a8aefbd651e0ab8ec23b9ac88efde (diff) | |
games/assaultcube: Included patch for X11.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
Diffstat (limited to 'games/assaultcube')
| -rw-r--r-- | games/assaultcube/assaultcube.SlackBuild | 4 | ||||
| -rw-r--r-- | games/assaultcube/missing-X11.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/games/assaultcube/assaultcube.SlackBuild b/games/assaultcube/assaultcube.SlackBuild index 01d498a457f3..e16ab799c3df 100644 --- a/games/assaultcube/assaultcube.SlackBuild +++ b/games/assaultcube/assaultcube.SlackBuild @@ -7,7 +7,7 @@ SRCNAM=AssaultCube PRGNAM=assaultcube VERSION=1.1.0.4 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,6 +51,8 @@ find . \ # Use custom SLKCFLAGS and remove precompiled binaries. patch -p1 < $CWD/Makefile.patch +# From upstream. Missing -Xll +patch -p1 < $CWD/missing-X11.patch sed -i "s|-O2|$SLKCFLAGS|" source/enet/configure rm -f bin_unix/* diff --git a/games/assaultcube/missing-X11.patch b/games/assaultcube/missing-X11.patch new file mode 100644 index 000000000000..0b5443c574bf --- /dev/null +++ b/games/assaultcube/missing-X11.patch @@ -0,0 +1,12 @@ +diff -Naur 1.1.0.4.orig/source/src/Makefile 1.1.0.4/source/src/Makefile +--- 1.1.0.4.orig/source/src/Makefile 2010-11-14 18:46:24.000000000 +0000 ++++ 1.1.0.4/source/src/Makefile 2012-07-10 03:43:41.110712746 +0000 +@@ -26,7 +26,7 @@ + override CXXFLAGS+= -rdynamic + CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include + # -lSDL_ttf +-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile ++CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile + endif + + CLIENT_OBJS= \ |