gstreamer1: version bump 1.14.4 -> 1.16.0

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

4 files changed, 66 insertions, 60 deletions

diff --git a/patches/gstreamer-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch b/patches/gstreamer-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch
new file mode 100644
index 000000000..f7ebcce2f
--- /dev/null
+++ b/patches/gstreamer-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch
@@ -0,0 +1,22 @@
+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.0/series b/patches/gstreamer-1.16.0/series
new file mode 100644
index 000000000..305ed6fe0
--- /dev/null
+++ b/patches/gstreamer-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/gstreamer1.in b/rules/gstreamer1.in
index d4d2949af..1efa55087 100644
--- a/rules/gstreamer1.in
+++ b/rules/gstreamer1.in
@@ -3,12 +3,13 @@
 menuconfig GSTREAMER1
 	tristate
 	prompt "gstreamer                     "
+	select HOST_FLEX
+	select HOST_GLIB
+	select HOST_MESON
 	select LIBC_M
-	select LIBUNWIND
 	select GLIB
-	select HOST_GLIB
-	select HOST_FLEX
 	select GOBJECT_INTROSPECTION	if GSTREAMER1_INTROSPECTION
+	select LIBUNWIND
 	help
 	  GStreamer is a streaming media framework, based on graphs of
 	  filters which operate on media data. Applications using this
diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make
index c11ece086..7a0cc5bb8 100644
--- a/rules/gstreamer1.make
+++ b/rules/gstreamer1.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GSTREAMER1) += gstreamer1
 #
 # Paths and names
 #
-GSTREAMER1_VERSION	:= 1.14.4
-GSTREAMER1_MD5		:= f67fbbc42bd85a0701df119f52fb52bd
+GSTREAMER1_VERSION	:= 1.16.0
+GSTREAMER1_MD5		:= 862b7e4263d946bc2ef31b3c582e5587
 GSTREAMER1		:= gstreamer-$(GSTREAMER1_VERSION)
 GSTREAMER1_SUFFIX	:= tar.xz
 GSTREAMER1_URL		:= http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER1).$(GSTREAMER1_SUFFIX)
@@ -31,66 +31,45 @@ GSTREAMER1_LICENSE	:= LGPL-2.1-or-later
 # ----------------------------------------------------------------------------
 
 #
-# autoconf
+# meson
 #
-GSTREAMER1_BASIC_CONF_OPT = \
-	\
-	--disable-fatal-warnings \
-	--disable-extra-check \
-	\
-	--disable-debug \
-	\
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-gobject-cast-checks \
-	--disable-glib-asserts
-
 GSTREAMER1_GENERIC_CONF_OPT = \
-	$(GSTREAMER1_BASIC_CONF_OPT) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	\
-	--disable-nls \
-	--disable-rpath \
-	\
-	--disable-profiling \
-	--disable-valgrind \
-	--disable-gcov \
-	--disable-examples \
-	\
-	--enable-Bsymbolic \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--with-package-origin="PTXdist"
-
-GSTREAMER1_CONF_TOOL	:= autoconf
+	-Dexamples=disabled \
+	-Dglib-asserts=disabled \
+	-Dglib-checks=disabled \
+	-Dgobject-cast-checks=disabled \
+	-Dnls=disabled \
+	-Dpackage-name="$(1) source release" \
+	-Dpackage-origin=PTXdist \
+	-Dtests=disabled
+
+GSTREAMER1_CONF_TOOL	:= meson
 GSTREAMER1_CONF_OPT	:= \
-	$(CROSS_AUTOCONF_USR) \
-	$(GSTREAMER1_GENERIC_CONF_OPT) \
-	--$(call ptx/endis,PTXCONF_GSTREAMER1_DEBUG)-gst-debug \
-	--$(call ptx/endis,PTXCONF_GSTREAMER1_DEBUG)-gst-tracer-hooks \
-	--enable-parse \
-	--enable-option-parsing \
-	--enable-registry \
-	--enable-plugin \
-	\
-	--disable-tests \
-	--disable-failing-tests \
-	--disable-benchmarks \
-	--$(call ptx/endis,PTXCONF_GSTREAMER1_INSTALL_TOOLS)-tools \
-	--disable-poisoning \
-	--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
-	\
-	--$(call ptx/endis, PTXCONF_GSTREAMER1_CHECK)-check \
-	--with-ptp-helper-setuid-user=nobody \
-	--with-ptp-helper-setuid-group=nogroup \
-	--with-ptp-helper-permissions=setuid-root \
-	--with-unwind \
-	--without-dw
+	$(CROSS_MESON_USR) \
+	$(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer) \
+	-Dbash-completion=disabled \
+	-Dbenchmarks=disabled \
+	-Dcheck=$(call ptx/endis,PTXCONF_GSTREAMER1_CHECK)d \
+	-Ddbghelp=disabled \
+	-Dextra-checks=false \
+	-Dgst_debug=$(call ptx/truefalse,PTXCONF_GSTREAMER1_DEBUG) \
+	-Dgst_parse=true \
+	-Dgtk_doc=disabled \
+	-Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \
+	-Dlibdw=disabled \
+	-Dlibunwind=enabled \
+	-Dmemory-alignment=malloc \
+	-Doption-parsing=true \
+	-Dpoisoning=false \
+	-Dptp-helper-permissions=setuid-root \
+	-Dptp-helper-setuid-group=nogroup \
+	-Dptp-helper-setuid-user=nobody \
+	-Dregistry=true \
+	-Dtools=$(call ptx/endis,PTXCONF_GSTREAMER1_INSTALL_TOOLS)d \
+	-Dtracer_hooks=$(call ptx/truefalse,PTXCONF_GSTREAMER1_DEBUG)
 
 ifdef PTXCONF_GSTREAMER1_INTROSPECTION
-GSTREAMER1_LDFLAGS := -Wl,-rpath-link,$(GSTREAMER1_DIR)/libs/gst/base/.libs
+#GSTREAMER1_LDFLAGS := -Wl,-rpath-link,$(GSTREAMER1_DIR)/libs/gst/base/.libs
 endif
 
 # ----------------------------------------------------------------------------