unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sergey Trofimov <sarg@sarg.org.ru>
To: 46337@debbugs.gnu.org
Subject: [bug#46337] Attempt to fix the build
Date: Sun, 30 May 2021 19:54:33 +0200	[thread overview]
Message-ID: <878s3w5cpz.fsf@sarg.org.ru> (raw)
In-Reply-To: <20210206014748.5b281d65@runbox.com>

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]


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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-qtwebengine-with-openh264.patch --]
[-- Type: text/x-patch, Size: 2890 bytes --]

From 553a37f4af401f2a53575c0f2d77cb5030344f40 Mon Sep 17 00:00:00 2001
From: Sergey Trofimov <sarg@sarg.org.ru>
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


  parent reply	other threads:[~2021-05-30 17:55 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-06  1:47 [bug#46337] A patch to enable building proprietary codecs in qtwebengine pkill9
2021-02-06 10:10 ` Tobias Geerinckx-Rice via Guix-patches via
2021-02-06 13:05   ` Tobias Geerinckx-Rice via Guix-patches via
2021-02-07 18:12 ` Leo Famulari
2021-02-08 15:40   ` pkill9
2021-02-08 16:36     ` Leo Famulari
2021-02-08 22:53       ` pkill9
2021-02-08 23:44         ` pkill9
2021-02-09 21:17           ` Leo Famulari
2021-05-30 17:54 ` Sergey Trofimov [this message]
2021-06-07 21:01   ` bug#46337: Attempt to fix the build Leo Famulari
2021-05-30 18:47 ` [bug#46337] Clarification for the previous patch Sergey Trofimov
2021-05-30 20:00 ` [bug#46337] Update Sergey Trofimov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878s3w5cpz.fsf@sarg.org.ru \
    --to=sarg@sarg.org.ru \
    --cc=46337@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).