aboutsummaryrefslogtreecommitdiff
path: root/tools/android
diff options
context:
space:
mode:
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/depends/libshairport/011_fix_ipv4_fallback.patch10
-rw-r--r--tools/android/depends/libshairport/Makefile1
2 files changed, 11 insertions, 0 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)