Commit 960052e0 authored by Sébastien Toque's avatar Sébastien Toque

update patches and revert changes related to vlc 1.3

parent e34508af
From c68811cbe4c810ea05ccd2dd5d798abae5cf0c0d Mon Sep 17 00:00:00 2001
From e7712a61b2dda5e2675bd0b892e94e60498ee2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Andr=C3=A9?= <jpeg@videolan.org>
Date: Thu, 2 Jun 2011 15:15:57 +0200
Subject: [PATCH 1/7] Android: add compatibility pthread_cancel
......@@ -320,11 +320,11 @@ index 0000000..8a39f5d
+ return ret;
+}
diff --git a/configure.ac b/configure.ac
index 7417214..c5a2297 100644
index 27bb143..e61f372 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,10 @@ if test "${SYS}" = "mingw32" ; then
fi
@@ -469,6 +469,10 @@ if test "${SYS}" = "mingw32" ; then
CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi
+if test "${HAVE_ANDROID}" = "1"; then
......@@ -465,5 +465,5 @@ index 122e201..9d9c771 100644
pthread_attr_destroy (attr);
return ret;
--
1.7.4.1
1.7.5.4
From 139e917595bf81ece7292d968372fb871d1f33da Mon Sep 17 00:00:00 2001
From 8abbc6677e33228461d8d125d7352b306ea7cf48 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Thu, 2 Jun 2011 12:50:50 +0200
Subject: [PATCH 2/7] Android: use a custom poll(), fixes HTTP playback
......@@ -10,10 +10,10 @@ Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index bd711c6..3ca0988 100644
index 0d63194..8a376ad 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -277,7 +277,7 @@ struct pollfd
@@ -274,7 +274,7 @@ struct pollfd
#endif
#ifndef HAVE_POLL
# define poll(a, b, c) vlc_poll(a, b, c)
......@@ -23,7 +23,7 @@ index bd711c6..3ca0988 100644
# define poll(a, b, c) vlc_poll(a, b, c)
#endif
diff --git a/src/network/poll.c b/src/network/poll.c
index 24335c2..aa2e260 100644
index da78f7f..6dddc0b 100644
--- a/src/network/poll.c
+++ b/src/network/poll.c
@@ -60,6 +60,77 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
......@@ -105,5 +105,5 @@ index 24335c2..aa2e260 100644
# include <vlc_network.h>
--
1.7.4.1
1.7.5.4
From 054afb010cefa90f3ad8d50c23959be7375475b8 Mon Sep 17 00:00:00 2001
From 5e1faeb801e3eec6e2876021202289a5a149e2a1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 31 Jul 2011 00:20:40 +0200
Subject: [PATCH 3/7] Push messages to Android stack
......@@ -11,10 +11,10 @@ Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index e739e75..d4a8d4e 100644
index e61f372..90de262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,6 +445,7 @@ fi
@@ -471,6 +471,7 @@ fi
if test "${HAVE_ANDROID}" = "1"; then
AC_REPLACE_FUNCS([pthread_cancel])
......@@ -23,10 +23,10 @@ index e739e75..d4a8d4e 100644
dnl
diff --git a/src/misc/messages.c b/src/misc/messages.c
index 66bd62e..4308897 100644
index 61080c0..f92d4c0 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -228,10 +228,17 @@ void vlc_vaLog (vlc_object_t *obj, int type, const char *module,
@@ -224,10 +224,17 @@ void vlc_vaLog (vlc_object_t *obj, int type, const char *module,
va_list ap;
va_copy (ap, args);
......@@ -43,7 +43,7 @@ index 66bd62e..4308897 100644
+#endif
va_end (ap);
#ifdef WIN32
vlc_rwlock_rdlock (&msg_lock);
diff --git a/src/posix/thread.c b/src/posix/thread.c
index 9d9c771..d8a442b 100644
--- a/src/posix/thread.c
......
From 8f0b9e2db10319c82c5b6595f96c6768b9627ca7 Mon Sep 17 00:00:00 2001
From eef45a21a5aba9eaebc08964f3063145ea320039 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 31 Jul 2011 00:05:21 +0200
Subject: [PATCH 4/7] Old contribs: compile live on Android
......@@ -72,10 +72,10 @@ index 0000000..e2f4b2e
+ C_COMPILER = $(CROSS_COMPILE)gcc
+ C_FLAGS = $(COMPILE_OPTS)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index f203895..23252d0 100644
index f0739b6..a058eb7 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1287,6 +1287,9 @@ ifndef HAVE_WINCE
@@ -1250,6 +1250,9 @@ ifndef HAVE_WINCE
patch -p0 < Patches/live-getaddrinfo.patch
endif
endif
......@@ -86,5 +86,5 @@ index f203895..23252d0 100644
LIVE_TARGET-$(ENABLED) = linux
LIVE_TARGET-$(HAVE_WIN32) = mingw
--
1.7.4.1
1.7.5.4
From 4e2b0b121adb974e1f2c329cdfa01e3f1c192a93 Mon Sep 17 00:00:00 2001
From a29f0c4a1777d8bdd6cf4fc6649938aedd807404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
Date: Tue, 4 Oct 2011 22:38:36 +0200
Subject: [PATCH] YUV->RGB convertor in NEON
Subject: [PATCH 5/7] YUV->RGB convertor in NEON
---
modules/arm_neon/Modules.am | 10 ++
......@@ -883,5 +883,5 @@ index 0000000..ede49c9
+ return VLC_SUCCESS;
+}
--
1.7.4.1
1.7.5.4
From 7962bff5eb8d3d54abdfcb554284e9654ce1f839 Mon Sep 17 00:00:00 2001
From 73cb72d834c6cd2cde2a56c0add8542453eca1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Duraffort?= <ivoire@videolan.org>
Date: Sun, 7 Nov 2010 19:11:51 +0100
Subject: [PATCH 6/7] Implement rw_locks.
......@@ -11,10 +11,10 @@ add static initializer, use #ifdef __ANDROID__, remove windows function call
2 files changed, 98 insertions(+), 0 deletions(-)
diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 3fefbaf..83bbfe2 100644
index 7a6c6af..181f273 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -110,8 +110,30 @@ typedef pthread_mutex_t vlc_mutex_t;
@@ -123,8 +123,30 @@ typedef pthread_mutex_t vlc_mutex_t;
#define VLC_STATIC_MUTEX PTHREAD_MUTEX_INITIALIZER
typedef pthread_cond_t vlc_cond_t;
#define VLC_STATIC_COND PTHREAD_COND_INITIALIZER
......@@ -46,7 +46,7 @@ index 3fefbaf..83bbfe2 100644
typedef struct vlc_timer *vlc_timer_t;
diff --git a/src/posix/thread.c b/src/posix/thread.c
index 5627f66..38d998c 100644
index d8a442b..dd5b2fd 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -587,6 +587,7 @@ void vlc_sem_wait (vlc_sem_t *sem)
......@@ -140,5 +140,5 @@ index 5627f66..38d998c 100644
/**
* Allocates a thread-specific variable.
--
1.7.4.1
1.7.5.4
From 507e7a44ed1b142a22d3aaf0e45e4f737fc72019 Mon Sep 17 00:00:00 2001
From 8d8a6189c5c53b6c8186adda2945dc9bb017afb6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 22 Sep 2011 18:14:31 +0200
Subject: [PATCH 7/7] configure: allow a --disable-v4l2
......@@ -9,10 +9,10 @@ This is needed because some distro have broken headers
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index ddd63aa..fb88629 100644
index 90de262..8fa1531 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1936,26 +1936,30 @@ fi
@@ -1901,26 +1901,30 @@ fi
dnl
dnl Video4Linux 2
dnl
......@@ -58,5 +58,5 @@ index ddd63aa..fb88629 100644
dnl
--
1.7.4.1
1.7.5.4
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