9 files changed, 37 insertions, 3 deletions
diff --git a/tools/android/depends/libshairport/011_fix_ipv4_fallback.patch b/tools/android/depends/libshairport/011_fix_ipv4_fallback.patch
new file mode 100644
index 0000000000..2c813f224e
--- /dev/null
+++ b/tools/android/depends/libshairport/011_fix_ipv4_fallback.patch
@@ -0,0 +1,10 @@
+--- src/socketlib.c	2012-07-14 22:49:30.000000000 +0200
++++ src/socketlib.c	2012-10-08 21:55:51.000000000 +0200
+@@ -118,6 +118,7 @@
+ 
+   int tEnable = 1;
+   setsockopt(tSock, SOL_SOCKET, SO_REUSEADDR, &tEnable, sizeof (tEnable));
++  server_addr->ai_addr->sa_family = server_addr->ai_family; // ensure that server_addr has same famliy than the socket
+   if (bind(tSock, server_addr->ai_addr, server_addr->ai_addrlen) < 0)
+   {
+     close(tSock);
diff --git a/tools/android/depends/libshairport/Makefile b/tools/android/depends/libshairport/Makefile
index f730d6fbf7..c8af95b748 100644
--- a/tools/android/depends/libshairport/Makefile
+++ b/tools/android/depends/libshairport/Makefile
@@ -34,6 +34,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); patch -p0 < ../008-add-missing-libs.patch
 	cd $(PLATFORM); patch -p0 < ../009_fix_ipv6.patch
 	cd $(PLATFORM); patch -p0 < ../010_handle_metadata.patch
+	cd $(PLATFORM); patch -p0 < ../011_fix_ipv4_fallback.patch
 	cd $(PLATFORM); patch -p0 < ../android.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)
diff --git a/tools/android/depends/taglib/Makefile b/tools/android/depends/taglib/Makefile
index 354d127358..6508df166b 100644
--- a/tools/android/depends/taglib/Makefile
+++ b/tools/android/depends/taglib/Makefile
@@ -24,6 +24,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	  -DCMAKE_LIBRARY_PATH=$(PREFIX)/lib                 \
 	  -DCMAKE_INSTALL_NAME_DIR=$(PREFIX)/lib             \
 	  -DCMAKE_INSTALL_PREFIX=$(PREFIX)                   \
+	  -DCMAKE_RANLIB=$(RANLIB)                           \
 	  -DCMAKE_FIND_ROOT_PATH="$(TOOLCHAIN)/sysroot/usr;$(PREFIX)" ..
 
 $(LIBDYLIB): $(PLATFORM)
diff --git a/tools/darwin/depends/libcec/Makefile b/tools/darwin/depends/libcec/Makefile
index 4cf486e0ed..3f7bd0505e 100644
--- a/tools/darwin/depends/libcec/Makefile
+++ b/tools/darwin/depends/libcec/Makefile
@@ -3,7 +3,7 @@ include ../config.site.mk
 
 # lib name, version
 LIBNAME=libcec
-VERSION=1.8.1
+VERSION=2.0.0
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
diff --git a/tools/darwin/depends/libshairport/011_fix_ipv4_fallback.patch b/tools/darwin/depends/libshairport/011_fix_ipv4_fallback.patch
new file mode 100644
index 0000000000..2c813f224e
--- /dev/null
+++ b/tools/darwin/depends/libshairport/011_fix_ipv4_fallback.patch
@@ -0,0 +1,10 @@
+--- src/socketlib.c	2012-07-14 22:49:30.000000000 +0200
++++ src/socketlib.c	2012-10-08 21:55:51.000000000 +0200
+@@ -118,6 +118,7 @@
+ 
+   int tEnable = 1;
+   setsockopt(tSock, SOL_SOCKET, SO_REUSEADDR, &tEnable, sizeof (tEnable));
++  server_addr->ai_addr->sa_family = server_addr->ai_family; // ensure that server_addr has same famliy than the socket
+   if (bind(tSock, server_addr->ai_addr, server_addr->ai_addrlen) < 0)
+   {
+     close(tSock);
diff --git a/tools/darwin/depends/libshairport/Makefile b/tools/darwin/depends/libshairport/Makefile
index 4d9fef14fa..7c833161d2 100644
--- a/tools/darwin/depends/libshairport/Makefile
+++ b/tools/darwin/depends/libshairport/Makefile
@@ -32,6 +32,7 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(SOURCE); patch -p0 < ../008-add-missing-libs.patch
 	cd $(SOURCE); patch -p0 < ../009_fix_ipv6.patch
 	cd $(SOURCE); patch -p0 < ../010_handle_metadata.patch
+	cd $(SOURCE); patch -p0 < ../011_fix_ipv4_fallback.patch
 	cd $(SOURCE); autoreconf -vif
 	cd $(SOURCE); $(CONFIGURE)
 
diff --git a/tools/darwin/depends/xbmc-pvr-addons/Makefile b/tools/darwin/depends/xbmc-pvr-addons/Makefile
index d24fbc69ce..04640a88ce 100644
--- a/tools/darwin/depends/xbmc-pvr-addons/Makefile
+++ b/tools/darwin/depends/xbmc-pvr-addons/Makefile
@@ -5,7 +5,7 @@ XBMC_ADDONSDIR=../../../../addons
 
 # lib name, version
 LIBNAME=xbmc-pvr-addons
-VERSION=4904df3552a5762811b51d63ff9087756544d4cc
+VERSION=46eb5b50bd145e1bae637213a5929384ac0fc13c
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
diff --git a/tools/rbp/depends/libshairport/011_fix_ipv4_fallback.patch b/tools/rbp/depends/libshairport/011_fix_ipv4_fallback.patch
new file mode 100644
index 0000000000..2c813f224e
--- /dev/null
+++ b/tools/rbp/depends/libshairport/011_fix_ipv4_fallback.patch
@@ -0,0 +1,10 @@
+--- src/socketlib.c	2012-07-14 22:49:30.000000000 +0200
++++ src/socketlib.c	2012-10-08 21:55:51.000000000 +0200
+@@ -118,6 +118,7 @@
+ 
+   int tEnable = 1;
+   setsockopt(tSock, SOL_SOCKET, SO_REUSEADDR, &tEnable, sizeof (tEnable));
++  server_addr->ai_addr->sa_family = server_addr->ai_family; // ensure that server_addr has same famliy than the socket
+   if (bind(tSock, server_addr->ai_addr, server_addr->ai_addrlen) < 0)
+   {
+     close(tSock);
diff --git a/tools/rbp/depends/libshairport/Makefile b/tools/rbp/depends/libshairport/Makefile
index 7993c0dafb..59c93d59b0 100644
--- a/tools/rbp/depends/libshairport/Makefile
+++ b/tools/rbp/depends/libshairport/Makefile
@@ -30,8 +30,9 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(SOURCE); patch -p0 < ../006_no_printf.patch
 	cd $(SOURCE); patch -p0 < ../007_fix_syslog_defines.patch
 	cd $(SOURCE); patch -p0 < ../008-add-missing-libs.patch
-	#cd $(SOURCE); patch -p0 < ../009_fix_ipv6.patch
+	cd $(SOURCE); patch -p0 < ../009_fix_ipv6.patch
 	cd $(SOURCE); patch -p0 < ../010_handle_metadata.patch
+	cd $(SOURCE); patch -p0 < ../011_fix_ipv4_fallback.patch
 	cd $(SOURCE); autoreconf -vif
 	cd $(SOURCE); $(CONFIGURE)