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 /Repository.mk | |
| 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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 0e7b9b9ad7fa..fd05e114bc8d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -592,7 +592,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_VLC),avmediavlc) \ - $(if $(ENABLE_GSTREAMER),avmediagst) \ + $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \ $(if $(ENABLE_DIRECTX),avmediawin) \ $(if $(ENABLE_GLTF),avmediaogl) \ |