From patchwork Fri Nov 4 15:47:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dagg Stompler X-Patchwork-Id: 691292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t9R7040W9z9vFx for ; Sat, 5 Nov 2016 02:47:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F0A46962FD; Fri, 4 Nov 2016 15:47:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3zrci89LqUPv; Fri, 4 Nov 2016 15:47:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2799A96266; Fri, 4 Nov 2016 15:47:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 286CE1CF32F for ; Fri, 4 Nov 2016 15:47:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 23ED8C3074 for ; Fri, 4 Nov 2016 15:47:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C_uh59uUhiZE for ; Fri, 4 Nov 2016 15:47:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by fraxinus.osuosl.org (Postfix) with ESMTPS id EE914C2E90 for ; Fri, 4 Nov 2016 15:47:32 +0000 (UTC) Received: from NCC-5001-D.Starfleet ([79.181.19.231]) by mail.gmx.com (mrgmx102) with ESMTPA (Nemesis) id 0M6874-1cnNPf3rCs-00yCJb for ; Fri, 04 Nov 2016 16:47:30 +0100 From: Dagg Stompler To: buildroot@buildroot.org Date: Fri, 4 Nov 2016 17:47:27 +0200 Message-Id: <20161104154727.19939-1-daggs@gmx.com> X-Mailer: git-send-email 2.10.2 X-Provags-ID: V03:K0:4B1V0sAb7WwT55qNZmzkvlKtbgkb2T+WK9Uwux+D82n4anK8l8c B2mCdzs03T1/rBWSyP7M3f1qUjUeBEUK2Ou1yAXZnwF4AeCwIAvYiFMxBc8546nqybRjR1d 9to1Hvmx6K+MUKFclgYOoonRUKw0rsijvXQKZvchHQxWUf9m1bHEgvRzuOxiPNXGzA+idPt 6XA1+FEVmjjSIKy+CW4lA== X-UI-Out-Filterresults: notjunk:1; V01:K0:F/stfJry8F4=:umrMVop45HtD21yO5PGHih qp1c8EXADmeUb5JJM5pRh47xaOiNMZ0uzfP/6K+/TBHC5jUZPGuv1Gy4+ywZw102/V4gm4Buk T+WQr5upbdBoyeqjVnkkLFnQtOEUMlyoQs00oacyXBt8HR4FOlHKjRNJNKVygaS72fwn10T+a K+UIlsvAevVUY9CrXUmFkbviKTLW0/EyaZq++JpBQqjieOmnzh9tElahlUoypCTtXNYBsyTxV 0vN3W5QvMuwMR4qnwUQ4QBbeFC8YNlDTcTPHQ0oP1kDgVRtE6sk7moHBvktVNIjU/jc3Ewu3w ECGtzFsvYj9efuGk4OjHcuaDDgRamNuQEcB/xn7wBuo5lwd7zVr5cnyahhv9sAGdqHcfAHYmP utZI0M1ouCQv4CS1SxWJVkPKvGw5dYOhioOFU7TKJHmKIMQRqGyEc1O1J3VLk8aO2Vq7A4STZ tsVEKfRHPTrkJWXTiepDFKRbYACBRNiGaPPlhTa/g66CMtKqCLcZipOZ/FbYPra5pTx+n81RE jM32o4wCPMgf2OwL1rhuHvYtDNutTMZSGEElGtDwyzbZh0Mn1Ca2inaWQSLWPFIM+S6bTV7+q 4RkRoPtvcFt2ibtln/BChuH5+zH1ttLc6u14B69RXCXZKvNHFUGCNFTIcY0p3tcSpp2Qi5dFF 1JaV0co8JdWjqadk/WkBpJ5SWIuwoUtitKFhD1JQFM+3ZU5XMEHqiC9Yj7un0DZngrAl9TQ+M +Mj6/ySihqkncr3csXUzuBJ5rG13qnxXHi6EyGf9opTiEOEfsYgdsGf3yVY= Subject: [Buildroot] [PATCH v5] kodi: allow enablement of libamcodec as codec if selected X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" allow usage of amcodec if kodi is built and libamcodec is selected Signed-off-by: Dagg Stompler --- v4 -> v5: - add description and signed off to the kodi patch. (Thomas Petazzoni). v3 -> v4: - properly define the includes for amcodec when cross compiling. v2 -> v3: - fix change after kodi.mk was changed. v1 -> v2: - fixed mail title and comment .../0012-support_libamcodec_cross_compile.patch | 24 ++++++++++++++++++++++ package/kodi/kodi.mk | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 package/kodi/0012-support_libamcodec_cross_compile.patch diff --git a/package/kodi/0012-support_libamcodec_cross_compile.patch b/package/kodi/0012-support_libamcodec_cross_compile.patch new file mode 100644 index 0000000..97feb8c --- /dev/null +++ b/package/kodi/0012-support_libamcodec_cross_compile.patch @@ -0,0 +1,24 @@ +kodi: fix amcodec includes for cross compilation. + +when building kodi over buildroot with amcodec set, the include paths differs from +native installation. this occurs because the prefix is not set. +so by supplying the LIBAMCODEC_INCLUDE_PATH upon compilation, this issue is resolved. + +Signed-off-by: Dagg Stompler + +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in 2016-11-04 11:46:19.000000000 +0200 ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in 2016-11-04 11:47:13.000000000 +0200 +@@ -26,8 +26,11 @@ endif + ifeq (@USE_LIBAMCODEC@,1) + SRCS += AMLCodec.cpp + SRCS += DVDVideoCodecAmlogic.cpp +-INCLUDES += -I$(prefix)/include/amcodec +-INCLUDES += -I$(prefix)/include/amplayer ++ifeq (${LIBAMCODEC_INCLUDE_PATH},) ++LIBAMCODEC_INCLUDE_PATH=$(prefix) ++endif ++INCLUDES += -I${LIBAMCODEC_INCLUDE_PATH}/include/amcodec ++INCLUDES += -I${LIBAMCODEC_INCLUDE_PATH}/include/amplayer + endif + + ifeq (@USE_ANDROID@,1) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index e0361da..66aa017 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -111,6 +111,10 @@ endif ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y) KODI_DEPENDENCIES += imx-vpuwrap KODI_CONF_OPTS += --enable-codec=imxvpu +else ifeq ($(BR2_PACKAGE_LIBAMCODEC),y) +KODI_DEPENDENCIES += libamcodec +KODI_CONF_OPTS += --enable-codec=amcodec +KODI_MAKE_OPTS += LIBAMCODEC_INCLUDE_PATH=${STAGING_DIR}/usr endif ifeq ($(BR2_PACKAGE_LIBCAP),y)