From patchwork Wed Sep 16 21:11:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1365726 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JA7e7RJz; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BsJLv1g3QzB46y for ; Thu, 17 Sep 2020 10:51:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 51D8E8751D; Wed, 16 Sep 2020 21:11:42 +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 5tyE41HuYIWr; Wed, 16 Sep 2020 21:11:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D42DF874D3; Wed, 16 Sep 2020 21:11:39 +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 5E2561BF592 for ; Wed, 16 Sep 2020 21:11:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 58A4C8772D for ; Wed, 16 Sep 2020 21:11:38 +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 c+gKq3YHv36F for ; Wed, 16 Sep 2020 21:11:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 522B08768B for ; Wed, 16 Sep 2020 21:11:37 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id c18so8286250wrm.9 for ; Wed, 16 Sep 2020 14:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CpJcjYdhndF+33tjt7pOgR4i7jXn5nR9smz9UriElL4=; b=JA7e7RJzDJdNmFuFsotcOHXfE2OXdpRYmNwNdKfmFErHRcm3dAu8wpaBGulR7P8nwA cC301Z98pYNwpdO2duhzOVOOl8ll2rgfuDeWS8J8djmTq96M+cwPI+ntSPp51K7rRWCy CZ6qpoAgL6dth9WrhjA6Hb8gel6lxwYeyfRSK/NexJ7jfZ+k2B8/ph07AobYC032osKe +40yojTkaiMbuZBVn/fn2qmcLoYbqb84vGELT9i7bcykmugVsVIePt0jAfSgEjy+A0T9 +SETV78t7e2PBmTq2UnEWBRaxwAWogzH/rH52xI0cFQzDACmRuAT/ZwpSaDL8sMn9zBv 7Vaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CpJcjYdhndF+33tjt7pOgR4i7jXn5nR9smz9UriElL4=; b=hGvi7r3stA01Zfhm5Gqlpg5e2jeOxx+MwAVNSRkxqC5T39qurk7yeB/A4DNRBL6nHS 00kgeet4mmb/o8JXEdlaL/u5Ya6rP9Eb43sab48JqcIxbKo9gIY8Ol66t26ILK2n6M9+ LFzgldgS72phYjTTQIP6M2hBsYuRMdpV8koNnVTMhElQg9MwYdRGHxylboW5Ihi9qwqo gpHSy7Byz2xgdX7pXTypNFO0yQ0iKEuNoN5IRuzvqUGdkNLR6HiQ/b5mUSrYhlKhwxhq aS6P+0TgBjFEr7axhn/yNRuoApspRAA+vxyVk28+NPm3G3oMYDiWdAIOEK+e7MAAYjoC 6GjQ== X-Gm-Message-State: AOAM532/xYllEz2sfwd5uBm00tw8uTA648pgl964NPexrzxTdl3/Zjcm gra2w5+dEzIvqcvcNR3v+B4T9uwDLpY= X-Google-Smtp-Source: ABdhPJypwjT7iT5m/SkK7M/LJwOsbvS6K0gCkA8unuA6ZjCsC79u2Iu4rG/ye6a4X5N8xlpWbQcCFQ== X-Received: by 2002:adf:fa52:: with SMTP id y18mr28991682wrr.264.1600290695538; Wed, 16 Sep 2020 14:11:35 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:f5fb:84e2:a9b2:f334]) by smtp.gmail.com with ESMTPSA id 10sm7453871wmi.37.2020.09.16.14.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 14:11:34 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 16 Sep 2020 23:11:32 +0200 Message-Id: <73c8adc83c7e856136f5eacd8aab44631b0a64cc.1600290685.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3 v4] 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: , Cc: Peter Seiderer , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Nathan Ford As of qt 5.10, options are handled as arguments to qmake instead of defines: qt5webengine-5.12.2$ vi dist/changes-5.9.0 Important Changes ----------------- - Configure options are now handled by the global configure script. This means options previously controlled by WEBENGINE_CONFIG options should now use configure flags. For instance the configure command-line option -proprietary-codecs replaces WEBENGINE_CONFIG+=use_proprietary_codecs. qt5webengine-5.12.2$ vi dist/changes-5.10.0 Important Changes ----------------- * WebEngine Features are now configured as Qt features and WEBENGINE_CONFIG has been removed. Fixes: #12416 (which was an inspiration for this patch) Signed-off-by: Nathan Ford [yann.morin.1998@free.fr: - refresh on top of master, as we no longer have the version choice - extend commit log - mocve the new dependency to its own commit ] Signed-off-by: Yann E. MORIN Cc: Peter Seiderer --- package/qt5/qt5webengine/qt5webengine.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 9101f35937..5df6942977 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -29,16 +29,16 @@ endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS = -webengine-ffmpeg ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa endif # QtWebengine's build system uses python, but only supports python2. We work