[Android] Update patches
Jean-Baptiste Kempf
git at videolan.org
Sat May 12 17:07:28 CEST 2012
android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 12 17:06:55 2012 +0200| [02170847917a2f5cd9f914a39f28f51a5e8ad543] | committer: Jean-Baptiste Kempf
Update patches
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=02170847917a2f5cd9f914a39f28f51a5e8ad543
---
compile.sh | 2 +-
patches/0001-android-threads-support.patch | 17 ++++++++---------
...Android-add-native-AudioTrack-aout-module.patch | 12 ++++++------
...language-and-frame-rate-to-libvlc_media_t.patch | 6 +++---
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/compile.sh b/compile.sh
index 1ac3a36..5e2be69 100755
--- a/compile.sh
+++ b/compile.sh
@@ -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=5069692bfb
+TESTED_HASH=0ef62578e5b6
if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
diff --git a/patches/0001-android-threads-support.patch b/patches/0001-android-threads-support.patch
index 6734496..74b7c34 100644
--- a/patches/0001-android-threads-support.patch
+++ b/patches/0001-android-threads-support.patch
@@ -1,4 +1,4 @@
-From 650f20450edb1a52a272afa046b2d2e5231b5594 Mon Sep 17 00:00:00 2001
+From c38b628323daa70fb5430530e56df4d7d44be6bb 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
@@ -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 | 17 ++++
+ src/Makefile.am | 16 ++++
src/posix/thread.c | 245 +++++++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 257 insertions(+), 28 deletions(-)
+ 4 files changed, 256 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 9ab1ca6..27bf38e 100644
+index d6d083e..4cf4aba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,6 +195,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
@@ -131,13 +131,12 @@ index 9ab1ca6..27bf38e 100644
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
-@@ -247,6 +252,18 @@ SOURCES_libvlc_darwin = \
+@@ -246,6 +251,17 @@ SOURCES_libvlc_darwin = \
posix/rand.c \
$(NULL)
+SOURCES_libvlc_android = \
+ posix/dirs.c \
-+ misc/atomic.c \
+ posix/filesystem.c \
+ posix/plugin.c \
+ posix/thread.c \
@@ -149,9 +148,9 @@ index 9ab1ca6..27bf38e 100644
+
SOURCES_libvlc_linux = \
posix/dirs.c \
- misc/atomic.c \
+ posix/filesystem.c \
diff --git a/src/posix/thread.c b/src/posix/thread.c
-index a7a4873..598c692 100644
+index 138eac1..a208da0e 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -1,5 +1,5 @@
@@ -537,5 +536,5 @@ index a7a4873..598c692 100644
#endif
}
--
-1.7.9.5
+1.7.10.2
diff --git a/patches/0002-Android-add-native-AudioTrack-aout-module.patch b/patches/0002-Android-add-native-AudioTrack-aout-module.patch
index a630f7a..62fe0a1 100644
--- a/patches/0002-Android-add-native-AudioTrack-aout-module.patch
+++ b/patches/0002-Android-add-native-AudioTrack-aout-module.patch
@@ -1,4 +1,4 @@
-From e5fa715d70557610b376b34f069635af77e69492 Mon Sep 17 00:00:00 2001
+From a973c5d80a69311be1f8d4b426b23e9edcd9c1ce Mon Sep 17 00:00:00 2001
From: Ming Hu <tewilove at gmail.com>
Date: Sun, 29 Apr 2012 18:57:28 +0200
Subject: [PATCH 2/3] Android: add native AudioTrack aout module
@@ -7,11 +7,11 @@ Subject: [PATCH 2/3] Android: add native AudioTrack aout module
configure.ac | 24 +++
modules/audio_output/Modules.am | 1 +
modules/audio_output/audiotrack.c | 304 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 329 insertions(+), 0 deletions(-)
+ 3 files changed, 329 insertions(+)
create mode 100644 modules/audio_output/audiotrack.c
diff --git a/configure.ac b/configure.ac
-index 0b82490..291dfec 100644
+index 62d13ad..08005d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3555,6 +3555,30 @@ if test "${HAVE_ANDROID}" = "1"; then
@@ -59,7 +59,7 @@ index 357bc1d..c4b5a37 100644
libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
new file mode 100644
-index 0000000..5c4a0ce
+index 0000000..d20b138
--- /dev/null
+++ b/modules/audio_output/audiotrack.c
@@ -0,0 +1,304 @@
@@ -180,7 +180,7 @@ index 0000000..5c4a0ce
+vlc_module_begin ()
+ set_shortname("AudioTrack")
+ set_description(N_("Android AudioTrack audio output"))
-+ set_capability("audio output", 25)
++ set_capability("audio output", 225)
+ set_category(CAT_AUDIO)
+ set_subcategory(SUBCAT_AUDIO_AOUT)
+ add_shortcut("android")
@@ -368,5 +368,5 @@ index 0000000..5c4a0ce
+}
+
--
-1.7.5.4
+1.7.10.2
diff --git a/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch b/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch
index 45a3b82..8dc7f94 100644
--- a/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch
+++ b/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch
@@ -1,4 +1,4 @@
-From 313b27201aa4757678bfc995ea611e640294ab41 Mon Sep 17 00:00:00 2001
+From 4519e40c6b16942e46b8d4da01b7f358cd21319a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz at gmail.com>
Date: Sun, 22 Apr 2012 09:35:52 +0200
Subject: [PATCH 3/3] libvlc: add language and frame rate to
@@ -7,7 +7,7 @@ Subject: [PATCH 3/3] libvlc: add language and frame rate to
---
include/vlc/libvlc_media.h | 14 ++++++++++++++
lib/media.c | 15 +++++++++++++++
- 2 files changed, 29 insertions(+), 0 deletions(-)
+ 2 files changed, 29 insertions(+)
diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index 279a29c..d4b1524 100644
@@ -82,5 +82,5 @@ index 2c01c80..b3f5a9a 100644
+ free( p_tracks );
+}
--
-1.7.5.4
+1.7.10.2
More information about the Android
mailing list