From patchwork Sun May 30 17:54:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 29684 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0653627BC78; Sun, 30 May 2021 18:55:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1DCC027BC81 for ; Sun, 30 May 2021 18:55:10 +0100 (BST) Received: from localhost ([::1]:53654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnPeX-0004iA-7W for patchwork@mira.cbaines.net; Sun, 30 May 2021 13:55:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnPeQ-0004i2-65 for guix-patches@gnu.org; Sun, 30 May 2021 13:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnPeP-0000u3-V1 for guix-patches@gnu.org; Sun, 30 May 2021 13:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnPeP-00014b-U1 for guix-patches@gnu.org; Sun, 30 May 2021 13:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46337] Attempt to fix the build References: <20210206014748.5b281d65@runbox.com> In-Reply-To: <20210206014748.5b281d65@runbox.com> Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 May 2021 17:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 46337@debbugs.gnu.org Received: via spool by 46337-submit@debbugs.gnu.org id=B46337.16223972484019 (code B ref 46337); Sun, 30 May 2021 17:55:01 +0000 Received: (at 46337) by debbugs.gnu.org; 30 May 2021 17:54:08 +0000 Received: from localhost ([127.0.0.1]:60307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnPdY-00012l-0K for submit@debbugs.gnu.org; Sun, 30 May 2021 13:54:08 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:35576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnPdS-00012B-Hm for 46337@debbugs.gnu.org; Sun, 30 May 2021 13:54:06 -0400 Received: by mail-wr1-f50.google.com with SMTP id m18so8507967wrv.2 for <46337@debbugs.gnu.org>; Sun, 30 May 2021 10:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; h=user-agent:from:to:subject:message-id:date:mime-version; bh=1+V7JBBePeUk1T07NFac8U5XBQB+3DFBpL/V1MxLViM=; b=ZDB0Z7e2A9+TBO9tJfvnuwD3zT9ttdKaTiEJXB/BFt2LQ/7c4BMFNvM87S7SyiE9mw G4sqZIgbX/0ObZ0ykAREwGyysloGxd/LntK8PT7RPqF35NaKywHFsCd6aBIn3SOO0+sU oAoJCPEFUhNVGMHfNoCuW7VaVxCHJBbmWvsT8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:message-id:date :mime-version; bh=1+V7JBBePeUk1T07NFac8U5XBQB+3DFBpL/V1MxLViM=; b=SztNPsd51YKS8ULKNKtnf8j9LHzjaqJmSOUH8DrJy2Uomoso0AKtOHHw3c99YGPI3Q rdvsYwijDIzb5qNRq1vH3K3KzbDsdx2rxkaqPrYIVevNI9UHNEU34ouQ1opiotPEAjcn awVi6sRhIqkX5fA8p/WNpFWKtNASvTLrdjVPgxqq3/HdYRWwAd6fWfkIxrJp4uPN/22y tuzfhLirWd8QBHE+uyESudgEMdK5hfAJorzzcXPzV+U1EDLi6gzdjLxyi1sRlSdllglE dL0o1JVZhbbDdxFVLJ5g869Du+I2iIn1cHpONO6B7xC65O6MmwvH2DChMK7lETTq5FdE q/+w== X-Gm-Message-State: AOAM5311Y7O2CDgaHioLhOucG4vn6VnCB3NhtA8yY5RQDx5jVJh06iXD B3uT+JTDaPU3pX1zhRvkNtZoD2cL6Fc+7Q== X-Google-Smtp-Source: ABdhPJwkwygfVE5vdazpySFauf+XcGFzihwkNUaQmHwF1T7d/shq/j8uNQgA1ET5uUeXu5lyiHGVqQ== X-Received: by 2002:a5d:4fce:: with SMTP id h14mr6677586wrw.57.1622397236132; Sun, 30 May 2021 10:53:56 -0700 (PDT) Received: from localhost ([92.206.237.187]) by smtp.gmail.com with ESMTPSA id r7sm12175856wmq.18.2021.05.30.10.53.54 for <46337@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 May 2021 10:53:55 -0700 (PDT) User-agent: mu4e 1.4.15; emacs 28.0.50 From: Sergey Trofimov Message-ID: <878s3w5cpz.fsf@sarg.org.ru> Date: Sun, 30 May 2021 19:54:33 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hey there, it seems that qtwebengine build script just lacks the `-system-openh264` flag. In attempt to fix that I just slap the needed GN arg to the end of `src/buildtools/config/linux.pri` I've checked that the configure phase succeeds, but the full build takes too long on my machine. Please find attached the proposed patch. From 553a37f4af401f2a53575c0f2d77cb5030344f40 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 30 May 2021 14:39:15 +0200 Subject: [PATCH] qtwebengine with openh264 --- gnu/packages/qt.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 55855fb68a..6bb1281570 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1547,6 +1547,7 @@ using the Enchant spell-checking library.") "third_party/modp_b64" "third_party/nasm" "third_party/one_euro_filter" + "third_party/openh264/src/codec/api/svc" "third_party/opus" "third_party/ots" "third_party/pdfium" @@ -1724,6 +1725,7 @@ using the Enchant spell-checking library.") ;; libxml2 configure summary still states "Checking for compatible ;; system libxml2... no" ("libxml2" ,libxml2) + ("openh264" ,openh264) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) ("libxslt" ,libxslt) @@ -1747,6 +1749,10 @@ using the Enchant spell-checking library.") ("xcb-util" ,xcb-util))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) + ((#:modules modules '()) + `((guix build gnu-build-system) + (guix build utils) + (ice-9 textual-ports))) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'substitute-source @@ -1754,6 +1760,10 @@ using the Enchant spell-checking library.") (let ((out (assoc-ref outputs "out")) (nss (assoc-ref inputs "nss")) (udev (assoc-ref inputs "udev"))) + (with-atomic-file-replacement "src/buildtools/config/linux.pri" + (lambda (in out) + (display (get-string-all in) out) + (display "\ngn_args += use_system_openh264=true\n" out))) ;; Qtwebengine is not installed into the same prefix as ;; qtbase. Some qtbase QTLibraryInfo constants will not ;; work. Replace with the full path to the qtwebengine @@ -1789,7 +1799,8 @@ using the Enchant spell-checking library.") "--webengine-printing-and-pdf=no" "--webengine-ffmpeg=system" "--webengine-icu=system" - "--webengine-pepper-plugins=no"))))) + "--webengine-pepper-plugins=no" + "-webengine-proprietary-codecs"))))) ;; Tests are disabled due to "Could not find QtWebEngineProcess error" ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH ;; before running tests. -- 2.31.1