Commit 513cb587 authored by Mehdi Sabwat's avatar Mehdi Sabwat
Browse files

add dav1d patches

parent 7b04c2a6
From 9bed6fe6444a86a6660d275e237bb9126942c471 Mon Sep 17 00:00:00 2001
From: Mehdi Sabwat <mehdisabwat@gmail.com>
Date: Thu, 24 Oct 2019 18:05:16 +0200
Subject: [PATCH 1/2] contrib: bump dav1d to 0.5.0
---
contrib/src/dav1d/SHA512SUMS | 2 +-
contrib/src/dav1d/rules.mak | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/dav1d/SHA512SUMS b/contrib/src/dav1d/SHA512SUMS
index b3b14ff506..90996861fc 100644
--- a/contrib/src/dav1d/SHA512SUMS
+++ b/contrib/src/dav1d/SHA512SUMS
@@ -1 +1 @@
-8ed44b3d747f01b87b34f86fada824dfb7f86c16168af641fe754c767af5714e9fe212b6eea2bc11b5b041460184c78f755e10d4947e46bc70d95e1bd750f79d dav1d-0.4.0.tar.xz
+10d3b174fa7ade0fb56f354dec8218761291c69d1ce1825d04bb6c7f6b28581f8811fd6e65c0f2a7a609b9694c11138ef469a2447814e020c038dba8d04de4df dav1d-0.5.0.tar.xz
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
index 74a44dbb60..dbae572a02 100644
--- a/contrib/src/dav1d/rules.mak
+++ b/contrib/src/dav1d/rules.mak
@@ -1,6 +1,6 @@
# libdav1d
-DAV1D_VERSION := 0.4.0
+DAV1D_VERSION := 0.5.0
DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz
#~ DAV1D_HASH := de2059a1167ed560269c3253768929ef19cae989
#~ DAV1D_VERSION := git-$(DAV1D_HASH)
--
2.23.0
From f027bb628d1542be954b9aa580dad6e14810f03d Mon Sep 17 00:00:00 2001
From: Mehdi Sabwat <mehdisabwat@gmail.com>
Date: Thu, 24 Oct 2019 18:06:52 +0200
Subject: [PATCH 2/2] contrib: add dav1d emscripten support
---
.../dav1d/0001-add-emscripten-support.patch | 26 +++++++++++++++++++
contrib/src/dav1d/rules.mak | 1 +
2 files changed, 27 insertions(+)
create mode 100644 contrib/src/dav1d/0001-add-emscripten-support.patch
diff --git a/contrib/src/dav1d/0001-add-emscripten-support.patch b/contrib/src/dav1d/0001-add-emscripten-support.patch
new file mode 100644
index 0000000000..9e63e5219a
--- /dev/null
+++ b/contrib/src/dav1d/0001-add-emscripten-support.patch
@@ -0,0 +1,26 @@
+From fd9f38380eaf20b812091fbf6c2cea477c38d8e6 Mon Sep 17 00:00:00 2001
+From: Mehdi Sabwat <mehdisabwat@gmail.com>
+Date: Thu, 24 Oct 2019 14:05:31 +0200
+Subject: [PATCH 1/1] add emscripten support
+
+---
+ meson.build | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 90899a7..cc95315 100644
+--- a/meson.build
++++ b/meson.build
+@@ -112,6 +112,9 @@ if host_machine.system() == 'windows'
+ # On Windows, we use a compatibility layer to emulate pthread
+ thread_dependency = []
+ thread_compat_dep = declare_dependency(sources : files('src/win32/thread.c'))
++elif host_machine.system() == 'emscripten'
++ thread_dependency = []
++ thread_compat_dep = []
+ else
+ thread_dependency = dependency('threads')
+ thread_compat_dep = []
+--
+2.23.0
+
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
index dbae572a02..e3cf065b0b 100644
--- a/contrib/src/dav1d/rules.mak
+++ b/contrib/src/dav1d/rules.mak
@@ -24,6 +24,7 @@ $(TARBALLS)/dav1d-$(DAV1D_VERSION).tar.xz:
dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
$(UNPACK)
+ $(APPLY) $(SRC)/dav1d/0001-add-emscripten-support.patch
$(MOVE)
.dav1d: dav1d crossfile.meson
--
2.23.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