gst-rtsp-server1: 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/gst-rtsp-server-1.16.1/0001-meson-allow-enabling-gir-when-cross-compiling.patch b/patches/gst-rtsp-server-1.16.1/0001-meson-allow-enabling-gir-when-cross-compiling.patch
deleted file mode 100644
index 9640a061a..000000000
--- a/patches/gst-rtsp-server-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: Tue, 23 Apr 2019 22:19: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 2802b1d85329..ccbec60ab990 100644
---- a/meson.build
-+++ b/meson.build
-@@ -173,7 +173,7 @@ endif
- 
- 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_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
-     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
diff --git a/patches/gst-rtsp-server-1.16.1/series b/patches/gst-rtsp-server-1.16.1/series
deleted file mode 100644
index 305ed6fe0..000000000
--- a/patches/gst-rtsp-server-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/gst-rtsp-server-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/patches/gst-rtsp-server-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
new file mode 100644
index 000000000..376eb67eb
--- /dev/null
+++ b/patches/gst-rtsp-server-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: Fri, 18 Oct 2019 00:42:12 +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.
+
+See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 36cda01318b6..7adc95077135 100644
+--- a/meson.build
++++ b/meson.build
+@@ -173,7 +173,7 @@ endif
+ 
+ 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_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
+     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
diff --git a/patches/gst-rtsp-server-1.16.2/series b/patches/gst-rtsp-server-1.16.2/series
new file mode 100644
index 000000000..c1929a0c8
--- /dev/null
+++ b/patches/gst-rtsp-server-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/gst-rtsp-server1.make b/rules/gst-rtsp-server1.make
index 459759e2f..bb57abd5d 100644
--- a/rules/gst-rtsp-server1.make
+++ b/rules/gst-rtsp-server1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_RTSP_SERVER1) += gst-rtsp-server1
 #
 # Paths and names
 #
-GST_RTSP_SERVER1_VERSION	:= 1.16.1
-GST_RTSP_SERVER1_MD5		:= 380d6a42e856c32fcefa508ad57129e0
+GST_RTSP_SERVER1_VERSION	:= 1.16.2
+GST_RTSP_SERVER1_MD5		:= 8a998725820c771ba45be6e18bfdf73a
 GST_RTSP_SERVER1		:= gst-rtsp-server-$(GST_RTSP_SERVER1_VERSION)
 GST_RTSP_SERVER1_SUFFIX		:= tar.xz
 GST_RTSP_SERVER1_URL		:= http://gstreamer.freedesktop.org/src/gst-rtsp/$(GST_RTSP_SERVER1).$(GST_RTSP_SERVER1_SUFFIX)