mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 11:11:08 +00:00
gst-libs: use GST_*_1_0 environment variables everywhere
The _1_0 suffixed environment variables override the non-suffixed ones, so if we're in an environment that sets the _1_0 suffixed ones, such as jhbuild, we need to set those to make sure ours actually always get used.
This commit is contained in:
parent
2f817af71c
commit
664adc6e19
10 changed files with 10 additions and 10 deletions
|
@ -40,7 +40,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstapp_@GST_API_VERSION@_la
|
||||||
|
|
||||||
GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSION@.la
|
GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstApp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstApp \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -85,7 +85,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
|
||||||
|
|
||||||
GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VERSION@.la
|
GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstAudio \
|
$(INTROSPECTION_SCANNER) -v --namespace GstAudio \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--warn-all \
|
--warn-all \
|
||||||
|
|
|
@ -53,7 +53,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_API_VERSION@_la_SOURCES))
|
||||||
|
|
||||||
GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSION@.la
|
GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstFft \
|
$(INTROSPECTION_SCANNER) -v --namespace GstFft \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -71,7 +71,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_API_VERSION
|
||||||
|
|
||||||
GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_API_VERSION@.la
|
GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstPbutils \
|
$(INTROSPECTION_SCANNER) -v --namespace GstPbutils \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -28,7 +28,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_API_VERSION@_la_SOURCES)
|
||||||
|
|
||||||
GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERSION@.la
|
GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstRiff \
|
$(INTROSPECTION_SCANNER) -v --namespace GstRiff \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -32,7 +32,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtp_@GST_API_VERSION@_la_SOURCES))
|
||||||
|
|
||||||
GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSION@.la
|
GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstRtp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstRtp \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -58,7 +58,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtsp_@GST_API_VERSION@_l
|
||||||
|
|
||||||
GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERSION@.la
|
GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstRtsp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstRtsp \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -20,7 +20,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstsdp_@GST_API_VERSION@_la_SOURCES))
|
||||||
|
|
||||||
GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSION@.la
|
GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstSdp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstSdp \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -31,7 +31,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgsttag_@GST_API_VERSION@_la_SOURCES))
|
||||||
|
|
||||||
GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSION@.la
|
GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstTag \
|
$(INTROSPECTION_SCANNER) -v --namespace GstTag \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -83,7 +83,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
|
||||||
|
|
||||||
GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VERSION@.la
|
GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VERSION@.la
|
||||||
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
|
||||||
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
|
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstVideo \
|
$(INTROSPECTION_SCANNER) -v --namespace GstVideo \
|
||||||
--nsversion=@GST_API_VERSION@ \
|
--nsversion=@GST_API_VERSION@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
Loading…
Reference in a new issue