From 65a00c71a5e3a8cdd74ac1a557208e183e23cf01 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 10 Oct 2014 23:15:28 +0200 Subject: Clarify configure GStreamer handling Currrently --disables-gstreamer disables GStreamer API 1.0 support and --enable-gstreamer-0-10 enables GStreamer API 0.10 support. To build with GStreamer API 0.10 you need to --disable-gstreamer and --enable-gstreamer-0-10, which doesn't seem logical. But actually it's possible to build both avmedia GStreamer backends, so this changes: * --disable-gstreamer to --disable-gstreamer-1-0 * configure variables to include the GStreamer API version "1_0" * adapts the configure help text Change-Id: Icffd8cfb9d80b3021e290675e7c9644c2a31fce8 Reviewed-on: https://gerrit.libreoffice.org/11912 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- avmedia/Library_avmediagst.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'avmedia/Library_avmediagst.mk') diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 42a6a49fe761..9eae2190b79d 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -14,9 +14,9 @@ $(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/a $(eval $(call gb_Library_set_include,avmediagst,\ $$(INCLUDE) \ -I$(SRCDIR)/avmedia/source/inc \ - $(GSTREAMER_CFLAGS) \ + $(GSTREAMER_1_0_CFLAGS) \ )) -$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS))) +$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_1_0_LIBS))) $(eval $(call gb_Library_use_external,avmediagst,boost_headers)) -- cgit