From 8ba3b93ef7bc7cb3340ba8a10baf07616ac9befb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 10 Aug 2014 16:39:14 -0300 Subject: xbmc-libre-13.1-5: 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#41421 (https://bugs.archlinux.org/task/41421) - [xbmc] Crashing a lot, upstream says build not supported use internal xbmc ffmpeg, it fixes issues for the ones affected FS#41498 (https://bugs.archlinux.org/task/41498) - [xbmc] Missing PIL dependency --- libre/xbmc-libre/PKGBUILD | 23 ++---- libre/xbmc-libre/enable-external-ffmpeg.patch | 100 -------------------------- libre/xbmc-libre/xbmc.install | 30 +++----- libre/xbmc-libre/xbmc.service | 16 ----- 4 files changed, 15 insertions(+), 154 deletions(-) delete mode 100644 libre/xbmc-libre/enable-external-ffmpeg.patch delete mode 100644 libre/xbmc-libre/xbmc.service diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index f31c8d2e2..5c73da5b6 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116495 2014-07-28 17:48:19Z idevolder $ +# $Id: PKGBUILD 117040 2014-08-08 15:44:51Z idevolder $ # Maintainer (Arch): Sergej Pupykin # Contributor (Arch): Brad Fanella # Contributor (Arch): [vEX] @@ -14,7 +14,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=13.1 _codename=Gotham -pkgrel=4 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -23,9 +23,10 @@ replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) depends=( -'avahi' 'ffmpeg' 'hicolor-icon-theme' 'libcdio' 'libmad' 'libmicrohttpd' -'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libssh' 'libxrandr' 'libxslt' -'lzo2' 'mesa' 'mesa-demos' 'python2' 'sdl_image' 'sdl_mixer' 'smbclient' +'avahi' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad' +'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient' 'libsamplerate' +'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt' 'lzo' 'mesa' +'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image' 'smbclient' 'taglib' 'tinyxml' 'unzip' 'xorg-xdpyinfo' 'yajl' ) makedepends=( @@ -51,8 +52,6 @@ mksource=( ) source=( "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" - 'xbmc.service' - 'enable-external-ffmpeg.patch' '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' 'libnfs-header-changes.patch' ) @@ -61,8 +60,6 @@ mksha256sums=( ) sha256sums=( '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f' - '1a94a7952ef99cd3dd6f4b921630563f72a3b907265e91e0a37b07339081558c' - '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' '9b49e98540cfcf3431d38cf9cd981ed8450ccbfcb70eed7f862f82f39d66763b' ) @@ -76,7 +73,6 @@ mksource() { prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" - patch -p1 -i "$srcdir/enable-external-ffmpeg.patch" patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" patch -p1 -i "$srcdir/libnfs-header-changes.patch" @@ -149,12 +145,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/enable-external-ffmpeg.patch b/libre/xbmc-libre/enable-external-ffmpeg.patch deleted file mode 100644 index 2bc1aaf03..000000000 --- a/libre/xbmc-libre/enable-external-ffmpeg.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -rupN a/configure.in b/configure.in ---- a/configure.in 2014-05-03 21:03:25.000000000 +0000 -+++ b/configure.in 2014-05-07 09:56:30.039177391 +0000 -@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG - MAKE="${MAKE:-make}" - OBJDUMP="${OBJDUMP:-objdump}" - --use_external_ffmpeg=no -+use_external_ffmpeg=yes - use_static_ffmpeg=no - - # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os -@@ -632,7 +632,7 @@ case $host in - use_arch="x86" - use_cpu="i686" - fi -- use_static_ffmpeg=yes -+ use_static_ffmpeg=no - ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) - ARCH="x86_64-linux" -@@ -640,7 +640,7 @@ case $host in - use_arch="x86_64" - use_cpu="x86_64" - fi -- use_static_ffmpeg=yes -+ use_static_ffmpeg=no - ;; - i386-*-freebsd*) - ARCH="x86-freebsd" -@@ -696,7 +696,7 @@ case $host in - use_sdl=no - use_x11=no - use_wayland=no -- use_static_ffmpeg=yes -+ use_static_ffmpeg=no - ;; - arm*-*linux-android*) - target_platform=target_android -diff -rupN a/lib/DllAvCodec.h b/lib/DllAvCodec.h ---- a/lib/DllAvCodec.h 2014-05-03 21:03:25.000000000 +0000 -+++ b/lib/DllAvCodec.h 2014-05-07 10:10:06.298165915 +0000 -@@ -43,6 +43,7 @@ extern "C" { - - #if (defined USE_EXTERNAL_FFMPEG) - #include -+ #include - #else - #include "libavcodec/avcodec.h" - #endif -diff -rupN a/lib/DllAvUtil.h b/lib/DllAvUtil.h ---- a/lib/DllAvUtil.h 2014-05-03 21:03:25.000000000 +0000 -+++ b/lib/DllAvUtil.h 2014-05-07 10:17:31.415798448 +0000 -@@ -31,33 +31,19 @@ - #endif - - extern "C" { --#if (defined USE_EXTERNAL_FFMPEG) -- #include -- // for av_get_default_channel_layout -- #include -- #include -- #include -- // for LIBAVCODEC_VERSION_INT: -- #include -- // for enum AVSampleFormat -- #include -- #include -- #include -- #include -- #if (defined USE_LIBAV_HACKS) -- #include "xbmc-libav-hacks/libav_hacks.h" -- #endif --#else -- #include "libavutil/avutil.h" -- //for av_get_default_channel_layout -- #include "libavutil/audioconvert.h" -- #include "libavutil/crc.h" -- #include "libavutil/opt.h" -- #include "libavutil/mem.h" -- #include "libavutil/fifo.h" -- // for enum AVSampleFormat -- #include "libavutil/samplefmt.h" --#endif -+#include -+#include -+// for av_get_default_channel_layout -+#include -+#include -+#include -+// for LIBAVCODEC_VERSION_INT: -+#include -+// for enum AVSampleFormat -+#include -+#include -+#include -+#include - } - - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100) diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 48f337c55..f90770bd5 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/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/xbmc.service b/libre/xbmc-libre/xbmc.service deleted file mode 100644 index 90119f07d..000000000 --- a/libre/xbmc-libre/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 -- cgit v1.2.3-2-g168b