diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-13 15:40:15 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-13 15:40:19 +0200 |
| commit | a31ae87186f03c1c9034d7299d69f91b9f3f60d5 (patch) | |
| tree | a29eacba7140735360113aceb88cb6ed5d8af2a3 | |
| parent | 426a68259a79e650faa05b36e4ea0510af504782 (diff) | |
| download | ptxdist-a31ae87186f03c1c9034d7299d69f91b9f3f60d5.tar.gz ptxdist-a31ae87186f03c1c9034d7299d69f91b9f3f60d5.tar.xz | |
gst-plugins-base1: fix x11 option handling
The option -Dx11= is not for the plugins but generall x11 support. It must
be enabled for the x11 winsys.
So set it based on PTXCONF_GST_PLUGINS_BASE1_X11 instead.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/gst-plugins-base1.make | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make index 3791c0d41..be12375f9 100644 --- a/rules/gst-plugins-base1.make +++ b/rules/gst-plugins-base1.make @@ -62,7 +62,7 @@ GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOSCALE) += videoscale GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOTESTSRC) += videotestsrc GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VOLUME) += volume GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VORBIS) += vorbis -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X) += x11 xshm xvideo +GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X) += xshm xvideo GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_X) += ximagesink xvimagesink GST_PLUGINS_BASE1_ENABLEC- += $(GST_PLUGINS_BASE1_ENABLE-) @@ -115,7 +115,8 @@ GST_PLUGINS_BASE1_CONF_OPT = \ -Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \ -Diso-codes=disabled \ -Dorc=enabled \ - -Dtools=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_INSTALL_TOOLS)d + -Dtools=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_INSTALL_TOOLS)d \ + -Dx11=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_X11)d ifneq ($(call remove_quotes,$(GST_PLUGINS_BASE1_ENABLEC-y)),) GST_PLUGINS_BASE1_CONF_OPT += $(addsuffix =enabled, $(addprefix -D, $(GST_PLUGINS_BASE1_ENABLEC-y))) |