From 005d5baa73b0f7c90f04445749f0c3796828fb0c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 22 Feb 2018 09:56:51 +0100 Subject: [PATCH] Update to 1.13.1 Update rpm patch Fix compiler error --- ...d-compilation-errors-with-newer-glib.patch | 41 +++++++++++++++++++ gstreamer1.spec | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 0001-avoid-compilation-errors-with-newer-glib.patch diff --git a/0001-avoid-compilation-errors-with-newer-glib.patch b/0001-avoid-compilation-errors-with-newer-glib.patch new file mode 100644 index 0000000..7f4e9fb --- /dev/null +++ b/0001-avoid-compilation-errors-with-newer-glib.patch @@ -0,0 +1,41 @@ +From b4ff2c8805221bcff6895c543cb019a817ad7104 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 22 Feb 2018 09:52:03 +0100 +Subject: [PATCH] avoid compilation errors with newer glib + +Newest glib does type propagation. Do an explicit cast to the +right type to silence the compiler. +--- + gst/gstchildproxy.c | 2 +- + gst/parse/grammar.y | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gst/gstchildproxy.c b/gst/gstchildproxy.c +index ca5e47ea3..1bf983afa 100644 +--- a/gst/gstchildproxy.c ++++ b/gst/gstchildproxy.c +@@ -209,7 +209,7 @@ gst_child_proxy_lookup (GstChildProxy * object, const gchar * name, + g_return_val_if_fail (GST_IS_CHILD_PROXY (object), FALSE); + g_return_val_if_fail (name != NULL, FALSE); + +- obj = g_object_ref (object); ++ obj = G_OBJECT (g_object_ref (object)); + + current = names = g_strsplit (name, "::", -1); + /* find the owner of the property */ +diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y +index bc4c3c1ed..0b3d04821 100644 +--- a/gst/parse/grammar.y ++++ b/gst/parse/grammar.y +@@ -406,7 +406,7 @@ static void gst_parse_element_set (gchar *value, GstElement *element, graph_t *g + } else { + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (element), value); + if (pspec != NULL) { +- target = g_object_ref (element); ++ target = G_OBJECT(g_object_ref (element)); + GST_CAT_LOG_OBJECT (GST_CAT_PIPELINE, target, "found %s property", value); + } else { + SET_ERROR (graph->error, GST_PARSE_ERROR_NO_SUCH_PROPERTY, \ +-- +2.14.3 + diff --git a/gstreamer1.spec b/gstreamer1.spec index 93521fb..abea751 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -24,6 +24,7 @@ Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{versi %endif ## For GStreamer RPM provides Patch0: gstreamer-inspect-rpm-format.patch +Patch1: 0001-avoid-compilation-errors-with-newer-glib.patch Source1: gstreamer1.prov Source2: gstreamer1.attr @@ -92,6 +93,7 @@ GStreamer streaming media framework. %prep %setup -q -n gstreamer-%{version} %patch0 -p1 -b .rpm-provides +%patch1 -p1 -b .0001 %build %configure \ @@ -216,6 +218,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer * Thu Feb 22 2018 Wim Taymans - 1.13.1-1 - Update to 1.13.1 - Update rpm patch +- Fix compiler error * Wed Feb 07 2018 Fedora Release Engineering - 1.12.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild