summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-07-06 03:47:03 (GMT)
committerCecil <knoppmyth@gmail.com>2011-07-06 03:47:03 (GMT)
commit01bb9d4076bee6200b34b719cc7f00d0ae5fab43 (patch)
tree07c9491b4705809d1b31f6ae9f82315453c3f1d8
parent0d597846ca2888b141edadae21fb64974b7b2bd1 (diff)
downloadlinhes_pkgbuild-01bb9d4076bee6200b34b719cc7f00d0ae5fab43.zip
linhes_pkgbuild-01bb9d4076bee6200b34b719cc7f00d0ae5fab43.tar.gz
linhes_pkgbuild-01bb9d4076bee6200b34b719cc7f00d0ae5fab43.tar.bz2
xbmc:bumped to latest.
-rwxr-xr-xabs/extra/xbmc/FEH.sh3
-rw-r--r--abs/extra/xbmc/PKGBUILD179
-rw-r--r--abs/extra/xbmc/__changelog1
3 files changed, 87 insertions, 96 deletions
diff --git a/abs/extra/xbmc/FEH.sh b/abs/extra/xbmc/FEH.sh
index e040a78..db8c692 100755
--- a/abs/extra/xbmc/FEH.sh
+++ b/abs/extra/xbmc/FEH.sh
@@ -14,11 +14,10 @@ fi
if [[ -z $(xdpyinfo | grep "depth of root.*24" | uniq) ]]; then
echo "XBMC cannot run unless the"
- echo "screen color depth is atleast 24 bit."
+ echo "screen color depth is at least 24 bit."
echo
echo "Please reconfigure your screen."
RETVAL=1
fi
exit ${RETVAL}
-
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index fbaf998..bd67ae5 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -1,116 +1,107 @@
-# $Id: PKGBUILD 35833 2010-12-23 10:25:34Z spupykin $
+# $Id: PKGBUILD 48068 2011-05-27 21:25:39Z schuay $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be >
-# python dependency or not
-_ext_python="disable"
_prefix=/usr
pkgname=xbmc
-pkgver=10.0
-pkgrel=5
-pkgdesc="XBMC Media Center"
+pkgver=10.1
+pkgrel=3
+pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'custom')
-depends=( 'bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
- 'glew' 'jasper' 'libcdio' 'libgl' 'libmad' 'libmms'
- 'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
- 'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
- 'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd'
- 'libssh' 'libva' 'libmodplug' 'rtmpdump')
-if [ "$_ext_python" != "disable" ]; then
- depends=( '${depends[@]}' 'python2' )
-fi
+depends=('bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
+ 'glew' 'jasper' 'libcdio' 'libgl' 'libmad' 'libmms'
+ 'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
+ 'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
+ 'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd'
+ 'libssh' 'libva' 'libmodplug' 'rtmpdump'
+ 'sqlite3')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libvdpau' 'unzip' 'zip')
optdepends=('lirc: remote controller support'
- 'unrar: access compressed files without unpacking them'
- 'devicekit-power: used to trigger suspend functionality'
- 'udisks: automount external drives'
- 'upower: used to trigger suspend functionality'
- 'libvdpau: for nvidia hardware acceleration')
+ 'unrar: access compressed files without unpacking them'
+ 'udisks: automount external drives'
+ 'upower: used to trigger suspend functionality'
+ 'libvdpau: for nvidia hardware acceleration'
+ 'lcms'
+ 'tk')
install=("${pkgname}.install")
-options=(makeflags)
source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
- "FEH.sh")
-md5sums=('728fb514e5f43f27bb880305061b4e72'
- 'c3e2ab79b9965f1a4a048275d5f222c4')
+ 'FEH.sh')
+md5sums=('391398126cb86a4f6fbd0b7037997d84'
+ '7127c0336f91ff48e408e2d1078fe8eb')
build() {
- cd "${srcdir}/xbmc-$pkgver"
-
- pacman -Q libass && { msg "Remove libass"; return 1; }
-
- # remove "--as-needed" from LDFLAGS
- unset LDFLAGS; LDFLAGS="-Wl,--hash-style=gnu"
-
- msg "Bootstrapping XBMC"
- ./bootstrap
-
- msg "Configuring XBMC"
- ./configure --prefix=/usr \
- --enable-vdpau \
- --disable-pulse \
- --disable-hal \
- --disable-avahi \
- --disable-external-liba52 \
- --disable-external-libdts \
- --enable-external-libmpeg2 \
- --enable-external-libogg \
- --enable-external-libwavpack \
- --disable-external-libass \
- --disable-external-ffmpeg \
- --enable-rtmp \
- --${_ext_python}-external-python \
- --disable-debug
-
- # Now (finally) build
- msg "Running make"
- make ${MAKEFLAGS}
- make -C lib/addons/script.module.pil
- make -C lib/addons/script.module.pysqlite
+ cd "${srcdir}/xbmc-$pkgver"
+
+ # remove "--as-needed" from LDFLAGS, since it causes
+ # undefined symbols at runtime:
+ # /usr/lib/xbmc/system/players/dvdplayer/avcodec-52-i486-linux.so:
+ # undefined symbol: NeAACDecOpen
+ unset LDFLAGS; LDFLAGS="-Wl,--hash-style=gnu"
+
+ # fix linking issue with gcc 4.5, see git 6ea61fce78q
+ sed -i 's: --soname,: -Wl,--soname,:' \
+ xbmc/cores/dvdplayer/Codecs/{,libdvd/}Makefile.in
+
+ msg "Bootstrapping XBMC"
+ ./bootstrap
+
+ msg "Configuring XBMC"
+ ./configure --prefix=${_prefix} \
+ --enable-vdpau \
+ --disable-hal \
+ --disable-avahi \
+ --enable-external-libraries \
+ --disable-external-liba52 \
+ --disable-external-libdts \
+ --disable-external-ffmpeg \
+ --enable-rtmp \
+ --disable-external-python \
+ --disable-debug
+
+ # Now (finally) build
+ msg "Running make"
+ make
+ make -C lib/addons/script.module.pil
+ make -C lib/addons/script.module.pysqlite
}
package() {
- cd "${srcdir}/xbmc-$pkgver"
- msg "Running make install"
- make prefix="${pkgdir}${_prefix}" install
-
- # Replace FEH.py with FEH.sh (and thus remove external python dependency)
- install -D -m 0755 "${srcdir}/FEH.sh" "${pkgdir}${_prefix}/share/xbmc/FEH.sh"
- sed -i -e 's/^python \(.*\)FEH.py \(.*\)$/\1FEH.sh \2/' "${pkgdir}${_prefix}/bin/xbmc"
-
- # lsb_release fix
- sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
- sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
- # .desktop files
- install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc.desktop" "${pkgdir}${_prefix}/share/applications/xbmc.desktop"
- install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc-48x48.png" "${pkgdir}${_prefix}/share/pixmaps/xbmc.png"
-
- # Tools
- install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
- install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
- # Licenses
- install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
- for licensef in LICENSE.GPL copying.txt; do
- mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
- done
-
- # Docs
- install -d -m 0755 "${pkgdir}${_prefix}/share/doc/${pkgname}"
-
- # cleanup some stuff
- msg "Cleanup unneeded files"
- rm -rf "${pkgdir}/usr/share/xsessions"
- rm -f "${pkgdir}/usr/share/xbmc/FEH.py"
- rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
-
- # strip
- msg "Stripping binaries"
- find "$pkgdir" -type f -exec strip {} \; >/dev/null 2>/dev/null
+ cd "${srcdir}/xbmc-$pkgver"
+ msg "Running make install"
+ make prefix="${pkgdir}${_prefix}" install
+
+ # Replace FEH.py with FEH.sh (and thus remove external python dependency)
+ install -D -m 0755 "${srcdir}/FEH.sh" "${pkgdir}${_prefix}/share/xbmc/FEH.sh"
+ sed -i -e 's/^python \(.*\)FEH.py \(.*\)$/\1FEH.sh \2/' "${pkgdir}${_prefix}/bin/xbmc"
+
+ # lsb_release fix
+ sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
+ sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
+
+ # .desktop files
+ install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc.desktop" "${pkgdir}${_prefix}/share/applications/xbmc.desktop"
+ install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc-48x48.png" "${pkgdir}${_prefix}/share/pixmaps/xbmc.png"
+
+ # Tools
+ install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+ install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+
+ # Licenses
+ install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+ for licensef in LICENSE.GPL copying.txt; do
+ mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+ done
+
+ # cleanup some stuff
+ msg "Cleanup unneeded files"
+ rm -rf "${pkgdir}/usr/share/xsessions"
+ rm -f "${pkgdir}/usr/share/xbmc/FEH.py"
+ rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
}
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
new file mode 100644
index 0000000..e5b3c49
--- /dev/null
+++ b/abs/extra/xbmc/__changelog
@@ -0,0 +1 @@
+7/5/11 - chw - Removed libpulse and lsb-release dep.