diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 16:55:12 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-19 14:54:59 +0000 |
| commit | 05eccaef907c9fca4f874b8ffa608d4815fbeebd (patch) | |
| tree | 940b846007d1f5d1e683d9e9cc6c9e23939dd7b7 /avmedia/Library_avmediagst.mk | |
| parent | 4b0390a9cb45f56a7c6d04eff795de8b63b13b2e (diff) | |
gtk3+wayland: implement video playback under gtk3 + wayland
split the gtk2 and gtk3 gtkobjects
(cherry picked from commit 31fa4545985acc1594107e087cedc2d99b3d0f0b)
Change-Id: I32084232c44a12e9641010b51e75710abc827695
rename X11WindowProvider to a NativeWindowHandle provider
sort of thing and genericize it
(cherry picked from commit e35e762d564da18b0b508112f3e4d78fd26ba99c)
Change-Id: I27e1e47f2b371e5269db079cfc1262d056105f80
implement wayland handle passing for gstreamer
Change-Id: I3b0effe35ad7b37ff7ab3de2a3b78b6312779139
(cherry picked from commit c0d4f3ad3307c7a0d0fddd8c413ef0cc91d382ae)
gtk3+wayland: play video via gtksink gstreamer element
(cherry picked from commit 8543fbc72fafc0d71a8760752ca2ef5b7119cb5c)
Change-Id: Ib371fa06eda73962cbe94739e69a68b46c26e4bf
Reviewed-on: https://gerrit.libreoffice.org/22462
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'avmedia/Library_avmediagst.mk')
| -rw-r--r-- | avmedia/Library_avmediagst.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index a20a32b6ac46..35a56ac4751b 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -16,7 +16,21 @@ $(eval $(call gb_Library_set_include,avmediagst,\ -I$(SRCDIR)/avmedia/source/inc \ $(GSTREAMER_1_0_CFLAGS) \ )) -$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_1_0_LIBS))) + +$(eval $(call gb_Library_add_libs,avmediagst,\ + $(GSTREAMER_1_0_LIBS) \ +)) + +ifneq ($(ENABLE_GTK3),) +$(eval $(call gb_Library_add_cxxflags,avmediagst,\ + $$(GTK3_CFLAGS) \ + -DENABLE_GTKSINK \ +)) + +$(eval $(call gb_Library_add_libs,avmediagst,\ + $(GTK3_LIBS) \ +)) +endif $(eval $(call gb_Library_use_external,avmediagst,boost_headers)) |