diff options
author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-19 22:21:20 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 01:40:23 -0500 |
commit | cfac4ed3eeafbf71fe4dce148b2c3e7aaeb584e7 (patch) | |
tree | 503b98ac455d5fe0def099501e6083ab3e3c5aa9 | |
parent | d6a9b320416ef53e66a11635a723472b5c5a630b (diff) |
multimedia/xbmc: Miscellaneous cleanups.
Removed pulseaudio note from README since PA is gone.
-rw-r--r-- | multimedia/xbmc/README | 21 | ||||
-rw-r--r-- | multimedia/xbmc/xbmc.SlackBuild | 14 |
2 files changed, 23 insertions, 12 deletions
diff --git a/multimedia/xbmc/README b/multimedia/xbmc/README index 24814e35dbbdc..ddb92df9d931a 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 0aa640bf23e24..4a85b17aea3da 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 |