diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 10:07:35 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 11:47:09 -0500 |
| commit | 276f40fdc349d2ad62582b23ea55e061b689cfc0 (patch) | |
| tree | 8052d91aee78cf0d4317b41ec52134fde48fa5fb /gnu/packages/webkit.scm | |
| parent | b2f6b6f6b9df6bcc24794238e7e97357470af95d (diff) | |
| parent | 6ba510d76d6847065be725e958718002f3b13c7a (diff) | |
| download | guix-patches-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar guix-patches-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar.gz | |
Merge branch 'version-1.4.0'
With resolved conflicts in:
gnu/packages/gnome.scm
gnu/packages/openstack.scm
gnu/packages/python-xyz.scm
Diffstat (limited to 'gnu/packages/webkit.scm')
| -rw-r--r-- | gnu/packages/webkit.scm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 8e9aa2b1b5..cfe24f41b0 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -251,15 +251,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") "-DUSE_SYSTEMD=OFF" (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" - (assoc-ref %outputs "out") "/lib") - ;; XXX Adding GStreamer GL support would apparently - ;; require adding gst-plugins-bad to the inputs, - ;; which might entail a security risk as a result of - ;; the plugins of dubious code quality that are - ;; included. More investigation is needed. For - ;; now, we explicitly disable it to prevent an error - ;; at configuration time. - "-DUSE_GSTREAMER_GL=OFF") + (assoc-ref %outputs "out") "/lib")) #:make-flags ;; Never build with unsupported -j1: https://issues.guix.gnu.org/47964#5 (list "-j" (number->string (max 2 (parallel-job-count)))) @@ -350,7 +342,10 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (description "WebKitGTK+ is a full-featured port of the WebKit rendering engine, suitable for projects requiring any kind of web integration, from hybrid -HTML/CSS applications to full-fledged web browsers.") +HTML/CSS applications to full-fledged web browsers. WebKitGTK+ video playing +capabilities can be extended through the use of GStreamer plugins (not +propagated by default) such as @code{gst-plugins-good} and +@code{gst-plugins-bad}.") ;; WebKit's JavaScriptCore and WebCore components are available under ;; the GNU LGPL, while the rest is available under a BSD-style license. (license (list license:lgpl2.0 |