Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
2ae7ad4f
Commit
2ae7ad4f
authored
Oct 26, 2016
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Nov 16, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: libxml2: don't use LZMA if the header is not found
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
ed83de24
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
0 deletions
+35
-0
contrib/src/libxml2/libxml2-lzma.patch
contrib/src/libxml2/libxml2-lzma.patch
+34
-0
contrib/src/libxml2/rules.mak
contrib/src/libxml2/rules.mak
+1
-0
No files found.
contrib/src/libxml2/libxml2-lzma.patch
0 → 100644
View file @
2ae7ad4f
--- 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>
contrib/src/libxml2/rules.mak
View file @
2ae7ad4f
...
@@ -44,6 +44,7 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
...
@@ -44,6 +44,7 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
ifdef
HAVE_WINSTORE
ifdef
HAVE_WINSTORE
$(APPLY)
$(SRC)
/libxml2/nogetcwd.patch
$(APPLY)
$(SRC)
/libxml2/nogetcwd.patch
endif
endif
$(APPLY)
$(SRC)
/libxml2/libxml2-lzma.patch
$(
call
pkg_static,
"libxml-2.0.pc.in"
)
$(
call
pkg_static,
"libxml-2.0.pc.in"
)
$(MOVE)
$(MOVE)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment