diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-23 22:28:13 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-25 17:37:41 +0200 |
commit | e867292430b771a0af2208646ccfc9d02baa463f (patch) | |
tree | 48638e109702362ca955ba31f783e2a7d8c1c459 | |
parent | 3be2a3ebcc60d11c2b3a97424e89bdcbc983f3cb (diff) | |
download | ptxdist-e867292430b771a0af2208646ccfc9d02baa463f.tar.gz ptxdist-e867292430b771a0af2208646ccfc9d02baa463f.tar.xz |
gst-rtsp-server1: version bump 1.14.4 -> 1.16.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/gst-rtsp-server-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch | 22 | ||||
-rw-r--r-- | patches/gst-rtsp-server-1.16.0/series | 4 | ||||
-rw-r--r-- | rules/gst-rtsp-server1.in | 2 | ||||
-rw-r--r-- | rules/gst-rtsp-server1.make | 16 |
4 files changed, 38 insertions, 6 deletions
diff --git a/patches/gst-rtsp-server-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch b/patches/gst-rtsp-server-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch new file mode 100644 index 000000000..9640a061a --- /dev/null +++ b/patches/gst-rtsp-server-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch @@ -0,0 +1,22 @@ +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.0/series b/patches/gst-rtsp-server-1.16.0/series new file mode 100644 index 000000000..305ed6fe0 --- /dev/null +++ b/patches/gst-rtsp-server-1.16.0/series @@ -0,0 +1,4 @@ +# 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/rules/gst-rtsp-server1.in b/rules/gst-rtsp-server1.in index 5e2eaf71b..727ce4722 100644 --- a/rules/gst-rtsp-server1.in +++ b/rules/gst-rtsp-server1.in @@ -2,8 +2,10 @@ config GST_RTSP_SERVER1 tristate + select HOST_MESON select GSTREAMER1 select GST_PLUGINS_BASE1 + select GST_PLUGINS_BAD1 prompt "gst-rtsp-server" help RTSP server plugin for GStreamer diff --git a/rules/gst-rtsp-server1.make b/rules/gst-rtsp-server1.make index 2a8230922..edd0cce8d 100644 --- a/rules/gst-rtsp-server1.make +++ b/rules/gst-rtsp-server1.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_RTSP_SERVER1) += gst-rtsp-server1 # # Paths and names # -GST_RTSP_SERVER1_VERSION := 1.14.4 -GST_RTSP_SERVER1_MD5 := ab0fb5c829266a500e14b46b7bdf06bf +GST_RTSP_SERVER1_VERSION := 1.16.0 +GST_RTSP_SERVER1_MD5 := adc4460239ec2eccf58ad9752ce53bfd 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) @@ -30,12 +30,16 @@ GST_RTSP_SERVER1_LICENSE := LGPL-2.0-or-later # ---------------------------------------------------------------------------- # -# autoconf +# meson # -GST_RTSP_SERVER1_CONF_TOOL := autoconf +GST_RTSP_SERVER1_CONF_TOOL = meson GST_RTSP_SERVER1_CONF_OPT = \ - $(CROSS_AUTOCONF_USR) \ - $(GSTREAMER1_BASIC_CONF_OPT) \ + $(CROSS_MESON_USR) \ + $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer RTSP Server Library) \ + -Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \ + -Drtspclientsink=auto + +foo = \ \ --disable-valgrind \ --disable-gcov \ |