From e081bb088893e4a488cf7a4e5e7321b96856d093 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Feb 2015 16:31:29 +0100 Subject: [PATCH] New package: kodi-rpi-14.1 (supersedes xbmc-rpi). --- common/shlibs | 3 ++ srcpkgs/{xbmc-rpi => kodi-rpi}/INSTALL | 0 srcpkgs/{xbmc-rpi => kodi-rpi}/REMOVE | 0 .../{xbmc-rpi => kodi-rpi}/files/polkit.rules | 0 srcpkgs/kodi-rpi/files/xbmc-standalone/run | 2 + srcpkgs/{xbmc-rpi => kodi-rpi}/template | 38 +++++++++---------- srcpkgs/xbmc-rpi/files/xbmc-standalone/run | 2 - 7 files changed, 22 insertions(+), 23 deletions(-) rename srcpkgs/{xbmc-rpi => kodi-rpi}/INSTALL (100%) rename srcpkgs/{xbmc-rpi => kodi-rpi}/REMOVE (100%) rename srcpkgs/{xbmc-rpi => kodi-rpi}/files/polkit.rules (100%) create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run rename srcpkgs/{xbmc-rpi => kodi-rpi}/template (82%) delete mode 100755 srcpkgs/xbmc-rpi/files/xbmc-standalone/run diff --git a/common/shlibs b/common/shlibs index d13e321cddd..ff469959155 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1148,6 +1148,9 @@ libbcm_host.so rpi-firmware-20130228_1 libopenmaxil.so rpi-firmware-20130228_1 libvchiq_arm.so rpi-firmware-20130228_1 libvcos.so rpi-firmware-20130228_1 +libmmal.so rpi-firmware-20150206_1 +libmmal_core.so rpi-firmware-20150206_1 +libmmal_util.so rpi-firmware-20150206_1 liblockdev.so.1 lockdev-1.0.3_1 libcec.so.2 libcec-2.1.1_1 libpython3.3m.so.1.0 python3-3.3.0_1 diff --git a/srcpkgs/xbmc-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL similarity index 100% rename from srcpkgs/xbmc-rpi/INSTALL rename to srcpkgs/kodi-rpi/INSTALL diff --git a/srcpkgs/xbmc-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE similarity index 100% rename from srcpkgs/xbmc-rpi/REMOVE rename to srcpkgs/kodi-rpi/REMOVE diff --git a/srcpkgs/xbmc-rpi/files/polkit.rules b/srcpkgs/kodi-rpi/files/polkit.rules similarity index 100% rename from srcpkgs/xbmc-rpi/files/polkit.rules rename to srcpkgs/kodi-rpi/files/polkit.rules diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run new file mode 100755 index 00000000000..9e966fb143e --- /dev/null +++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -P sudo -u xbmc -- /usr/lib/kodi/kodi.bin --standalone diff --git a/srcpkgs/xbmc-rpi/template b/srcpkgs/kodi-rpi/template similarity index 82% rename from srcpkgs/xbmc-rpi/template rename to srcpkgs/kodi-rpi/template index dd02709edba..feb92ff4330 100644 --- a/srcpkgs/xbmc-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,15 +1,14 @@ -# Template file for 'xbmc-rpi' -pkgname=xbmc-rpi -version=13.2 -revision=5 -patch_args="-Np1" -wrksrc="xbmc-${version}-Gotham" -short_desc="XBMC Media Center for the Raspberry Pi" +# Template file for 'kodi-rpi' +pkgname=kodi-rpi +version=14.1 +revision=1 +wrksrc="xbmc-${version}-Helix" +short_desc="A software media player and entertainment hub for digital media (RPi)" maintainer="Juan RP " -homepage="http://www.xbmc.org" +homepage="http://www.kodi.tv" license="GPL-2" -distfiles="https://github.com/xbmc/xbmc/archive/${version}-Gotham.tar.gz" -checksum=acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585 +distfiles="https://github.com/xbmc/xbmc/archive/${version}-Helix.tar.gz" +checksum=a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 only_for_archs="armv6l armv7l" # Due to bootstrap requiring java, it's only possible currently to cross @@ -27,7 +26,7 @@ makedepends=" 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 + libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel>=1.12 librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-firmware" @@ -36,7 +35,8 @@ depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist>=1.12 libssh" depends+=" hicolor-icon-theme desktop-file-utils" -provides="xbmc-${version}_${revision}" +provides="kodi-${version}_${revision} xbmc-${version}_${revision}" +replaces="xbmc>=0 kodi>=0" # Create xbmc system user to launch xbmc-standalone. system_accounts="xbmc" xbmc_homedir="/var/lib/xbmc" @@ -46,9 +46,6 @@ pre_configure() { . /etc/profile.d/10_openjdk.sh ./bootstrap - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:/bin/true:' xbmc/utils/SystemInfo.cpp - # 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 @@ -56,7 +53,6 @@ pre_configure() { do_configure() { . /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" CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux" @@ -85,16 +81,16 @@ do_configure() { --enable-gles \ --enable-optimizations \ --enable-libcec \ - --enable-player=omxplayer + --enable-player=omxplayer \ + --enable-external-libraries \ + --with-ffmpeg=shared sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i lib/libdvd/libdvd{nav,read}/Makefile sed -e 's,-L/usr/lib,,g' -i lib/cmyth/Makefile } - do_build() { make ${makejobs} } - do_install() { make DESTDIR=${DESTDIR} install @@ -102,11 +98,11 @@ do_install() { head -n 171 ${DESTDIR}/usr/share/xbmc/FEH.py > ${DESTDIR}/usr/share/xbmc/FEH.py.new mv ${DESTDIR}/usr/share/xbmc/FEH.py.new ${DESTDIR}/usr/share/xbmc/FEH.py - vinstall tools/Linux/xbmc.desktop 644 usr/share/applications vinstall media/icon48x48.png 644 usr/share/pixmaps xbmc.png - rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache vinstall ${FILESDIR}/polkit.rules 0644 etc/polkit-1/rules.d 10-xbmc.rules + rm -rf ${DESTDIR}/usr/include + vsv xbmc-standalone } diff --git a/srcpkgs/xbmc-rpi/files/xbmc-standalone/run b/srcpkgs/xbmc-rpi/files/xbmc-standalone/run deleted file mode 100755 index 3e62e43a40d..00000000000 --- a/srcpkgs/xbmc-rpi/files/xbmc-standalone/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec chpst -P sudo -u xbmc -- /usr/lib/xbmc/xbmc.bin --standalone