gstreamer1: version bump 1.16.1 -> 1.16.2

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 34 insertions, 28 deletions

diff --git a/patches/gstreamer-1.16.1/0001-meson-allow-enabling-gir-when-cross-compiling.patch b/patches/gstreamer-1.16.1/0001-meson-allow-enabling-gir-when-cross-compiling.patch
deleted file mode 100644
index f7ebcce2f..000000000
--- a/patches/gstreamer-1.16.1/0001-meson-allow-enabling-gir-when-cross-compiling.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 22 Apr 2019 17:32:51 +0200
-Subject: [PATCH] meson: allow enabling gir when cross-compiling
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index e738c557f0d9..e1b8d9342dc3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -451,7 +451,7 @@ rt_lib = cc.find_library('rt', required : false)
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
- 
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
- 
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
diff --git a/patches/gstreamer-1.16.1/series b/patches/gstreamer-1.16.1/series
deleted file mode 100644
index 305ed6fe0..000000000
--- a/patches/gstreamer-1.16.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-meson-allow-enabling-gir-when-cross-compiling.patch
-# b5e8cd63bf616136df653d409ae9e0f9  - git-ptx-patches magic
diff --git a/patches/gstreamer-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/patches/gstreamer-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
new file mode 100644
index 000000000..75739039a
--- /dev/null
+++ b/patches/gstreamer-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
@@ -0,0 +1,28 @@
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
+Date: Thu, 17 Oct 2019 12:13:35 +0100
+Subject: [PATCH] meson: build gir even when cross-compiling if introspection
+ was enabled explicitly
+
+This can be made to work in certain circumstances when
+cross-compiling, so default to not building g-i stuff
+when cross-compiling, but allow it if introspection was
+enabled explicitly via -Dintrospection=enabled.
+
+Fixes #454 and #381.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 04425352876f..2aa96504114e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -453,7 +453,7 @@ rt_lib = cc.find_library('rt', required : false)
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+ gnome = import('gnome')
+ 
+-build_gir = gir.found() and not meson.is_cross_build()
++build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
+ 
+ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
+     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
diff --git a/patches/gstreamer-1.16.2/series b/patches/gstreamer-1.16.2/series
new file mode 100644
index 000000000..c1929a0c8
--- /dev/null
+++ b/patches/gstreamer-1.16.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
+# c50daa57270463847718e2263e04d262  - git-ptx-patches magic
diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make
index 2cd843989..f595b20bd 100644
--- a/rules/gstreamer1.make
+++ b/rules/gstreamer1.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GSTREAMER1) += gstreamer1
 #
 # Paths and names
 #
-GSTREAMER1_VERSION	:= 1.16.1
-GSTREAMER1_MD5		:= c505fb818b36988daaa846e9e63eabe8
+GSTREAMER1_VERSION	:= 1.16.2
+GSTREAMER1_MD5		:= 0e661ed5bdf1d8996e430228d022628e
 GSTREAMER1		:= gstreamer-$(GSTREAMER1_VERSION)
 GSTREAMER1_SUFFIX	:= tar.xz
 GSTREAMER1_URL		:= http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER1).$(GSTREAMER1_SUFFIX)