From patchwork Wed Apr 26 18:09:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98275 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp451229qgf; Wed, 26 Apr 2017 11:09:44 -0700 (PDT) X-Received: by 10.98.194.199 with SMTP id w68mr1228014pfk.192.1493230184405; Wed, 26 Apr 2017 11:09:44 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l91si20025999plb.86.2017.04.26.11.09.43; Wed, 26 Apr 2017 11:09:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 45ABD77C85; Wed, 26 Apr 2017 18:09:36 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by mail.openembedded.org (Postfix) with ESMTP id E7880779DC for ; Wed, 26 Apr 2017 18:09:33 +0000 (UTC) Received: by mail-pg0-f46.google.com with SMTP id t7so3743448pgt.3 for ; Wed, 26 Apr 2017 11:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3GERQp0bFaE/OKhkSYa2umQUdFtctSAl4eoVH5Dx0PQ=; b=Q/qfnDIfc9dQHZYoQwBW1DT9olXFNgMyIlzqR30eSu2Xe4DwWwHM/mcQV37ZYT9XYZ hvA76EkPcrUA797fntLvaeDxDWF8jwvGm0M3CpkA8qiHC1FZqqItMfWv47ovXiutwj4z UkaDsHoF6GPQHM9q/RpUN8phsCrb2mTNDJN7vPtpsgxrzFVNxOoq0k5mebVlTTc5YkZh ZfmOTuhbCzKxPf+RgKV79kwU6n5gzQtuUjqoUfMuXcfp6JtKDNSeiJhvv/n2ZF3HwqgQ ZKYl9oelyatTgGgK7nIH22hVX2w6Rb05Szw7f0d8bYeRc+rzXjLr0m1tB7vC8obwhi1z 5/Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3GERQp0bFaE/OKhkSYa2umQUdFtctSAl4eoVH5Dx0PQ=; b=dcIrKrDM42RjqfM3lXjc6LNSZ21tgePAQNmDbVYbvXXDbyaiXD7WRtodexPKpfH/TF Rcf0FKhTTz5WGD/rUoI3yNOz1xTuAL4gLfMZYbj3eyGuFp+c24LtzUympuwvJKlRQtkN va9wCkQqguCn1xEhhBTKeZyJSrGr+oVQ19CqC9DULuJFTHDEtmkltEwfMkzPPw/ZKaNa i0t7BT+qwklt/YqraCK7ezOxL3ZXsfB6jjIN43hJcXbaJUyAyLifc6Hv5+kRiI+smLGS YU/WSM7gCJTp5z0DNoT2mP6I8ozGHpB8RO4RkNUTKZpM07rf94PZWt0ujhK4Dr0hsL4Y uz/Q== X-Gm-Message-State: AN3rC/5b6sfSOE4bN61OWEXT0sMZ+sb1PHaSfCtZ0NCigYJhmgq0wdIB L0jmI4djcBfe0A== X-Received: by 10.99.115.6 with SMTP id o6mr1118438pgc.216.1493230175009; Wed, 26 Apr 2017 11:09:35 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id x5sm1565451pfd.94.2017.04.26.11.09.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 11:09:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 26 Apr 2017 11:09:25 -0700 Message-Id: <20170426180925.8260-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 Subject: [oe] [meta-multimedia][PATCH V2] kodi: Make it build again and upgrade to 17.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- v1 -> v2 - Fix bashishm .../kodi/jsonschemabuilder-native.bb | 6 +++--- meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb b/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb index 094ccff98..fdb769943 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 d6e19617d..8f75bb48d 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"