diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
| commit | 809b0d26bd34fcf13a35025dacf731c0a3d13292 (patch) | |
| tree | 96bf2739244a52d15556e1207bdfaf93d6353bee /pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch | |
| parent | c9d3fc7cad4d243025f9a0e1b3eec9305863c06d (diff) | |
| parent | f7397f21ab841955eb277919f19035cbc336e88b (diff) | |
| download | nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.gz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.bz2 nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.lz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.xz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.zst nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch')
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch deleted file mode 100644 index 7c47db52abaa..000000000000 --- a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake -index d3577a8..9620dc0 100644 ---- i/Source/cmake/OptionsGTK.cmake -+++ w/Source/cmake/OptionsGTK.cmake -@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential - - # Private options specific to the GTK+ port. Changing these options is - # completely unsupported. They are intended for use only by WebKit developers. --WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON) -+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON) - |