From bfa1b5965e6f1de33d27e105b8fbd661c4676674 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 23 Aug 2014 16:16:35 +0200 Subject: [PATCH] xbmc-rpi: update to 13.2. --- srcpkgs/xbmc-rpi/files/xbmc.service | 13 ---------- srcpkgs/xbmc-rpi/template | 38 +++++++++-------------------- 2 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/xbmc-rpi/files/xbmc.service diff --git a/srcpkgs/xbmc-rpi/files/xbmc.service b/srcpkgs/xbmc-rpi/files/xbmc.service deleted file mode 100644 index 23e448cea50..00000000000 --- a/srcpkgs/xbmc-rpi/files/xbmc.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description = XBMC Media Center for Raspberry Pi service -After = remote-fs.target - -[Service] -User = xbmc -Group = xbmc -Type = simple -ExecStart = /usr/bin/xbmc-standalone -l /run/lirc/lircd -Restart = always - -[Install] -WantedBy = multi-user.target diff --git a/srcpkgs/xbmc-rpi/template b/srcpkgs/xbmc-rpi/template index 7d41b89b061..0a458ce4aca 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.1 -revision=2 +version=13.2 +revision=1 patch_args="-Np1" wrksrc="xbmc-${version}-Gotham" short_desc="XBMC Media Center for the Raspberry Pi" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://www.xbmc.org" license="GPL-2" distfiles="http://mirrors.xbmc.org/releases/source/xbmc-${version}.tar.gz" -checksum=344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678 +checksum=acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585 only_for_archs="armv6l" # Due to bootstrap requiring java, it's only possible currently to cross @@ -20,19 +20,17 @@ fi hostmakedepends=" automake libtool pkg-config gperf cmake zip unzip nasm yasm - swig jre which gettext-devel libltdl-devel python-devel libmysqlclient-devel - SDL_image-devel lzo-devel optipng" + swig gettext-devel libltdl-devel python-devel libmysqlclient-devel + SDL_image-devel lzo-devel oracle-jre" makedepends=" - libudev-devel>=183 pcre-devel>=8.30 expat-devel libpng-devel>=1.6 libjpeg-turbo-devel + eudev-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 libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel - tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel systemd-devel - libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel libxslt-devel - libxslt-devel rpi-firmware" -makedepends+=" hicolor-icon-theme desktop-file-utils" + tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel + libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-firmware" # The following dependencies are dlopen(3)ed. depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist libssh" @@ -42,10 +40,10 @@ provides="xbmc-${version}_${revision}" # Create xbmc system user to launch xbmc-standalone. system_accounts="xbmc" xbmc_homedir="/var/lib/xbmc" -xbmc_groups="audio,video" +xbmc_groups="audio,input,video" pre_configure() { - . /etc/profile.d/java.sh + . /etc/profile.d/oracle-jre.sh ./bootstrap # fix lsb_release dependency @@ -54,22 +52,10 @@ pre_configure() { # Use cross prefix for python include/libdir. sed -e "s,-L\$ac_python_libdir,-L${XBPS_CROSS_BASE}/usr/lib,g" -i configure sed -e "s,PYTHON_CPPFLAGS=\$python_path,PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" -i configure - - # Optimize png files. - OLDIFS=$IFS - IFS=$'\n' - PNGFILES=($(find ${wrksrc} -type f -name *.png)) - IFS=$OLDIFS - len=${#PNGFILES[@]} - for ((i=0; i<${len}; i++)); do - fname="$(basename ${PNGFILES[$i]})" - [ "$fname" = "AppIcon.png" ] && continue - optipng "${PNGFILES[$i]}" - done } do_configure() { - . /etc/profile.d/java.sh + . /etc/profile.d/oracle-jre.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" @@ -120,7 +106,5 @@ do_install() { vinstall media/icon48x48.png 644 usr/share/pixmaps xbmc.png rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache - - vinstall ${FILESDIR}/xbmc.service 0644 usr/lib/systemd/system vinstall ${FILESDIR}/polkit.rules 0644 etc/polkit-1/rules.d 10-xbmc.rules }