[Android] [PATCH] Update libvlc sources in threads patch
Edward Wang
edward.c.wang at compdigitec.com
Mon Aug 6 02:19:35 CEST 2012
This accounts for the new file timer.c, introduced by courmisch in d871c27f40b110788814f9a5fcc0a2d6a1307062.
---
patches/0001-android-threads-support.patch | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/patches/0001-android-threads-support.patch b/patches/0001-android-threads-support.patch
index 8f6ab0e..017e9d2 100644
--- a/patches/0001-android-threads-support.patch
+++ b/patches/0001-android-threads-support.patch
@@ -1,7 +1,7 @@
-From ec67d929b63cdebc2af0f415ab0a54c6a3329816 Mon Sep 17 00:00:00 2001
+From 6db17a74d36e03c198e513dd26bb78a9c7b311ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman at videolan.org>
Date: Sat, 10 Mar 2012 04:54:23 -0500
-Subject: [PATCH 1/3] android: threads support
+Subject: [PATCH 1/5] android: threads support
emulate pthread_cancel (based on win32 code)
TODO:
@@ -32,9 +32,9 @@ are 100% shared with linux so it'd be useless to have 2 copies.
---
include/vlc_threads.h | 13 +++
lib/error.c | 10 ++
- src/Makefile.am | 16 ++++
+ src/Makefile.am | 17 ++++
src/posix/thread.c | 245 +++++++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 256 insertions(+), 28 deletions(-)
+ 4 files changed, 257 insertions(+), 28 deletions(-)
diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index ebf94e2..dad50b1 100644
@@ -102,7 +102,7 @@ index d053faa..52840e8 100644
vlc_mutex_unlock (&lock);
}
diff --git a/src/Makefile.am b/src/Makefile.am
-index d6d083e..4cf4aba 100644
+index d8f4890..37bf044 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,6 +195,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
@@ -131,7 +131,7 @@ index d6d083e..4cf4aba 100644
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
-@@ -246,6 +251,17 @@ SOURCES_libvlc_darwin = \
+@@ -247,6 +252,18 @@ SOURCES_libvlc_darwin = \
posix/rand.c \
$(NULL)
@@ -140,6 +140,7 @@ index d6d083e..4cf4aba 100644
+ posix/filesystem.c \
+ posix/plugin.c \
+ posix/thread.c \
++ posix/timer.c \
+ posix/linux_cpu.c \
+ posix/linux_specific.c \
+ posix/specific.c \
@@ -150,7 +151,7 @@ index d6d083e..4cf4aba 100644
posix/dirs.c \
posix/filesystem.c \
diff --git a/src/posix/thread.c b/src/posix/thread.c
-index 138eac1..a208da0e 100644
+index cc5381e..e528499 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -1,5 +1,5 @@
@@ -536,5 +537,5 @@ index 138eac1..a208da0e 100644
#endif
}
--
-1.7.10.2
+1.7.5.4
--
1.7.5.4
More information about the Android
mailing list