[gnome-sdk-images/gnome-3-20] Update gstreamer to 1.8.2 and the gi build fixes from fd.o
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sdk-images/gnome-3-20] Update gstreamer to 1.8.2 and the gi build fixes from fd.o
- Date: Fri, 12 Aug 2016 20:59:34 +0000 (UTC)
commit da7ef6b08ccf53dabc4f7cacce74b406417d7448
Author: Alexander Larsson <alexl redhat com>
Date: Fri Aug 12 22:58:39 2016 +0200
Update gstreamer to 1.8.2 and the gi build fixes from fd.o
gst-plugins-bad-gi-build-fix.patch | 60 +++++++++++++++
gst-plugins-base-gi-build-fix.patch | 141 +++++++++++++++++++++++++++++++++++
gstreamer-gi-build-fix.patch | 65 ++++++++++++++++
org.gnome.Sdk.json.in | 40 +++++++----
4 files changed, 292 insertions(+), 14 deletions(-)
---
diff --git a/gst-plugins-bad-gi-build-fix.patch b/gst-plugins-bad-gi-build-fix.patch
new file mode 100644
index 0000000..4905369
--- /dev/null
+++ b/gst-plugins-bad-gi-build-fix.patch
@@ -0,0 +1,60 @@
+commit db90f4686f8058e0764ed0a7dc2fee93165385cc
+Author: Tim-Philipp Müller <tim centricular com>
+Date: Tue May 24 00:55:11 2016 +0100
+
+ g-i: pass compiler env to g-ir-scanner
+
+ It's what introspection.mak does as well. Should
+ fix spurious build failures on gnome-continuous.
+
+diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
+index f1cb9e1..3f04a51 100644
+--- a/gst-libs/gst/gl/Makefile.am
++++ b/gst-libs/gst/gl/Makefile.am
+@@ -152,6 +152,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstgl_@GST_API_VERSION@_la_SOURCES))
+ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstGL \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
+index 8368f41..1f8ea30 100644
+--- a/gst-libs/gst/insertbin/Makefile.am
++++ b/gst-libs/gst/insertbin/Makefile.am
+@@ -31,6 +31,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
+ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstInsertBin \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
+index cd8b8ad..aeea32e 100644
+--- a/gst-libs/gst/mpegts/Makefile.am
++++ b/gst-libs/gst/mpegts/Makefile.am
+@@ -65,6 +65,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
+ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstMpegts \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=GstMpegts \
+diff --git a/gst-libs/gst/player/Makefile.am b/gst-libs/gst/player/Makefile.am
+index 00e6343..f893375 100644
+--- a/gst-libs/gst/player/Makefile.am
++++ b/gst-libs/gst/player/Makefile.am
+@@ -57,7 +57,9 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstplayer_HEADERS))
+ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_API_VERSION@_la_SOURCES))
+
+ GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_VERSION@.la
+- $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
++ $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no
GI_SCANNER_DISABLE_CACHE=yes \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
++ PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstPlayer \
+ --nsversion=@GST_API_VERSION@ \
+ --warn-all \
diff --git a/gst-plugins-base-gi-build-fix.patch b/gst-plugins-base-gi-build-fix.patch
new file mode 100644
index 0000000..219baab
--- /dev/null
+++ b/gst-plugins-base-gi-build-fix.patch
@@ -0,0 +1,141 @@
+commit d52a74f32ea7b1a58b4d811b0e02b63496d8f6cd
+Author: Tim-Philipp Müller <tim centricular com>
+Date: Tue May 24 00:44:21 2016 +0100
+
+ g-i: pass compiler env to g-ir-scanner
+
+ It's what introspection.mak does as well. Should
+ fix spurious build failures on gnome-continuous.
+
+diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
+index 5c11b8a..bccfdb3 100644
+--- a/gst-libs/gst/allocators/Makefile.am
++++ b/gst-libs/gst/allocators/Makefile.am
+@@ -27,6 +27,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/allocators/%',$(libgstallocators_@GS
+ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstAllocators \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
+index ec413a4..0033371 100644
+--- a/gst-libs/gst/app/Makefile.am
++++ b/gst-libs/gst/app/Makefile.am
+@@ -28,6 +28,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_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)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstApp \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
+index e71bfac..202cb66 100644
+--- a/gst-libs/gst/audio/Makefile.am
++++ b/gst-libs/gst/audio/Makefile.am
+@@ -105,6 +105,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
+ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstAudio \
+ --nsversion=@GST_API_VERSION@ \
+ --warn-all \
+diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
+index 3e24aaf..0d70422 100644
+--- a/gst-libs/gst/fft/Makefile.am
++++ b/gst-libs/gst/fft/Makefile.am
+@@ -54,6 +54,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_API_VERSION@_la_SOURCES))
+ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstFft \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
+index 88c79e7..c5a25ca 100644
+--- a/gst-libs/gst/pbutils/Makefile.am
++++ b/gst-libs/gst/pbutils/Makefile.am
+@@ -76,6 +76,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_API_VERSION
+ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstPbutils \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
+index 83d83cb..5fa26e5 100644
+--- a/gst-libs/gst/riff/Makefile.am
++++ b/gst-libs/gst/riff/Makefile.am
+@@ -34,6 +34,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
+ #GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERSION@.la
+ # $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ # GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++# CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ # $(INTROSPECTION_SCANNER) -v --namespace GstRiff \
+ # --nsversion=@GST_API_VERSION@ \
+ # --strip-prefix=Gst \
+diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
+index fed44a8..04b1f90 100644
+--- a/gst-libs/gst/rtp/Makefile.am
++++ b/gst-libs/gst/rtp/Makefile.am
+@@ -52,6 +52,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_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)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstRtp \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
+index 1df45ea..88f0853 100644
+--- a/gst-libs/gst/rtsp/Makefile.am
++++ b/gst-libs/gst/rtsp/Makefile.am
+@@ -58,6 +58,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtsp_@GST_API_VERSION@_l
+ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstRtsp \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
+index 2d35703..6fd9693 100644
+--- a/gst-libs/gst/sdp/Makefile.am
++++ b/gst-libs/gst/sdp/Makefile.am
+@@ -22,6 +22,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstsdp_@GST_API_VERSION@_la_SOURCES))
+ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstSdp \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
+index a26bbde..c0c2d6b 100644
+--- a/gst-libs/gst/tag/Makefile.am
++++ b/gst-libs/gst/tag/Makefile.am
+@@ -32,6 +32,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgsttag_@GST_API_VERSION@_la_SOURCES))
+ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstTag \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
+index 91b72ff..93bcbd4 100644
+--- a/gst-libs/gst/video/Makefile.am
++++ b/gst-libs/gst/video/Makefile.am
+@@ -103,6 +103,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
+ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstVideo \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
diff --git a/gstreamer-gi-build-fix.patch b/gstreamer-gi-build-fix.patch
new file mode 100644
index 0000000..826de10
--- /dev/null
+++ b/gstreamer-gi-build-fix.patch
@@ -0,0 +1,65 @@
+diff --git a/gst/Makefile.am b/gst/Makefile.am
+index 224544c..7b113e9 100644
+--- a/gst/Makefile.am
++++ b/gst/Makefile.am
+@@ -287,9 +287,11 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_API_VERSION@_la_SOURCE
+ gir_sources+=$(patsubst %,$(builddir)/%, $(built_source_make))
+
+ Gst-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_API_VERSION@.la
+- $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no
GI_SCANNER_DISABLE_CACHE=yes\
++ $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no
GI_SCANNER_DISABLE_CACHE=yes \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace Gst \
+ --nsversion=@GST_API_VERSION@ \
++ --verbose \
+ --warn-all \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
+index fd26842..21fe561 100644
+--- a/libs/gst/base/Makefile.am
++++ b/libs/gst/base/Makefile.am
+@@ -66,6 +66,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@_la_SOURCES)
+ GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstBase \
+ --nsversion=@GST_API_VERSION@ \
+ --warn-all \
+diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am
+index 62fcb78..fd0d494 100644
+--- a/libs/gst/check/Makefile.am
++++ b/libs/gst/check/Makefile.am
+@@ -222,6 +222,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@_la_SOURCES
+ GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstCheck \
+ --nsversion=@GST_API_VERSION@ \
+ --identifier-prefix=Gst \
+diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am
+index ffc4afd..5016ea6 100644
+--- a/libs/gst/controller/Makefile.am
++++ b/libs/gst/controller/Makefile.am
+@@ -38,6 +38,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_la_SO
+ GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstController \
+ --nsversion=@GST_API_VERSION@ \
+ --warn-all \
+diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am
+index 1fc581f..5d1b6a8 100644
+--- a/libs/gst/net/Makefile.am
++++ b/libs/gst/net/Makefile.am
+@@ -57,6 +57,7 @@ gir_cincludes=--c-include="gst/net/net.h"
+ GstNet-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_API_VERSION@.la
+ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
++ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
+ $(INTROSPECTION_SCANNER) -v --namespace GstNet \
+ --identifier-prefix=Gst \
+ --symbol-prefix=gst \
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index a748b6d..8968497 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -346,8 +346,12 @@
"sources": [
{
"type": "archive",
- "url": "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.8.0.tar.xz",
- "sha256": "947a314a212b5d94985d89b43440dbe66b696e12bbdf9a2f78967b98d74abedc"
+ "url": "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.8.2.tar.xz",
+ "sha256": "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341"
+ },
+ {
+ "type": "patch",
+ "path": "gstreamer-gi-build-fix.patch"
}
]
},
@@ -357,8 +361,12 @@
"sources": [
{
"type": "archive",
- "url":
"https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.8.0.tar.xz",
- "sha256": "abc0acc1d15b4b9c97c65cd9689bd6400081853b9980ea428d3c8572dd791522"
+ "url":
"https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.8.2.tar.xz",
+ "sha256": "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d"
+ },
+ {
+ "type": "patch",
+ "path": "gst-plugins-base-gi-build-fix.patch"
}
]
},
@@ -440,11 +448,11 @@
"--disable-jack",
"--with-default-visualizer=autoaudiosink" ],
"sources": [
- {
- "type": "archive",
- "url":
"http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.8.0.tar.xz",
- "sha256": "c20c134d47dbc238d921707a3b66da709c2b4dd89f9d267cec13d1ddf16e9f4d"
- }
+ {
+ "type": "archive",
+ "url":
"http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.8.2.tar.xz",
+ "sha256": "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944"
+ }
]
},
{
@@ -465,11 +473,15 @@
},
"config-opts": ["--disable-gtk-doc", "--enable-experimental", "--enable-orc" ],
"sources": [
- {
- "type": "archive",
- "url":
"http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.8.0.tar.xz",
- "sha256": "116376dd1085082422e0b21b0ecd3d1cb345c469c58e32463167d4675f4ca90e"
- }
+ {
+ "type": "archive",
+ "url":
"http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.8.2.tar.xz",
+ "sha256": "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"
+ },
+ {
+ "type": "patch",
+ "path": "gst-plugins-bad-gi-build-fix.patch"
+ }
]
},
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]