From 6dce1a2d9cf53d3b36e8999f25087a664645782b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 Apr 2017 11:09:25 -0700 Subject: kodi: Make it build again and upgrade to 17.1 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../kodi/jsonschemabuilder-native.bb | 6 +++--- meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb b/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb index 094ccff988..fdb769943d 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb @@ -3,10 +3,10 @@ SUMMARY = "Kodi Media Center" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://JsonSchemaBuilder.cpp;beginline=2;endline=18;md5=1f67721215c03f66545390f6e45b99c7" -SRCREV = "b587e98911fcedc4b800cd923a882c7aeeaa2146" +SRCREV = "661dd08d221f5b2bf509a696a6aca5ee7d45bb27" -PV = "16.0+gitr${SRCPV}" -SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Jarvis" +PV = "17.1+gitr${SRCPV}" +SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton" inherit autotools-brokensep gettext native diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index d6e19617db..8f75bb48de 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb @@ -12,6 +12,7 @@ DEPENDS = " \ jsonschemabuilder-native \ nasm-native \ swig-native \ + unzip-native \ yasm-native \ zip-native \ avahi \ @@ -61,9 +62,11 @@ DEPENDS = " \ PROVIDES = "xbmc" -SRCREV = "a10c5048f2487bd9b2dc1f35d2fee48a25945a70" -PV = "17.0+gitr${SRCPV}" +SRCREV = "661dd08d221f5b2bf509a696a6aca5ee7d45bb27" +BASEPV = "17.1" +PV = "${BASEPV}+gitr${SRCPV}" SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \ + https://repo.voidlinux.eu/distfiles/${BPN}-${BASEPV}-generated-addons.tar.xz;name=addons;unpack=0 \ file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ file://0004-handle-SIGTERM.patch \ file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ @@ -80,6 +83,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Fix-file_Emu-on-musl.patch \ file://0002-Remove-FILEWRAP.patch \ " +SRC_URI[addons.md5sum] = "719614fa764011a18665d08af5c8c92f" +SRC_URI[addons.sha256sum] = "350da57408c27473eaf40e7f544bc94841bf101dc4346085260c5c4af0adac97" inherit autotools-brokensep gettext pythonnative @@ -116,6 +121,7 @@ EXTRA_OECONF = " \ --disable-optical-drive \ --with-ffmpeg=shared \ --enable-texturepacker=no \ + ac_cv_path_JAVA_EXE=/bin/true \ " FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O3 -ffast-math" @@ -137,13 +143,18 @@ def enable_glew(bb, d): return "" do_configure() { + tar xf ${WORKDIR}/${BPN}-${BASEPV}-generated-addons.tar.xz -C ${S}/ + ( for i in $(find ${S} -name "configure.*" ) ; do cd $(dirname $i) && gnu-configize --force || true done ) + ( for f in ${S}/xbmc/interfaces/python/generated/*.cpp; do + touch `echo $f|sed -e 's/.cpp$/.xml/g'` + done ) make -C tools/depends/target/crossguid PREFIX=${STAGING_DIR_HOST}${prefix} BOOTSTRAP_STANDALONE=1 make -f bootstrap.mk JSON_BUILDER="${STAGING_BINDIR_NATIVE}/JsonSchemaBuilder" - BOOTSTRAP_STANDALONE=1 make -f codegenerator.mk JSON_BUILDER="${STAGING_BINDIR_NATIVE}/JsonSchemaBuilder" + BOOTSTRAP_STANDALONE=1 make JAVA=/bin/true -f codegenerator.mk JSON_BUILDER="${STAGING_BINDIR_NATIVE}/JsonSchemaBuilder" oe_runconf } @@ -191,6 +202,3 @@ RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 \ RPROVIDES_${PN} += "xbmc" TOOLCHAIN = "gcc" - - -PNBLACKLIST[kodi] ?= "Depends on blacklisted libsdl-mixer - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- cgit 1.2.3-korg