summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/xbmc/README21
-rw-r--r--multimedia/xbmc/xbmc.SlackBuild14
2 files changed, 23 insertions, 12 deletions
diff --git a/multimedia/xbmc/README b/multimedia/xbmc/README
index 24814e35db..ddb92df9d9 100644
--- a/multimedia/xbmc/README
+++ b/multimedia/xbmc/README
@@ -5,20 +5,19 @@ viewing and playing a vast library of audio, video and image formats.
XBMC has a sophisticated library management system that allows you to
organize all your media to give you quick and immediate access.
-XBMC requires libsamplerate, faad2, libmms and enca.
+XBMC requires faad2, libmms, and enca.
-Optional: vobcopy, lirc, faac, SDL_gfx, pulseaudio, cwiid, pybluez,
-lightblue, libvdpau and avahi. Starting with version 9.11 XBMC can
-be built with additional system libraries which are ffmpeg, libmpeg2,
-libdca (aka libdts), a52dec (aka liba52) and libass (all available
-at slackbuilds.org). These additional system libraries have to be
-manually added to xbmc.SlackBuild. Look inside the slackbuild for
-addtional information.
+Optional: vobcopy, lirc, faac, SDL_gfx, cwiid, pybluez, lightblue, libvdpau
+and avahi. Starting with version 9.11, XBMC can be built with additional
+system libraries which are ffmpeg, libmpeg2, libdca (aka libdts), a52dec
+(aka liba52), and libass (all available at slackbuilds.org). The additional
+system libraries have to be manually added to xbmc.SlackBuild. Look inside
+the slackbuild for addtional information.
In order to use a Wii remote with XBMC pass USE_WII=yes to the
-slackbuild. This now makes cwiid a build requirement and also requires
+slackbuild. This now makes cwiid a build requirement and also requires
pybluez or lightblue for bluetooth support.
Some plugins to use are available at:
-http://code.google.com/p/xbmc-addons/
-http://www.xbmcscripts.com/
+ http://code.google.com/p/xbmc-addons/
+ http://www.xbmcscripts.com/
diff --git a/multimedia/xbmc/xbmc.SlackBuild b/multimedia/xbmc/xbmc.SlackBuild
index 0aa640bf23..4a85b17aea 100644
--- a/multimedia/xbmc/xbmc.SlackBuild
+++ b/multimedia/xbmc/xbmc.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=xbmc
VERSION=${VERSION:-9.11}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e