diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch new file mode 120000 index 00000000000..d28799cb63f --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch @@ -0,0 +1 @@ +../../kodi/patches/add-missing-includes.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/cross-fix.patch b/srcpkgs/kodi-rpi/patches/cross-fix.patch index 1c2cb7ad402..9991a9b66fc 100644 --- a/srcpkgs/kodi-rpi/patches/cross-fix.patch +++ b/srcpkgs/kodi-rpi/patches/cross-fix.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2015-07-23 23:49:37.887069973 +0200 -+++ configure.ac 2015-07-23 23:51:40.074074325 +0200 +--- a/configure.ac.orig 2015-07-23 23:49:37.887069973 +0200 ++++ b/configure.ac 2015-07-23 23:51:40.074074325 +0200 @@ -2170,15 +2170,12 @@ else final_message="$final_message\n Bluray:\tNo" fi diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch new file mode 120000 index 00000000000..e88377b37df --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch @@ -0,0 +1 @@ +../../kodi/patches/fix-fileemu.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch new file mode 120000 index 00000000000..c82751fe9cb --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch @@ -0,0 +1 @@ +../../kodi/patches/fix-musl.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/fix-rsxs.patch b/srcpkgs/kodi-rpi/patches/fix-rsxs.patch new file mode 120000 index 00000000000..466b63939ee --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/fix-rsxs.patch @@ -0,0 +1 @@ +../../kodi/patches/fix-rsxs.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch new file mode 120000 index 00000000000..c5c5222e72e --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch @@ -0,0 +1 @@ +../../kodi/patches/fortify-source-fix.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch b/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch index ff60c656740..39ccfff44d3 100644 --- a/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch +++ b/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch @@ -1,5 +1,5 @@ ---- tools/depends/native/JsonSchemaBuilder/Makefile.orig 2015-02-06 16:03:11.758503904 +0100 -+++ tools/depends/native/JsonSchemaBuilder/Makefile 2015-02-06 16:03:29.557107942 +0100 +--- a/tools/depends/native/JsonSchemaBuilder/Makefile.orig 2015-02-06 16:03:11.758503904 +0100 ++++ b/tools/depends/native/JsonSchemaBuilder/Makefile 2015-02-06 16:03:29.557107942 +0100 @@ -15,7 +15,7 @@ endif SOURCE=$(ROOT_DIR)/src diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch new file mode 120000 index 00000000000..b87f6a4cc95 --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch @@ -0,0 +1 @@ +../../kodi/patches/remove-filewrap.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/set-default-stacksize.patch b/srcpkgs/kodi-rpi/patches/set-default-stacksize.patch new file mode 120000 index 00000000000..2f45576916e --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/set-default-stacksize.patch @@ -0,0 +1 @@ +../../kodi/patches/set-default-stacksize.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 0006722689a..3e0d47f1659 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,7 +1,8 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi version=15.2 -revision=1 +revision=2 +patch_args="-Np1" _codename="Isengard" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media (RPi)" @@ -11,12 +12,12 @@ license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 -only_for_archs="armv6l armv7l" +only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" hostmakedepends=" automake libtool pkg-config gperf cmake zip unzip nasm yasm - swig gettext-devel libltdl-devel python-devel libmysqlclient-devel - SDL2_image-devel lzo-devel openjdk-jre" + gettext-devel libltdl-devel python-devel libmysqlclient-devel + SDL2_image-devel lzo-devel" makedepends=" libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel @@ -32,8 +33,13 @@ depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs>=1.9.7 libplist>=1.12 libssh" depends+=" hicolor-icon-theme desktop-file-utils" -provides="kodi-${version}_${revision} xbmc-${version}_${revision}" -replaces="xbmc>=0 kodi>=0" +# musl builds need generated addons (no java). +case "$XBPS_MACHINE" in + *-musl) _kodi_nojava=yes;; + *) hostmakedepends+=" swig openjdk-jre";; +esac + +provides="kodi-${version}_${revision}" # Create xbmc system user to launch xbmc-standalone. system_accounts="xbmc" @@ -41,22 +47,27 @@ xbmc_homedir="/var/lib/xbmc" xbmc_groups="audio,input,video" pre_configure() { - . /etc/profile.d/10_openjdk.sh - ./bootstrap - + # Copy generated files to avoid requiring java. + if [ -n "${_kodi_nojava}" ]; then + $XBPS_FETCH_CMD http://repo.voidlinux.eu/distfiles/kodi-${version}-generated-addons.tar.xz + tar xf kodi-${version}-generated-addons.tar.xz -C ${wrksrc} + BOOTSTRAP_STANDALONE=1 make JAVA=/bin/true SWIG=/bin/true -f codegenerator.mk + else + . /etc/profile.d/10_openjdk.sh + BOOTSTRAP_STANDALONE=1 make -f codegenerator.mk + fi + BOOTSTRAP_STANDALONE=1 make -f bootstrap.mk # 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 } do_configure() { - . /etc/profile.d/10_openjdk.sh 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" - # XXX http://build.voidlinux.eu/builders/x86_64_builder/builds/10520/steps/shell_3/logs/stdio CXXFLAGS="$CFLAGS -fpermissive" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib" + LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R/opt/vc/lib" export CFLAGS CXXFLAGS LDFLAGS @@ -82,7 +93,10 @@ do_configure() { --enable-libcec \ --enable-player=omxplayer \ --enable-external-libraries \ - --with-ffmpeg=shared + --with-ffmpeg=shared \ + ac_cv_path_JAVA_EXE=/bin/true \ + ac_cv_path_SWIG_EXE=/bin/true + 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 }