aboutsummaryrefslogtreecommitdiff
path: root/package/multimedia
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-08-31 23:32:29 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-08-31 23:32:29 +0200
commit91141b141190b481422b7aea56e8f4d265c44e88 (patch)
tree9348d1efe1cd68f40e350b3b0b26d2ae102272dc /package/multimedia
parent7b48cee91f9acdf46a27440ee2a44acf8fa63040 (diff)
parent90fb70b4c37ad3a3178b51c7941881aa8dfd8fa6 (diff)
downloadbuildroot-91141b141190b481422b7aea56e8f4d265c44e88.tar.gz
buildroot-91141b141190b481422b7aea56e8f4d265c44e88.tar.bz2
Merge branch 'next'
Diffstat (limited to 'package/multimedia')
-rw-r--r--package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk2
-rw-r--r--package/multimedia/gst1-plugins-base/gst1-plugins-base.mk2
-rw-r--r--package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch44
-rw-r--r--package/multimedia/gst1-plugins-good/gst1-plugins-good.mk2
-rw-r--r--package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk2
-rw-r--r--package/multimedia/gstreamer1/gstreamer1.mk2
6 files changed, 5 insertions, 49 deletions
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
index 732cddf993..385522ec07 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GST1_PLUGINS_BAD_VERSION = 1.0.8
+GST1_PLUGINS_BAD_VERSION = 1.0.10
GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
index 1e32867efb..d3aebdad84 100644
--- a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GST1_PLUGINS_BASE_VERSION = 1.0.8
+GST1_PLUGINS_BASE_VERSION = 1.0.10
GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
GST1_PLUGINS_BASE_INSTALL_STAGING = YES
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
deleted file mode 100644
index 68a996940d..0000000000
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
-
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index 614a006ac7..29b89830db 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GST1_PLUGINS_GOOD_VERSION = 1.0.8
+GST1_PLUGINS_GOOD_VERSION = 1.0.10
GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
index c6c927bf9e..e666d61138 100644
--- a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GST1_PLUGINS_UGLY_VERSION = 1.0.8
+GST1_PLUGINS_UGLY_VERSION = 1.0.10
GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
index d3db119d31..79b2b560b0 100644
--- a/package/multimedia/gstreamer1/gstreamer1.mk
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GSTREAMER1_VERSION = 1.0.8
+GSTREAMER1_VERSION = 1.0.10
GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
GSTREAMER1_INSTALL_STAGING = YES