From ed16203ba86b8dd6147d6c5a8198fe036298897a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 9 Oct 2014 10:23:46 +0200 Subject: [PATCH] xbmc-rpi: use openjdk to bootstrap; add a runit service. --- srcpkgs/xbmc-rpi/files/xbmc-standalone/run | 2 ++ srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise | 1 + srcpkgs/xbmc-rpi/template | 11 +++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100755 srcpkgs/xbmc-rpi/files/xbmc-standalone/run create mode 120000 srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise diff --git a/srcpkgs/xbmc-rpi/files/xbmc-standalone/run b/srcpkgs/xbmc-rpi/files/xbmc-standalone/run new file mode 100755 index 00000000000..3e62e43a40d --- /dev/null +++ b/srcpkgs/xbmc-rpi/files/xbmc-standalone/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -P sudo -u xbmc -- /usr/lib/xbmc/xbmc.bin --standalone diff --git a/srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise b/srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise new file mode 120000 index 00000000000..53054a9bd71 --- /dev/null +++ b/srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise @@ -0,0 +1 @@ +/run/runit/supervise.xbmc-standalone \ No newline at end of file diff --git a/srcpkgs/xbmc-rpi/template b/srcpkgs/xbmc-rpi/template index c9c11c0ebab..326fedbc4a7 100644 --- a/srcpkgs/xbmc-rpi/template +++ b/srcpkgs/xbmc-rpi/template @@ -1,7 +1,7 @@ # Template file for 'xbmc-rpi' pkgname=xbmc-rpi version=13.2 -revision=1 +revision=2 patch_args="-Np1" wrksrc="xbmc-${version}-Gotham" short_desc="XBMC Media Center for the Raspberry Pi" @@ -21,7 +21,7 @@ fi hostmakedepends=" automake libtool pkg-config gperf cmake zip unzip nasm yasm swig gettext-devel libltdl-devel python-devel libmysqlclient-devel - SDL_image-devel lzo-devel oracle-jre" + SDL_image-devel lzo-devel openjdk-jre" makedepends=" libudev-devel pcre-devel>=8.30 expat-devel libpng-devel>=1.6 libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel>=5.5.27 @@ -43,7 +43,7 @@ xbmc_homedir="/var/lib/xbmc" xbmc_groups="audio,input,video" pre_configure() { - . /etc/profile.d/oracle-jre.sh + . /etc/profile.d/10_openjdk.sh ./bootstrap # fix lsb_release dependency @@ -55,7 +55,7 @@ pre_configure() { } do_configure() { - . /etc/profile.d/oracle-jre.sh + . /etc/profile.d/10_openjdk.sh CFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux" CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/ -I${XBPS_CROSS_BASE}/opt/vc/include/IL" CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" @@ -107,4 +107,7 @@ do_install() { rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache vinstall ${FILESDIR}/polkit.rules 0644 etc/polkit-1/rules.d 10-xbmc.rules + + vmkdir etc/sv + vcopy ${FILESDIR}/xbmc-standalone etc/sv }