diff options
| -rw-r--r-- | abs/extra/xbmc/PKGBUILD | 58 | ||||
| -rw-r--r-- | abs/extra/xbmc/__changelog | 6 | ||||
| -rw-r--r-- | abs/extra/xbmc/xbmc.service | 2 |
3 files changed, 29 insertions, 37 deletions
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index 3d49bee..8e3aae1 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -8,19 +8,14 @@ _prefix=/usr pkgname=xbmc -pkgver=12.3 -_codename=Frodo -pkgrel=13 +pkgver=13.0 +_codename=Gotham +pkgrel=1 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') -depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' - 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' - 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' - 'tinyxml' 'taglib') +depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'avahi' 'bluez-libs' 'tinyxml' 'libcap' 'swig' 'taglib' 'java-runtime-headless' 'glu' 'mesa' 'shairplay' 'libxslt') makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' @@ -30,19 +25,17 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'unrar: access compressed files without unpacking them' 'xorg-xinit: autostart xbmc') install="${pkgname}.install" -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" - "xbmc.service" "xbmc.sh" "xbmc_lib.conf" - "polkit.rules" - "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") +source=( + "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz" + "xbmc.service" + "polkit.rules" + "xbmc.sh" + "xbmc_lib.conf" + ) prepare() { cd "${srcdir}/xbmc-$pkgver-$_codename" - patch -p0 <$srcdir/libass.patch - - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp -# sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp } build() { @@ -83,8 +76,9 @@ build() { --enable-udev \ --enable-libusb \ --enable-libcec \ - --enable-external-libraries \ - --disable-external-ffmpeg + --enable-external-libraries + + # Now (finally) build make } @@ -97,18 +91,17 @@ package() { # run feh with python2 sed -i -e 's/python/python2/g' ${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" - # Tools + msg2 "Tools" install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" # Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" + msg2 "Copy licenses" + install -dm755 ${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}" + mv ${pkgdir}${_prefix}/share/doc/xbmc/${licensef} \ + ${pkgdir}${_prefix}/share/licenses/${pkgname} done # LinHES stuff @@ -117,14 +110,13 @@ package() { #add in xbmc_lib.conf install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf + # install systemd service install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service -# install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules -# chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ + install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules } # vim:set ts=2 sw=2 et: -md5sums=('7ae385ebf8e5cfcb917393235e6efbdb' - '03e9a33e15714d1fd1f2a516abea5393' - 'e48a3d87984669ef206e902bc8290ff9' - '71176cb0e5aaa230d7c9634c37245bfb' +md5sums=('54fafd985b5209859ba6faeb50b8f142' + 'de331663cc8adc94f2fe44a262cfff58' '02f7951824ee13103344f36009c0ef2a' - '7fd6399d2ffbdf06b724f0cc2efa0784') + 'e48a3d87984669ef206e902bc8290ff9' + '71176cb0e5aaa230d7c9634c37245bfb') diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog index 161a9f6..ddbbf7b 100644 --- a/abs/extra/xbmc/__changelog +++ b/abs/extra/xbmc/__changelog @@ -1,3 +1,3 @@ -8/23/12 -jm -Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/ -brf - keep --disable-external-ffmpeg instead of using external ffmpeg -brf - xbmc.install: add gen_lib_xml.py to post_install and post_remove +PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/ +PKGBUILD - keep --disable-external-ffmpeg instead of using external ffmpeg +xbmc.install - add gen_lib_xml.py to post_install and post_remove diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service index 050460f..d36ddb0 100644 --- a/abs/extra/xbmc/xbmc.service +++ b/abs/extra/xbmc/xbmc.service @@ -9,7 +9,7 @@ Group = xbmc PAMName=login Type = simple TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 Restart = on-abort [Install] |