From 9f3596e8c282b45f56d2705f2fc732f12cff4f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= <izzo.niccolo@gmail.com>
Date: Tue, 18 Aug 2015 11:58:08 +0200
Subject: [PATCH 1/3] Updated pylibpd thread fix patch.

---
 recipes/pylibpd/patches/threadfix.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/pylibpd/patches/threadfix.patch b/recipes/pylibpd/patches/threadfix.patch
index f299d01c7f..6d27bda282 100644
--- a/recipes/pylibpd/patches/threadfix.patch
+++ b/recipes/pylibpd/patches/threadfix.patch
@@ -1,10 +1,10 @@
---- python/setup-threadfix.py	2013-05-29 13:10:16.000000000 -0400
-+++ python/setup.py	2013-06-07 11:53:34.447298388 -0400
-@@ -22,7 +22,6 @@
+--- python/setup.py     2015-08-18 11:15:35.546257493 +0200
++++ python/setup-threadfix.py   2015-08-18 11:32:16.784394028 +0200
+@@ -24,7 +24,6 @@
                    libraries = [
                      'm',
                      'dl',
--                    'pthread',
+-                    'pthread'
                    ],
-                   sources=[
+                   sources = [
                      'pylibpd.i',

From 753b7aa706456f8a879b15da48baf3424f2e70d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= <izzo.niccolo@gmail.com>
Date: Wed, 19 Aug 2015 12:01:09 +0200
Subject: [PATCH 2/3] Updated pylibpd recipe.

---
 recipes/pylibpd/recipe.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/recipes/pylibpd/recipe.sh b/recipes/pylibpd/recipe.sh
index 0e88d19981..4a6d7d5a1d 100644
--- a/recipes/pylibpd/recipe.sh
+++ b/recipes/pylibpd/recipe.sh
@@ -6,8 +6,12 @@ URL_pylibpd=https://github.com/libpd/libpd/archive/$VERSION_pylibpd.zip
 MD5_pylibpd=
 BUILD_pylibpd=$BUILD_PATH/pylibpd/$(get_directory $URL_pylibpd)
 RECIPE_pylibpd=$RECIPES_PATH/pylibpd
+GIT_pylibpd=https://github.com/libpd/libpd
 
 function prebuild_pylibpd() {
+    # Clone recursively libpd repository
+    rm -rf $BUILD_pylibpd
+    git clone --recursive $GIT_pylibpd $BUILD_pylibpd
     # Apply thread removal patch
     cd $BUILD_pylibpd/python
     if [ -f .patched ]; then
@@ -15,6 +19,13 @@ function prebuild_pylibpd() {
     fi
     try patch -p1 < $RECIPE_pylibpd/patches/threadfix.patch
     touch .patched
+    # Apply Makefile patch
+    cd $BUILD_pylibpd
+    if [ -f .patched ]; then
+        return
+    fi
+    try patch < $RECIPE_pylibpd/patches/makefilefix.patch
+    touch .patched
 }
 
 function shouldbuild_pylibpd() {
@@ -24,8 +35,10 @@ function shouldbuild_pylibpd() {
 }
 
 function build_pylibpd() {
-    cd $BUILD_pylibpd/python
     push_arm
+    cd $BUILD_pylibpd
+    try make
+    cd python 
     try $HOSTPYTHON setup.py build
     try $HOSTPYTHON setup.py install -O2
     try $HOSTPYTHON setup.py clean

From 29f5fcbe982d4abb9ebf743d85e5451ed1d5bb28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= <izzo.niccolo@gmail.com>
Date: Wed, 19 Aug 2015 12:03:46 +0200
Subject: [PATCH 3/3] Added libpd Makefile patch.

---
 recipes/pylibpd/patches/makefilefix.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/pylibpd/patches/makefilefix.patch

diff --git a/recipes/pylibpd/patches/makefilefix.patch b/recipes/pylibpd/patches/makefilefix.patch
new file mode 100644
index 0000000000..64ad4420dc
--- /dev/null
+++ b/recipes/pylibpd/patches/makefilefix.patch
@@ -0,0 +1,11 @@
+--- Makefile	2015-08-19 10:42:49.160410592 +0200
++++ Makefile-threadfix	2015-08-19 11:08:49.458350964 +0200
+@@ -150,7 +150,7 @@
+ libpd: $(LIBPD)
+ 
+ $(LIBPD): ${PD_FILES:.c=.o} ${UTIL_FILES:.c=.o} ${EXTRA_FILES:.c=.o}
+-	$(CC) -o $(LIBPD) $^ $(LDFLAGS) -lm -lpthread 
++	$(CC) -o $(LIBPD) $^ $(LDFLAGS) -lm
+ 
+ javalib: $(JNIH_FILE) $(PDJAVA_JAR)
+