summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-10 17:39:14 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-10 17:39:14 -0300
commitb8bf5a11ddcb3d3ba3df302c2f5ca635db8fc3f2 (patch)
treeecb3a7f47270ccad19ae30b92363035dce916c31 /libre
parent8ba3b93ef7bc7cb3340ba8a10baf07616ac9befb (diff)
downloadabslibre-b8bf5a11ddcb3d3ba3df302c2f5ca635db8fc3f2.tar.gz
abslibre-b8bf5a11ddcb3d3ba3df302c2f5ca635db8fc3f2.tar.bz2
abslibre-b8bf5a11ddcb3d3ba3df302c2f5ca635db8fc3f2.zip
xbmc-libre-lts-12.3-6: fix issues reported from Arch
FIXES: FS#41391 (https://bugs.archlinux.org/task/41391) - [xbmc] Since the new xorg update, xbmc.service does not start remove xbmc.service add note linking to the wiki FS#41498 (https://bugs.archlinux.org/task/41498) - [xbmc] Missing PIL dependency
Diffstat (limited to 'libre')
-rw-r--r--libre/xbmc-libre-lts/PKGBUILD13
-rw-r--r--libre/xbmc-libre-lts/xbmc.install30
-rw-r--r--libre/xbmc-libre-lts/xbmc.service16
3 files changed, 11 insertions, 48 deletions
diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD
index df8a55c76..4ddb30185 100644
--- a/libre/xbmc-libre-lts/PKGBUILD
+++ b/libre/xbmc-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ _pkgname=xbmc
pkgname=xbmc-libre-lts
pkgver=12.3
_codename=Frodo
-pkgrel=5
+pkgrel=6
pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -22,7 +22,7 @@ provides=($_pkgname)
depends=(
'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
-'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
+'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'python2-pillow'
'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu'
'tinyxml' 'taglib' 'ffmpeg-compat'
@@ -44,7 +44,6 @@ mksource=(
)
source=(
"https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz"
- 'xbmc.service'
"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285"
'0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
'libnfs-header-changes.patch'
@@ -54,7 +53,6 @@ mkmd5sums=(
)
md5sums=(
'10ed8b9cb84b2825d746c26bd5236899'
- 'a3e68ff230fac14cd58f2b5eff1661ba'
'7fd6399d2ffbdf06b724f0cc2efa0784'
'8998bc505ae4c66604c90b1c005be8c2'
'27f1e75d99977d5bdd3eee58921514cb'
@@ -152,12 +150,5 @@ package() {
mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \
"${pkgdir}$_prefix/share/licenses/$_pkgname"
done
-
- # install systemd service
- install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service"
-
- # XBMC user home
- install -dm 700 "${pkgdir}"/var/lib/xbmc
- chown 420:420 "${pkgdir}"/var/lib/xbmc
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install
index 48f337c55..f90770bd5 100644
--- a/libre/xbmc-libre-lts/xbmc.install
+++ b/libre/xbmc-libre-lts/xbmc.install
@@ -1,36 +1,24 @@
post_install() {
update_icons
- getent group xbmc > /dev/null || groupadd -g 420 xbmc
- if ! getent passwd xbmc > /dev/null; then
- useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc
- passwd -l xbmc > /dev/null
- fi
+ update_autostart
}
post_upgrade() {
- post_install $1
- if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then
- groupmod -g 420 xbmc > /dev/null 2>&1
- fi
- if ! id -u xbmc | grep 420 > /dev/null 2>&1; then
- usermod -u 420 xbmc > /dev/null 2>&1
- if [[ $? -ne 0 ]]; then
- echo "Changing uid of user xbmc failed"
- echo "It is recommended that the uid is changed."
- echo "Stop all processes running under the xbmc user and reinstall xbmc"
- echo "or change the uid manually. (usermod -u 420 xbmc)"
- fi
- chown -R xbmc:xbmc /var/lib/xbmc
- fi
+ update_icons
+ update_autostart
}
post_remove() {
update_icons
- getent passwd xbmc > /dev/null 2>&1 && userdel xbmc
- getent group xbmc > /dev/null 2>&1 && groupdel xbmc
+ update_autostart
}
update_icons() {
type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications
+ return 0
+}
+
+update_autostart() {
+ echo "To autostart xbmc standalone read: https://wiki.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot"
}
diff --git a/libre/xbmc-libre-lts/xbmc.service b/libre/xbmc-libre-lts/xbmc.service
deleted file mode 100644
index 90119f07d..000000000
--- a/libre/xbmc-libre-lts/xbmc.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service network.target
-Conflicts=getty@tty7.service
-
-[Service]
-User = xbmc
-Group = xbmc
-PAMName=login
-Type = simple
-TTYPath=/dev/tty7
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7
-Restart = on-abort
-
-[Install]
-WantedBy = multi-user.target