From patchwork Fri Feb 28 17:05:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Ford X-Patchwork-Id: 1246679 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=none (p=none dis=none) header.from=westpond.com 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 48TbXF63r6z9sQt for ; Sat, 29 Feb 2020 04:05:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 12E9B22640; Fri, 28 Feb 2020 17:05:47 +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 ZQlzT+c1jmaq; Fri, 28 Feb 2020 17:05:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 76ADA20407; Fri, 28 Feb 2020 17:05:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 77EF21BF9BA for ; Fri, 28 Feb 2020 17:05:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6EBD220407 for ; Fri, 28 Feb 2020 17:05:43 +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 d3H0Ojyp5TIX for ; Fri, 28 Feb 2020 17:05:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.westpond.net (static-98-118-57-31.bstnma.fios.verizon.net [98.118.57.31]) by silver.osuosl.org (Postfix) with ESMTP id BB31520369 for ; Fri, 28 Feb 2020 17:05:42 +0000 (UTC) Received: from balthasar.westpond.net (unknown [10.2.0.119]) by mail.westpond.net (Postfix) with ESMTP id D03A61E058; Fri, 28 Feb 2020 12:05:41 -0500 (EST) From: Nathan Ford To: buildroot@buildroot.org Date: Fri, 28 Feb 2020 12:05:39 -0500 Message-Id: <1582909540-10901-1-git-send-email-nford@westpond.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH v3 1/2] package/qt5/qt5webengine: fix ffmpeg/codec/alsa option handling for latest 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" qt5engine also now requires webp mux support or the auto detection will fail. This patch is based on the suggested fix, and fixes, Bug #12416 Signed-off-by: Nathan Ford Reviewed-by: Peter Seiderer --- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/qt5webengine.mk | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 0e776ec..18e4418 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -42,6 +42,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_QT5BASE_DBUS select BR2_PACKAGE_QT5BASE_EGLFS select BR2_PACKAGE_QT5BASE_FONTCONFIG diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 8987259..3824738 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -30,17 +30,35 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss endif +# As of qt 5.10 these options are handled as arguments to qmake instead of defines +# The -- is needed to separate qmake options from config options +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS = -- +endif + +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -webengine-ffmpeg +else QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg +endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -webengine-proprietary-codecs +else QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs endif +endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib else +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -no-webengine-alsa +else QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa endif +endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2