diff options
| author | Sergey Trofimov <sarg@sarg.org.ru> | 2021-05-30 14:39:15 +0200 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-06-07 16:51:35 -0400 |
| commit | 68dcdf6ea76cddc4f9e53aabe7c1a5724d5508b2 (patch) | |
| tree | 7f80c2852224ace49ccaf3b19b3e0e822a0dfa71 /gnu/packages/qt.scm | |
| parent | 920dd34a3428e44a4bc60d01f870b7ec49b8df43 (diff) | |
| download | guix-patches-68dcdf6ea76cddc4f9e53aabe7c1a5724d5508b2.tar guix-patches-68dcdf6ea76cddc4f9e53aabe7c1a5724d5508b2.tar.gz | |
gnu: qtwebengine: Enable H.264 WebRTC encoding.
* gnu/packages/qt.scm (qtwebengine)[inputs]: Add openh264.
[source]: Remove bundled openh264.
[arguments]: Adjust build scripts accordingly in the 'substitute-source' phase.
Pass '-webengine-proprietary-codecs' in the custom 'configure' phase.
Signed-off-by: Leo Famulari <leo@famulari.name>
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 13 |
1 files changed, 12 insertions, 1 deletions
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. |