[vlc-commits] Contribs: update libxml2 to 2.8.0

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug  8 00:22:00 2012 +0200| [386dd0e069e36212506db0d65664c81b5ae80326] | committer: Jean-Baptiste Kempf

Contribs: update libxml2 to 2.8.0
(cherry picked from commit 7f3a4223264adf5412783c239e8244daa2404e91)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=386dd0e069e36212506db0d65664c81b5ae80326
---

 contrib/src/libxml2/SHA512SUMS    |    2 +-
 contrib/src/libxml2/pthread.patch |   42 ++++++++++++++++++-------------------
 contrib/src/libxml2/rules.mak     |    2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/contrib/src/libxml2/SHA512SUMS b/contrib/src/libxml2/SHA512SUMS
index 74b2b3b..1ef20c8 100644
--- a/contrib/src/libxml2/SHA512SUMS
+++ b/contrib/src/libxml2/SHA512SUMS
@@ -1 +1 @@
-cb5d88f95feffde6a805a7583306864ad9cc909e958a1044afc6d5864ec480da545343f25c10bba99be59c2344e98d4cd2dcc8a152407a0ce581a51ce214d6bc  libxml2-2.7.8.tar.gz
+e36ca96e5ba18f767346f1310c43d3c8c9a35c53252de18ad63ebce7f1f8df7ae40dd0719b2c6d78f5a64e61be154eec63a36ae738d29e93a9139c524a289ad4  libxml2-2.8.0.tar.gz
diff --git a/contrib/src/libxml2/pthread.patch b/contrib/src/libxml2/pthread.patch
index 1984010..69797e4 100644
--- a/contrib/src/libxml2/pthread.patch
+++ b/contrib/src/libxml2/pthread.patch
@@ -1,22 +1,22 @@
---- libxml2/configure.in.orig	2012-05-29 12:43:39.843757694 -0400
-+++ libxml2/configure.in	2012-05-29 12:47:39.347755607 -0400
-@@ -913,12 +913,17 @@
-     echo Enabling multithreaded support
-     dnl Use pthread by default
-     if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
-+        LIBS_saved="$LIBS"
-         AC_CHECK_HEADER(pthread.h,
--	    AC_CHECK_LIB(pthread, pthread_join,[
--	       THREAD_LIBS="-lpthread"
-+        AC_SEARCH_LIBS(pthread_join, pthread,[
-+	       THREAD_LIBS="$ac_cv_search_pthread_join"
-+           if test "$THREAD_LIBS" = "none required"; then
-+             THREAD_LIBS=""
-+           fi
- 	       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"]))
-+        LIBS="$LIBS_saved"
+--- libxml2-2.8.0/configure.in.orig	2012-05-23 10:33:55.000000000 +0200
++++ libxml2-2.8.0/configure.in	2012-08-08 00:20:20.544880094 +0200
+@@ -958,12 +958,17 @@
+     dnl Use pthread by default in other cases
+     if test -z "$THREADS_W32"; then
+         if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
++            LIBS_saved="$LIBS"
+             AC_CHECK_HEADER(pthread.h,
+-                AC_CHECK_LIB(pthread, pthread_join,[
+-                THREAD_LIBS="-lpthread"
++                AC_SEARCH_LIBS(pthread_join, pthread,[
++                THREAD_LIBS="$ac_cv_search_pthread_join"
++                if test "$THREAD_LIBS" = "none required"; then
++                  THREAD_LIBS=""
++                fi
+                 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"]))
++            LIBS="$LIBS_saved"
+         fi
      fi
-     case $host_os in
-        *mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then
+ 
diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
index 5923f84..eae6a46 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -1,6 +1,6 @@
 # libxml2
 
-LIBXML2_VERSION := 2.7.8
+LIBXML2_VERSION := 2.8.0
 LIBXML2_URL := http://xmlsoft.org/sources/libxml2-$(LIBXML2_VERSION).tar.gz
 
 PKGS += libxml2