diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-10 23:15:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-07 11:52:38 +0000 |
| commit | 65a00c71a5e3a8cdd74ac1a557208e183e23cf01 (patch) | |
| tree | c3d88f619366acc6f9453548b8dff4fb2792fdee /avmedia | |
| parent | 8b94b2e6d6f4d96b8f4b5da3471a66eed6b78af6 (diff) | |
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 <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/Library_avmediagst.mk | 4 | ||||
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 |
2 files changed, 3 insertions, 3 deletions
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)) diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index f0108e5fcb77..06af36f7915a 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_l10n_targets,avmedia,\ AllLangResTarget_avmedia \ )) -ifeq ($(ENABLE_GSTREAMER),TRUE) +ifeq ($(ENABLE_GSTREAMER_1_0),TRUE) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediagst \ )) |