diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-10 21:40:33 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-13 23:45:09 +0200 |
| commit | a6201725d760cbce832d4de029b418bb7334df6a (patch) | |
| tree | 5fcb76c6179ba382b078f0a127427dc429c18109 /config_host.mk.in | |
| parent | 2d36e43d3d3ac69f4cacd532308cfc8c81982864 (diff) | |
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.
Change-Id: I693947e441bceb4b09bc38920e308e39142d0a35
Reviewed-on: https://gerrit.libreoffice.org/73849
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 3711857b5bd4..8eb33deb4645 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -466,9 +466,9 @@ export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@ export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@ export QT5_CFLAGS=$(gb_SPACE)@QT5_CFLAGS@ export QT5_LIBS=$(gb_SPACE)@QT5_LIBS@ -export QT5_GLIB_CFLAGS=$(gb_SPACE)@QT5_GLIB_CFLAGS@ -export QT5_GLIB_LIBS=$(gb_SPACE)@QT5_GLIB_LIBS@ -export QT5_HAVE_GLIB=@QT5_HAVE_GLIB@ +export QT5_GOBJECT_CFLAGS=$(gb_SPACE)@QT5_GOBJECT_CFLAGS@ +export QT5_GOBJECT_LIBS=$(gb_SPACE)@QT5_GOBJECT_LIBS@ +export QT5_HAVE_GOBJECT=@QT5_HAVE_GOBJECT@ export QXP_CFLAGS=$(gb_SPACE)@QXP_CFLAGS@ export QXP_LIBS=$(gb_SPACE)@QXP_LIBS@ export RANLIB=@RANLIB@ |