Commit 2dda5910 authored by Rafaël Carré's avatar Rafaël Carré

Remove applied hunks and unnecessary patch

parent 46d09de3
......@@ -89,7 +89,7 @@ export PLATFORM_SHORT_ARCH
export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
# 1/ libvlc, libvlccore and its plugins
TESTED_HASH=45adae3485
TESTED_HASH=c0a2390f6
if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
......
......@@ -101,55 +101,6 @@ index d053faa..52840e8 100644
}
vlc_mutex_unlock (&lock);
}
diff --git a/src/Makefile.am b/src/Makefile.am
index 9ac25d3..bdf1fb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -205,6 +205,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_darwin) \
$(SOURCES_libvlc_linux) \
+ $(SOURCES_libvlc_android) \
$(SOURCES_libvlc_win32) \
$(SOURCES_libvlc_os2) \
$(SOURCES_libvlc_other) \
@@ -215,6 +216,9 @@ EXTRA_libvlccore_la_SOURCES = \
if HAVE_DARWIN
libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
else
+if HAVE_ANDROID
+libvlccore_la_SOURCES += $(SOURCES_libvlc_android)
+else
if HAVE_LINUX
libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
else
@@ -233,6 +237,7 @@ endif
endif
endif
endif
+endif
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
@@ -253,6 +258,18 @@ SOURCES_libvlc_darwin = \
posix/rand.c \
$(NULL)
+SOURCES_libvlc_android = \
+ posix/dirs.c \
+ posix/filesystem.c \
+ posix/plugin.c \
+ posix/thread.c \
+ posix/timer.c \
+ posix/linux_cpu.c \
+ posix/linux_specific.c \
+ posix/specific.c \
+ posix/rand.c \
+ $(NULL)
+
SOURCES_libvlc_linux = \
posix/dirs.c \
posix/filesystem.c \
diff --git a/src/posix/thread.c b/src/posix/thread.c
index c414def..ab2a3af 100644
--- a/src/posix/thread.c
......
From 503f74a0936ef5b812f1e1f083ddafc626aa76d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
Date: Fri, 22 Jun 2012 23:05:37 +0200
Subject: [PATCH 5/6] Android: fix album art extraction
---
src/playlist/art.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/playlist/art.c b/src/playlist/art.c
index 9a93762..fbcb8c6 100644
--- a/src/playlist/art.c
+++ b/src/playlist/art.c
@@ -64,7 +64,11 @@ static char* ArtCacheGetDirPath( const char *psz_arturl, const char *psz_artist,
const char *psz_album, const char *psz_title )
{
char *psz_dir;
+#ifdef __ANDROID__
+ char *psz_cachedir = strdup("/sdcard/Android/data/org.videolan.vlc/cache");
+#else
char *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
+#endif
if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) )
{
--
1.7.12.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment