[vlc-devel] [PATCH 1/4] contrib: dav1d: use the official 0.1.0

[Steve Lhomme]

---
 ...ption-to-disable-the-.rc-compilation.patch | 46 -------------------
 contrib/src/dav1d/rules.mak                   | 16 +++----
 2 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 contrib/src/dav1d/0001-add-an-option-to-disable-the-.rc-compilation.patch

diff --git a/contrib/src/dav1d/0001-add-an-option-to-disable-the-.rc-compilation.patch b/contrib/src/dav1d/0001-add-an-option-to-disable-the-.rc-compilation.patch
deleted file mode 100644
index 1cfcb793ae..0000000000
--- a/contrib/src/dav1d/0001-add-an-option-to-disable-the-.rc-compilation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f459feb6b0b4ad526d794c8c3f3e5a2f09806ecc Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolan.org>
-Date: Fri, 9 Nov 2018 14:01:49 +0100
-Subject: [PATCH] add an option to disable the .rc compilation
-
-This is to avoid issues where Meson doesn't detect the .rc compiler properly
-and there is no way to disable the .rc files compilation for static targets.
----
- meson_options.txt | 6 ++++++
- src/meson.build   | 6 +++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 08e75ad..bedbc7a 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -30,3 +30,9 @@ option('fuzzing_engine',
-     choices : ['none', 'libfuzzer', 'oss-fuzz'],
-     value: 'none',
-     description: 'Select the fuzzing engine')
-+
-+# temporary option until it can be done automatically only when 
-+option('win32_ver',
-+    type: 'boolean',
-+    value: true,
-+    description: 'Add a version number to the built library on Windows')
-diff --git a/src/meson.build b/src/meson.build
-index 5515c2e..fefa0b0 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -146,7 +146,11 @@ if host_machine.system() == 'windows'
-         configuration : rc_data
-     )
- 
--    libdav1d_rc_obj = winmod.compile_resources(rc_file)
-+    if get_option('win32_ver')
-+        libdav1d_rc_obj = winmod.compile_resources(rc_file)
-+    else
-+        libdav1d_rc_obj = []
-+    endif
- else
-     libdav1d_rc_obj = []
- endif
--- 
-2.17.0.windows.1
-
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
index 411a9b158e..ea5cb0ffdb 100644
--- a/contrib/src/dav1d/rules.mak
+++ b/contrib/src/dav1d/rules.mak
@@ -1,8 +1,10 @@
 # libdav1d
 
-DAV1D_HASH := 8c95771dfa7a0bdb542eef8924bd0d3009e5efff
-DAV1D_VERSION := git-$(DAV1D_HASH)
-DAV1D_GITURL := https://code.videolan.org/videolan/dav1d.git
+DAV1D_VERSION := 0.1.0
+DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz
+#~ DAV1D_HASH := 8c95771dfa7a0bdb542eef8924bd0d3009e5efff
+#~ DAV1D_VERSION := git-$(DAV1D_HASH)
+#~ DAV1D_GITURL := https://code.videolan.org/videolan/dav1d.git
 
 PKGS += dav1d
 ifeq ($(call need_pkg,"dav1d"),)
@@ -15,15 +17,13 @@ DAV1D_CONF += -D win32_ver=false
 endif
 
 $(TARBALLS)/dav1d-$(DAV1D_VERSION).tar.xz:
-	$(call download_git,$(DAV1D_GITURL),,$(DAV1D_HASH))
+	$(call download_pkg,$(DAV1D_URL),dav1d)
+	#~ $(call download_git,$(DAV1D_URL),,$(DAV1D_HASH))
 
-.sum-dav1d: dav1d-$(DAV1D_VERSION).tar.xz
-	$(call check_githash,$(DAV1D_HASH))
-	touch $@
+.sum-aribb25: dav1d-$(DAV1D_VERSION).tar.xz
 
 dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
 	$(UNPACK)
-	$(APPLY) $(SRC)/dav1d/0001-add-an-option-to-disable-the-.rc-compilation.patch
 	$(MOVE)
 
 .dav1d: dav1d crossfile.meson
-- 
2.17.1