diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-10 21:40:33 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2019-06-25 20:53:50 +0200 |
| commit | 819671b662c441087f6f3a363cae27491e5344d9 (patch) | |
| tree | 6b195d90c9218b5c0cd41c0b002f0bc8e1bcb36e /config_host | |
| parent | tdf#125219 qt5: Try qwidget5videosink on Wayland (diff) | |
| download | core-819671b662c441087f6f3a363cae27491e5344d9.tar.gz core-819671b662c441087f6f3a363cae27491e5344d9.zip | |
Don't link avmediagst with gtk3 and qt5
While the VCL plugins are dynamically loaded and therefore just
load their depending toolkit libraries, the GStreamer avmedia
backend now links against Qt and GTK+. The GStreamer API itself
is toolkit agnostic and the toolkit setup just uses a single
GStreamer symbol to create the specific video sink.
So the toolkit binding can simply be moved into the VCL plugin.
At the point of the GStreamer toolkit setup call the GStreamer
library is loaded by avmediagst, so the dlsym lookup should
never fail.
I also dropped the special GtkWidget handling. Using g_object_get
will increase the refcount of the widget. A g_object_unref after
adding it to the container seems to destroy it correctly.
Reviewed-on: https://gerrit.libreoffice.org/73849
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit a6201725d760cbce832d4de029b418bb7334df6a)
Change-Id: I693947e441bceb4b09bc38920e308e39142d0a35
Reviewed-on: https://gerrit.libreoffice.org/74652
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'config_host')
| -rw-r--r-- | config_host/config_vclplug.h.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in index 5245a1ea7fb2..418beaf23cd0 100644 --- a/config_host/config_vclplug.h.in +++ b/config_host/config_vclplug.h.in @@ -14,5 +14,7 @@ Settings about which desktops have support enabled. #define ENABLE_QT5 0 #define QT5_USING_X11 0 +#define QT5_HAVE_GOBJECT 0 +#define ENABLE_GSTREAMER_1_0 0 #endif |