[vlc-commits] contrib: libxml2: don't use LZMA if the header is not found

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Oct 26 17:41:01 2016 +0200| [2ae7ad4f19098cfefd91f758e9cdbfb1096cee3e] | committer: Jean-Baptiste Kempf

contrib: libxml2: don't use LZMA if the header is not found

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

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

 contrib/src/libxml2/libxml2-lzma.patch | 34 ++++++++++++++++++++++++++++++++++
 contrib/src/libxml2/rules.mak          |  1 +
 2 files changed, 35 insertions(+)

diff --git a/contrib/src/libxml2/libxml2-lzma.patch b/contrib/src/libxml2/libxml2-lzma.patch
new file mode 100644
index 0000000..4030295
--- /dev/null
+++ b/contrib/src/libxml2/libxml2-lzma.patch
@@ -0,0 +1,34 @@
+--- 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/rules.mak b/contrib/src/libxml2/rules.mak
index be148dc..cc1e417 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -44,6 +44,7 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/libxml2/nogetcwd.patch
 endif
+	$(APPLY) $(SRC)/libxml2/libxml2-lzma.patch
 	$(call pkg_static,"libxml-2.0.pc.in")
 	$(MOVE)