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
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
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
Casanowow Life for love
VLC-Android
Commits
360a22a8
Commit
360a22a8
authored
May 29, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove patch about libxml. Upstream has a better one
parent
e1a09be9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
55 deletions
+1
-55
compile.sh
compile.sh
+1
-1
patches/0005-Contribs-libxml-pthread_join-is-not-necessarily-in-l.patch
...ontribs-libxml-pthread_join-is-not-necessarily-in-l.patch
+0
-54
No files found.
compile.sh
View file @
360a22a8
...
...
@@ -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
...
...
patches/0005-Contribs-libxml-pthread_join-is-not-necessarily-in-l.patch
deleted
100644 → 0
View file @
e1a09be9
From 0abdb29d31b0cba5c5173b4fc2b019da2dec965e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@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
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