summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward W. Koenig <kingbeowulf[at]gmail[dot]com>2012-09-10 22:39:31 -0500
committerRobby Workman <rworkman@slackbuilds.org>2012-09-10 22:40:43 -0500
commitb8c90cfd057797e641def7060ee53000da8abc2d (patch)
tree214b689cf60ebff44b4b8a6034d050c34cb02774
parent52b0c31ba866948fcfb18c3a3edfe28ca4c57864 (diff)
downloadslackbuilds-b8c90cfd057797e641def7060ee53000da8abc2d.tar.gz
games/sauerbraten: Fix build wrt linking X11
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--games/sauerbraten/makefile_libx11_fix.patch11
-rw-r--r--games/sauerbraten/sauerbraten.SlackBuild8
2 files changed, 17 insertions, 2 deletions
diff --git a/games/sauerbraten/makefile_libx11_fix.patch b/games/sauerbraten/makefile_libx11_fix.patch
new file mode 100644
index 0000000000..feee765de3
--- /dev/null
+++ b/games/sauerbraten/makefile_libx11_fix.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-05-13 11:30:28.000000000 -0700
++++ Makefile 2012-08-03 18:46:55.010000000 -0700
+@@ -21,7 +21,7 @@
+ CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
+ else
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -Lenet/.libs -lenet -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
diff --git a/games/sauerbraten/sauerbraten.SlackBuild b/games/sauerbraten/sauerbraten.SlackBuild
index 56eed3a1e7..ab5a2f9a9e 100644
--- a/games/sauerbraten/sauerbraten.SlackBuild
+++ b/games/sauerbraten/sauerbraten.SlackBuild
@@ -4,14 +4,15 @@
# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
# New SBo maintainer: Edward Koenig <kingbeowulf[at]gmail[dot]com>
-
+#
# Changelog
#---------------------------------------------------------------------------------------
# 1.0 26DEC2011 New SBo maintainer: Edward Koenig <kingbeowulf[at]gmail[dot]com>
+#
PRGNAM=sauerbraten
VERSION=${VERSION:-2010_07_28}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -52,6 +53,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix for lost libX11.so.6
+patch -p0 -d src < $CWD/makefile_libx11_fix.patch
+
# Use custom SLKCFLAGS and remove precompiled executables.
cp bin_unix/readme.txt .
rm -f bin_unix/*