From patchwork Thu Oct 17 15:29:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Drake X-Patchwork-Id: 1178735 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46vCn61rL4z9sRR for ; Fri, 18 Oct 2019 02:30:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3DD8587DA2; Thu, 17 Oct 2019 15:30:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rAEzhh2Bm5HM; Thu, 17 Oct 2019 15:30:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 687EF87DBA; Thu, 17 Oct 2019 15:30:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 413DE1BF568 for ; Thu, 17 Oct 2019 15:29:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3E7ED87D8B for ; Thu, 17 Oct 2019 15:29:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qgz5EAtdlKXe for ; Thu, 17 Oct 2019 15:29:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from imap1.codethink.co.uk (imap1.codethink.co.uk [176.9.8.82]) by whitealder.osuosl.org (Postfix) with ESMTPS id 81BC587C0A for ; Thu, 17 Oct 2019 15:29:43 +0000 (UTC) Received: from [167.98.27.226] (helo=ts007-build.ts007.codethink.co.uk) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1iL7if-0002Zy-MD; Thu, 17 Oct 2019 16:29:41 +0100 From: Michael Drake To: buildroot@buildroot.org Date: Thu, 17 Oct 2019 16:29:16 +0100 Message-Id: <20191017152929.49153-18-michael.drake@codethink.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017152929.49153-1-michael.drake@codethink.co.uk> References: <20191017152929.49153-1-michael.drake@codethink.co.uk> MIME-Version: 1.0 Subject: [Buildroot] [RFC PATCH v2 17/30] package/libcef: Add proprietary codecs build option. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon duSaint , Michael Drake , Patrick Glaser , Thomas Preston , Enis Lavery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This uses the Chromium bundled ffmpeg. Cc: Patrick Glaser Cc: Jon duSaint Cc: Enis Lavery Signed-off-by: Michael Drake Signed-off-by: Thomas Preston --- package/libcef/Config.in | 10 +++++++++- package/libcef/libcef.mk | 12 +++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/package/libcef/Config.in b/package/libcef/Config.in index 05d577ecb6..46d412f228 100644 --- a/package/libcef/Config.in +++ b/package/libcef/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_LIBCEF select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_COMPILER_RT select BR2_PACKAGE_DBUS - select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG if !BR2_PACKAGE_LIBCEF_PROPRIETARY_CODECS select BR2_PACKAGE_FLAC select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_HARFBUZZ @@ -39,6 +39,7 @@ config BR2_PACKAGE_LIBCEF select BR2_PACKAGE_LIBGTKGLEXT select BR2_PACKAGE_LIBKRB5 select BR2_PACKAGE_LIBNSS + select BR2_PACKAGE_LIBOPENH264 if BR2_PACKAGE_LIBCEF_PROPRIETARY_CODECS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_PCIUTILS select BR2_PACKAGE_PANGO @@ -74,6 +75,13 @@ config BR2_PACKAGE_LIBCEF_VAAPI help Enables VA-API-based hardware acceleration. +config BR2_PACKAGE_LIBCEF_PROPRIETARY_CODECS + bool "Enable proprietary codecs in libcef" + help + Enable proprietary codecs in libcef. This uses + the ffmpeg bundled in Chromium, rather than the + ffmpeg buildroot package. + config BR2_PACKAGE_LIBCEF_TARGET_ARCH string default "arm" if BR2_arm diff --git a/package/libcef/libcef.mk b/package/libcef/libcef.mk index 9fa87cbb89..e7a4c2b1a3 100644 --- a/package/libcef/libcef.mk +++ b/package/libcef/libcef.mk @@ -42,7 +42,6 @@ LIBCEF_DEPENDENCIES = \ cairo \ compiler-rt \ dbus \ - ffmpeg \ flac \ fontconfig \ freetype \ @@ -105,7 +104,6 @@ LIBCEF_GN_DEFINES = \ # Use Buildroot system libraries instead of Chromium third_party libraries LIBCEF_SYSTEM_LIBS = \ - ffmpeg \ flac \ fontconfig \ freetype \ @@ -115,11 +113,19 @@ LIBCEF_SYSTEM_LIBS = \ libwebp \ libxml \ libxslt \ - openh264 \ yasm LIBCEF_BUILD_TARGETS = cef chrome_sandbox +ifeq ($(BR2_PACKAGE_LIBCEF_PROPRIETARY_CODECS),y) +LIBCEF_GN_DEFINES += \ + ffmpeg_branding=\"Chrome\" \ + proprietary_codecs=true +else +LIBCEF_DEPENDENCIES += ffmpeg +LIBCEF_SYSTEM_LIBS += ffmpeg +endif + # Use the HOSTLD rather than target linker, which warns about host include dirs LIBCEF_HOST_LDFLAGS = $(HOST_LDFLAGS) -fuse-ld=$(HOSTLD)