[Android] Remove patch about libxml. Upstream has a better one

[Jean-Baptiste Kempf]

android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 29 19:01:06 2012 +0200| [360a22a84aed321b8967f4725f921e88a4b4922f] | committer: Jean-Baptiste Kempf

Remove patch about libxml. Upstream has a better one

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=360a22a84aed321b8967f4725f921e88a4b4922f
---

 compile.sh                                         |    2 +-
 ...bxml-pthread_join-is-not-necessarily-in-l.patch |   54 --------------------
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/compile.sh b/compile.sh
index e8f1622..d98389a 100755
--- a/compile.sh
+++ b/compile.sh
@@ -40,7 +40,7 @@ fi
 export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=e354bf04a542
+TESTED_HASH=f8aa395031
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/patches/0005-Contribs-libxml-pthread_join-is-not-necessarily-in-l.patch b/patches/0005-Contribs-libxml-pthread_join-is-not-necessarily-in-l.patch
deleted file mode 100644
index 8fa3833..0000000
--- a/patches/0005-Contribs-libxml-pthread_join-is-not-necessarily-in-l.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0abdb29d31b0cba5c5173b4fc2b019da2dec965e Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Mon, 28 May 2012 18:08:05 +0200
-Subject: [PATCH 5/5] Contribs: libxml, pthread_join is not necessarily in
- -lpthread
-
----
- contrib/src/libxml2/pthread.patch |   13 +++++++++++++
- contrib/src/libxml2/rules.mak     |    5 ++++-
- 2 files changed, 17 insertions(+), 1 deletion(-)
- create mode 100644 contrib/src/libxml2/pthread.patch
-
-diff --git a/contrib/src/libxml2/pthread.patch b/contrib/src/libxml2/pthread.patch
-new file mode 100644
-index 0000000..6f1f3e2
---- /dev/null
-+++ b/contrib/src/libxml2/pthread.patch
-@@ -0,0 +1,13 @@
-+--- libxml2/configure.in	2010-11-04 18:01:19.000000000 +0100
-++++ libxml2.new/configure.in	2012-05-28 18:04:08.674242358 +0200
-+@@ -914,8 +914,8 @@
-+     dnl Use pthread by default
-+     if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
-+         AC_CHECK_HEADER(pthread.h,
-+-	    AC_CHECK_LIB(pthread, pthread_join,[
-+-	       THREAD_LIBS="-lpthread"
-++	    AC_CHECK_FUNC( pthread_join,[
-++	       THREAD_LIBS=""
-+ 	       AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
-+ 	       AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
-+ 	       WITH_THREADS="1"]))
-diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
-index cf81b62..eee251a 100644
---- a/contrib/src/libxml2/rules.mak
-+++ b/contrib/src/libxml2/rules.mak
-@@ -13,11 +13,14 @@ $(TARBALLS)/libxml2-$(LIBXML2_VERSION).tar.gz:
- 
- .sum-libxml2: libxml2-$(LIBXML2_VERSION).tar.gz
- 
--XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps --without-python
-+XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps --without-python --with-threads
- 
- libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
- 	$(UNPACK)
- 	$(APPLY) $(SRC)/libxml2/no-tests.patch
-+ifdef HAVE_ANDROID
-+	$(APPLY) $(SRC)/libxml2/pthread.patch
-+endif
- 	$(MOVE)
- 
- .libxml2: libxml2
--- 
-1.7.10.2
-