From patchwork Wed Nov 20 17:39:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preston X-Patchwork-Id: 1198353 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47J9244tkxz9sPJ for ; Thu, 21 Nov 2019 04:40:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EFC3F204D2; Wed, 20 Nov 2019 17:40:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kGXZRWiZSTxe; Wed, 20 Nov 2019 17:40:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CD37020516; Wed, 20 Nov 2019 17:40:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D56741BF3D0 for ; Wed, 20 Nov 2019 17:39:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D25D18867D for ; Wed, 20 Nov 2019 17:39:55 +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 BQOz8b2X17ir for ; Wed, 20 Nov 2019 17:39:55 +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 hemlock.osuosl.org (Postfix) with ESMTPS id 3A1878867E for ; Wed, 20 Nov 2019 17:39:55 +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 1iXTxJ-0008QV-7Z; Wed, 20 Nov 2019 17:39:53 +0000 From: Thomas Preston To: buildroot@buildroot.org Date: Wed, 20 Nov 2019 17:39:28 +0000 Message-Id: <20191120173944.130142-15-thomas.preston@codethink.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191120173944.130142-1-thomas.preston@codethink.co.uk> References: <20191120173944.130142-1-thomas.preston@codethink.co.uk> MIME-Version: 1.0 Subject: [Buildroot] [RFC PATCH v3 14/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" From: Michael Drake 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 f38bf1967c..3344750b5b 100644 --- a/package/libcef/Config.in +++ b/package/libcef/Config.in @@ -53,7 +53,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 @@ -66,6 +66,7 @@ config BR2_PACKAGE_LIBCEF select BR2_PACKAGE_LIBGTK3_X11 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_LIBXML2 select BR2_PACKAGE_LIBXSLT @@ -101,4 +102,11 @@ 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. + endif diff --git a/package/libcef/libcef.mk b/package/libcef/libcef.mk index 784377a71d..7cc4888f44 100644 --- a/package/libcef/libcef.mk +++ b/package/libcef/libcef.mk @@ -39,7 +39,6 @@ LIBCEF_DEPENDENCIES = \ cairo \ compiler-rt \ dbus \ - ffmpeg \ flac \ fontconfig \ freetype \ @@ -109,7 +108,6 @@ LIBCEF_GN_DEFINES = \ # Use Buildroot system libraries instead of Chromium third_party libraries LIBCEF_SYSTEM_LIBS = \ - ffmpeg \ flac \ fontconfig \ freetype \ @@ -118,11 +116,19 @@ LIBCEF_SYSTEM_LIBS = \ libwebp \ libxml \ libxslt \ - openh264 \ yasm LIBCEF_BUILD_TARGETS = libcef.so 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 + # We need to set our own flags in addition to the standard Buildroot ones. # Chromium may set warning flags that the LLVM toolchain in Buildroot # doesn't know about yet, because they use a bleeding edge toolchain.