Commit be6a2022 authored by Mehdi Sabwat's avatar Mehdi Sabwat
Browse files

update patch that doesn't apply

parent 564fe6be
From 8cd59d8ddef398be370a11ca9b61e005439f1148 Mon Sep 17 00:00:00 2001
From 747c6207acf654665d23625537b962152922c8c5 Mon Sep 17 00:00:00 2001
From: Mehdi Sabwat <mehdisabwat@gmail.com>
Date: Thu, 5 Sep 2019 16:30:15 +0200
Subject: [PATCH 07/15] core: initial core build for emscripten, based on POSIX
Date: Mon, 24 Feb 2020 14:08:02 +0100
Subject: [PATCH 1/1] core: initial core build for emscripten, based on POSIX
posix/sort.c won't be added because qsort_r is not supported.
---
src/Makefile.am | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
src/Makefile.am | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/Makefile.am b/src/Makefile.am
index b6c5996837..3561a24db0 100644
index bf91159fcc..474ddcdd63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -448,8 +448,18 @@ libvlccore_la_SOURCES += \
linux/dirs.c \
linux/thread.c
else
@@ -437,6 +437,17 @@ libvlccore_la_SOURCES += \
posix/timer.c
endif
+if HAVE_EMSCRIPTEN
+libvlccore_la_SOURCES += \
+ posix/thread.c \
......@@ -25,14 +25,20 @@ index b6c5996837..3561a24db0 100644
+ posix/filesystem.c \
+ posix/specific.c \
+ posix/timer.c
+else
-# All except OS2/WIN32/NACL/ANDROID
+# All except OS2/WIN32/NACL/ANDROID/EMSCRIPTEN
libvlccore_la_SOURCES += posix/sort.c
+endif
+
if HAVE_DARWIN
@@ -490,6 +500,7 @@ endif
libvlccore_la_SOURCES += \
darwin/error.c \
@@ -481,6 +492,7 @@ if !HAVE_LINUX
libvlccore_la_SOURCES += posix/wait.c
endif
if !HAVE_ANDROID
+if !HAVE_EMSCRIPTEN
libvlccore_la_SOURCES += posix/sort.c
if !HAVE_DARWIN
libvlccore_la_SOURCES += \
@@ -503,6 +515,7 @@ endif
endif
endif
endif
......@@ -41,5 +47,5 @@ index b6c5996837..3561a24db0 100644
if ENABLE_SOUT
libvlccore_la_SOURCES += \
--
2.23.0
2.25.0
From ddbd4c7b85feb5e8423787b646eacfb310b68b95 Mon Sep 17 00:00:00 2001
From 1f14176411e65c0d12fe167e62a8f7f10f233216 Mon Sep 17 00:00:00 2001
From: Mehdi Sabwat <mehdisabwat@gmail.com>
Date: Thu, 5 Sep 2019 23:56:20 +0200
Subject: [PATCH 10/15] emscripten: add vlc_getProxyUrl stub.
Date: Mon, 24 Feb 2020 14:15:56 +0100
Subject: [PATCH 1/1] emscripten: add vlc_getProxyUrl stub.
---
src/Makefile.am | 3 ++-
......@@ -10,19 +10,19 @@ Subject: [PATCH 10/15] emscripten: add vlc_getProxyUrl stub.
create mode 100644 src/emscripten/netconf.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 3561a24db0..a18c297d89 100644
index 474ddcdd63..64d28e12c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -456,7 +456,8 @@ libvlccore_la_SOURCES += \
@@ -445,7 +445,8 @@ libvlccore_la_SOURCES += \
posix/dirs.c \
posix/filesystem.c \
posix/specific.c \
- posix/timer.c
+ posix/timer.c \
+ emscripten/netconf.c
else
endif
# All except OS2/WIN32/NACL/ANDROID/EMSCRIPTEN
if HAVE_DARWIN
diff --git a/src/emscripten/netconf.c b/src/emscripten/netconf.c
new file mode 100644
index 0000000000..b972bf4976
......@@ -69,5 +69,5 @@ index 0000000000..b972bf4976
+ return proxy;
+}
--
2.23.0
2.25.0
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