[vlc-commits] contribs: libxml2: Update to 2.9.8

Fri Mar 9 15:10:32 CET 2018

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Mar  7 15:41:39 2018 +0100| [2d6c799215bed20dbe7e2fbfaa3d9529c71bb876] | committer: Hugo Beauzée-Luyssen

contribs: libxml2: Update to 2.9.8

(cherry picked from commit 6c81d0fd45961d71cc56c2cb1da8fbf417b897cd)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2d6c799215bed20dbe7e2fbfaa3d9529c71bb876
---

 contrib/src/libxml2/SHA512SUMS         |  2 +-
 contrib/src/libxml2/libxml2-lzma.patch | 34 ----------------------------------
 contrib/src/libxml2/no-tests.patch     | 17 -----------------
 contrib/src/libxml2/nogetcwd.patch     |  8 ++++----
 contrib/src/libxml2/rules.mak          |  4 +---
 contrib/src/libxml2/win32.patch        | 28 ++++------------------------
 6 files changed, 10 insertions(+), 83 deletions(-)

diff --git a/contrib/src/libxml2/SHA512SUMS b/contrib/src/libxml2/SHA512SUMS
index 96e0a608c0..f82fd4f71f 100644
--- a/contrib/src/libxml2/SHA512SUMS
+++ b/contrib/src/libxml2/SHA512SUMS
@@ -1 +1 @@
-f5174ab1a3a0ec0037a47f47aa47def36674e02bfb42b57f609563f84c6247c585dbbb133c056953a5adb968d328f18cbc102eb0d00d48eb7c95478389e5daf9  libxml2-2.9.4.tar.gz
+28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917  libxml2-2.9.8.tar.gz
diff --git a/contrib/src/libxml2/libxml2-lzma.patch b/contrib/src/libxml2/libxml2-lzma.patch
deleted file mode 100644
index 40302954d8..0000000000
--- a/contrib/src/libxml2/libxml2-lzma.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- libxml2/parser.c	2015-11-20 08:56:41.000000000 +0100
-+++ libxml2/parser.c.lzma	2016-10-24 18:05:57.199914200 +0200
-@@ -82,6 +82,8 @@
- #endif
- #ifdef HAVE_LZMA_H
- #include <lzma.h>
-+#else
-+#undef LIBXML_LZMA_ENABLED
- #endif
- 
- #include "buf.h"
---- libxml2/xmlIO.c	2016-10-26 10:07:38.573134100 +0200
-+++ libxml2/xmlIO.c.lzma	2016-10-26 10:14:05.434206600 +0200
-@@ -37,6 +37,8 @@
- #endif
- #ifdef HAVE_LZMA_H
- #include <lzma.h>
-+#else
-+#undef LIBXML_LZMA_ENABLED
- #endif
- 
- #if defined(WIN32) || defined(_WIN32)
---- libxml2/xzlib.c	2016-10-26 10:19:32.708734300 +0200
-+++ libxml2/xzlib.c.lzma	2016-10-26 10:18:58.428464300 +0200
-@@ -8,6 +8,9 @@
-  */
- #define IN_LIBXML
- #include "libxml.h"
-+#ifndef HAVE_LZMA_H
-+#undef LIBXML_LZMA_ENABLED
-+#endif
- #ifdef LIBXML_LZMA_ENABLED
- 
- #include <string.h>
diff --git a/contrib/src/libxml2/no-tests.patch b/contrib/src/libxml2/no-tests.patch
deleted file mode 100644
index 9e2fd15cc2..0000000000
--- a/contrib/src/libxml2/no-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libxml2-2.9.0/Makefile.am.orig	2012-11-01 18:55:04.214524833 +0100
-+++ libxml2-2.9.0/Makefile.am	2012-11-01 18:55:56.838557494 +0100
-@@ -10,10 +10,10 @@
- 
- AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
- 
--noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
--                testThreads testC14N testAutomata testRegexp \
--                testReader testapi testModule runtest runsuite testchar \
--		testdict runxmlconf testrecurse testlimits
-+# noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
-+#                 testThreads testC14N testAutomata testRegexp \
-+#                 testReader testapi testModule runtest runsuite testchar \
-+# 		testdict runxmlconf testrecurse testlimits
- 
- bin_PROGRAMS = xmllint xmlcatalog
- 
diff --git a/contrib/src/libxml2/nogetcwd.patch b/contrib/src/libxml2/nogetcwd.patch
index cef4efe7ae..e6d249937e 100644
--- a/contrib/src/libxml2/nogetcwd.patch
+++ b/contrib/src/libxml2/nogetcwd.patch
@@ -1,6 +1,6 @@
---- libxml2/xmlIO.c.orig	2016-05-03 11:27:32.110248362 +0200
-+++ libxml2/xmlIO.c	2016-05-03 11:27:55.310675774 +0200
-@@ -3810,44 +3810,7 @@
+--- libxml2/xmlIO.c.orig	2018-03-07 15:31:01.821589739 +0100
++++ libxml2/xmlIO.c	2018-03-07 15:31:21.717589238 +0100
+@@ -3709,44 +3709,7 @@
   */
  char *
  xmlParserGetDirectory(const char *filename) {
@@ -17,7 +17,7 @@
 -
 -    if (filename == NULL) return(NULL);
 -
--#if defined(WIN32) && !defined(__CYGWIN__)
+-#if defined(_WIN32) && !defined(__CYGWIN__)
 -#   define IS_XMLPGD_SEP(ch) ((ch=='/')||(ch=='\\'))
 -#else
 -#   define IS_XMLPGD_SEP(ch) (ch=='/')
diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
index 0f6a964033..c4aab837ae 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -1,6 +1,6 @@
 # libxml2
 
-LIBXML2_VERSION := 2.9.4
+LIBXML2_VERSION := 2.9.8
 LIBXML2_URL := http://xmlsoft.org/sources/libxml2-$(LIBXML2_VERSION).tar.gz
 
 PKGS += libxml2
@@ -37,14 +37,12 @@ endif
 
 libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
 	$(UNPACK)
-	$(APPLY) $(SRC)/libxml2/no-tests.patch
 	$(APPLY) $(SRC)/libxml2/win32.patch
 	$(APPLY) $(SRC)/libxml2/bins.patch
 	$(APPLY) $(SRC)/libxml2/pthread.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/libxml2/nogetcwd.patch
 endif
-	$(APPLY) $(SRC)/libxml2/libxml2-lzma.patch
 	$(call pkg_static,"libxml-2.0.pc.in")
 	$(MOVE)
 
diff --git a/contrib/src/libxml2/win32.patch b/contrib/src/libxml2/win32.patch
index b496529c4b..03b38f814b 100644
--- a/contrib/src/libxml2/win32.patch
+++ b/contrib/src/libxml2/win32.patch
@@ -1,27 +1,7 @@
---- libxml2/xmlIO.c.orig	2013-04-22 19:24:23.613036400 +0200
-+++ libxml2/xmlIO.c	2013-04-22 19:24:56.249035859 +0200
-@@ -726,14 +726,14 @@
- xmlInitPlatformSpecificIo(void)
- {
-     static int xmlPlatformIoInitialized = 0;
--    OSVERSIONINFO osvi;
-+    /*OSVERSIONINFO osvi;*/
- 
-     if(xmlPlatformIoInitialized)
-       return;
- 
--    osvi.dwOSVersionInfoSize = sizeof(osvi);
-+    /*osvi.dwOSVersionInfoSize = sizeof(osvi);*/
- 
--    if(GetVersionEx(&osvi) && (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)) {
-+    if(1 /*GetVersionEx(&osvi) && (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)*/) {
-       xmlWrapStat = xmlWrapStatUtf8;
-       xmlWrapOpen = xmlWrapOpenUtf8;
- #ifdef HAVE_ZLIB_H
---- libxml2-2.9.2/configure.ac	2014-10-16 06:06:15.000000000 +0200
-+++ libxml2-2.9.2/configure.ac.new	2015-01-21 10:07:09.001484882 +0100
-@@ -1041,7 +1041,7 @@
-        *mingw32*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then
+--- libxml2/configure.ac.orig	2018-03-05 16:54:00.000000000 +0100
++++ libxml2/configure.ac	2018-03-07 17:29:50.093410103 +0100
+@@ -1036,7 +1036,7 @@
+        *mingw*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then
                 WITH_THREADS="1"
                 THREADS_W32="1"
 -               THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"

