summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-07-19 19:12:43 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-07-19 19:12:43 (GMT)
commit717ac057500fb149dcff2d9d8216e75000b7661b (patch)
tree4aaf97ffcd76037fab2e2b8a63e5874171b3cb0f
parentcdba648ec750ef49fffe31fe3de06b28ba39e130 (diff)
downloadbuildroot-717ac057500fb149dcff2d9d8216e75000b7661b.tar.gz
buildroot-717ac057500fb149dcff2d9d8216e75000b7661b.tar.bz2
gst1-plugins-good: unbreak (dyn|multi)udpsink for systems without IPv6 support
Patch from upstream git. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch b/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
new file mode 100644
index 0000000..68a9969
--- /dev/null
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
@@ -0,0 +1,44 @@
+From 118876702467d6063e9c9745b7d093682ad16472 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Fri, 19 Jul 2013 15:24:08 +0200
+Subject: [PATCH] (dyn|multi)udpsink: unbreak on !IPv6 systems after 130268bc
+ (Bind socket before using it)
+
+The g_socket functions only touch the error argument on errors, so clear
+err back to NULL in case g_socket_new (G_SOCKET_FAMILY_IPV6) failed, as
+we check for err != NULL later on to know if g_socket_bind() failed,
+otherwise we errously fail on systems without IPv6 support.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=704553
+---
+ gst/udp/gstdynudpsink.c | 1 +
+ gst/udp/gstmultiudpsink.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
+index 4690bde..fadbd7f 100644
+--- a/gst/udp/gstdynudpsink.c
++++ b/gst/udp/gstdynudpsink.c
+@@ -316,6 +316,7 @@ gst_dynudpsink_start (GstBaseSink * bsink)
+ if ((udpsink->used_socket =
+ g_socket_new (G_SOCKET_FAMILY_IPV6,
+ G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
++ g_clear_error (&err);
+ udpsink->family = G_SOCKET_FAMILY_IPV4;
+ if ((udpsink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
+ G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
+diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
+index 92d1bac..69011c7 100644
+--- a/gst/udp/gstmultiudpsink.c
++++ b/gst/udp/gstmultiudpsink.c
+@@ -868,6 +868,7 @@ gst_multiudpsink_start (GstBaseSink * bsink)
+ if (sink->force_ipv4 || (sink->used_socket =
+ g_socket_new (G_SOCKET_FAMILY_IPV6,
+ G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
++ g_clear_error (&err);
+ if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
+ G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
+ goto no_socket;
+--
+1.7.10.4
+