[vlc-commits] Contrib: update dav1d to 0.7.1

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 24 14:39:36 2020 +0200| [52ff049d817d1991f1ab8b988ac8bf59b71f8722] | committer: Jean-Baptiste Kempf

Contrib: update dav1d to 0.7.1

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52ff049d817d1991f1ab8b988ac8bf59b71f8722
---

 ...favor-_aligned_malloc-over-posix_memalign.patch | 36 ----------------------
 contrib/src/dav1d/SHA512SUMS                       |  2 +-
 contrib/src/dav1d/rules.mak                        |  6 +---
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/contrib/src/dav1d/0001-meson-favor-_aligned_malloc-over-posix_memalign.patch b/contrib/src/dav1d/0001-meson-favor-_aligned_malloc-over-posix_memalign.patch
deleted file mode 100644
index 29bbf23cb5..0000000000
--- a/contrib/src/dav1d/0001-meson-favor-_aligned_malloc-over-posix_memalign.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ed39e8fb63bcdb837e3f131140d2d73d02095ca1 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolan.org>
-Date: Thu, 28 May 2020 10:55:24 +0200
-Subject: [PATCH] meson: favor _aligned_malloc over posix_memalign
-
-posix_memalign is defined as a built-in in gcc in msys2 but it's not available
-when linking with the Universal C Runtime. _aligned_malloc is available in the
-UCRT.
-
-That should only affect builds targeting Windows since _aligned_malloc is a MS
-thing.
----
- meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 65bea09..25f037f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -196,10 +196,10 @@ else
-     getopt_dependency = []
- endif
- 
--if cc.has_function('posix_memalign', prefix : '#include <stdlib.h>', args : test_args)
--    cdata.set('HAVE_POSIX_MEMALIGN', 1)
--elif cc.has_function('_aligned_malloc', prefix : '#include <malloc.h>', args : test_args)
-+if cc.has_function('_aligned_malloc', prefix : '#include <malloc.h>', args : test_args)
-     cdata.set('HAVE_ALIGNED_MALLOC', 1)
-+elif cc.has_function('posix_memalign', prefix : '#include <stdlib.h>', args : test_args)
-+    cdata.set('HAVE_POSIX_MEMALIGN', 1)
- elif cc.has_function('memalign', prefix : '#include <malloc.h>', args : test_args)
-     cdata.set('HAVE_MEMALIGN', 1)
- endif
--- 
-2.26.0.windows.1
-
diff --git a/contrib/src/dav1d/SHA512SUMS b/contrib/src/dav1d/SHA512SUMS
index f98bbe23fe..04d6fa7ca2 100644
--- a/contrib/src/dav1d/SHA512SUMS
+++ b/contrib/src/dav1d/SHA512SUMS
@@ -1 +1 @@
-a2c6981ba5ad5ffe8382e32d6afb943fdd3ee2801751e4d84718171ccaeeef28ae4822b2ae282b301f4806351526cd83aa72b2535fa3a99ec534996458508521  dav1d-0.7.0.tar.xz
+fe7f4a4a547d1239e62025bb40d2f7f97e9fbdfde1d32f9930497801b703a68050ee2fa79793c1cd0c4723678a0736f32431e1b711f63f5de782fe675e5c82de  dav1d-0.7.1.tar.xz
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
index 66c538b784..e7bc7ea7d9 100644
--- a/contrib/src/dav1d/rules.mak
+++ b/contrib/src/dav1d/rules.mak
@@ -1,10 +1,7 @@
 # libdav1d
 
-DAV1D_VERSION := 0.7.0
+DAV1D_VERSION := 0.7.1
 DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz
-#~ DAV1D_HASH := de2059a1167ed560269c3253768929ef19cae989
-#~ DAV1D_VERSION := git-$(DAV1D_HASH)
-#~ DAV1D_GITURL := https://code.videolan.org/videolan/dav1d.git
 
 PKGS += dav1d
 ifeq ($(call need_pkg,"dav1d"),)
@@ -21,7 +18,6 @@ $(TARBALLS)/dav1d-$(DAV1D_VERSION).tar.xz:
 
 dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
 	$(UNPACK)
-	$(APPLY) $(SRC)/dav1d/0001-meson-favor-_aligned_malloc-over-posix_memalign.patch
 	$(MOVE)
 
 .dav1d: dav1d crossfile.meson