upgpkg: mingw-w64-dav1d 0.7.0-1

3 files changed, 11 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e3d3b064cae..031ed5179461 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-dav1d
 	pkgdesc = AV1 cross-platform decoder focused on speed and correctness (mingw-w64)
-	pkgver = 0.6.0
+	pkgver = 0.7.0
 	pkgrel = 1
 	url = https://code.videolan.org/videolan/dav1d/
 	arch = i686
@@ -18,16 +18,13 @@ pkgbase = mingw-w64-dav1d
 	options = !buildflags
 	options = !libtool
 	options = staticlibs
-	source = https://downloads.videolan.org/pub/videolan/dav1d/0.6.0/dav1d-0.6.0.tar.xz
-	source = https://downloads.videolan.org/pub/videolan/dav1d/0.6.0/dav1d-0.6.0.tar.xz.asc
-	source = mingw-w64-stripping-fix.patch
+	source = https://downloads.videolan.org/pub/videolan/dav1d/0.7.0/dav1d-0.7.0.tar.xz
+	source = https://downloads.videolan.org/pub/videolan/dav1d/0.7.0/dav1d-0.7.0.tar.xz.asc
 	validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC
-	sha512sums = aeee206806642188839602c7040340052d8cff2168fd142516499da1718c497b3b6b45f96af2d543a0db8ef5d26acece6ac9bb6c6e00316fa222a2ea0554581c
+	sha512sums = a2c6981ba5ad5ffe8382e32d6afb943fdd3ee2801751e4d84718171ccaeeef28ae4822b2ae282b301f4806351526cd83aa72b2535fa3a99ec534996458508521
 	sha512sums = SKIP
-	sha512sums = 04dba9898475550243b6edd7dade239f67c132f0bc5c0f2ac57b60de1c9d22b5c3e4cec16aa00ad505b47d36142278bf36a1efc6c7f424c039cf1a7c87cb3cbf
-	b2sums = 152f948a89584d706b80f1334a3d430b3a97715365228bab24b610a5742ec07b371503cae18d8df83a40c85599aa9d8bf0fc181ea5c355bf0f9e1bf541f066cd
+	b2sums = c601c8b03d712291e3e3357cac87fb7d4a2352503966f949bc023967a9fbeec6199477fa18381ac3eea7991de1df93e0c0ce95469d6400c0d1acbb8dc2b457a9
 	b2sums = SKIP
-	b2sums = 2a3228fe1f1cb7a20aa8f79ed4fb9c366e370a8c224d62208677eb47fcd932102f373ac7cea04aec16d797be6659dda97512cb500e04168a912f554519e34baa
 
 pkgname = mingw-w64-dav1d
 
diff --git a/PKGBUILD b/PKGBUILD
index fa47b389d1ce..55fc11b78f6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Daniel Bermond < gmail-com: danielbermond >
 
 pkgname=mingw-w64-dav1d
-pkgver=0.6.0
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='AV1 cross-platform decoder focused on speed and correctness (mingw-w64)'
 arch=('i686' 'x86_64')
@@ -11,23 +11,14 @@ license=('BSD')
 depends=('mingw-w64-crt' 'mingw-w64-vulkan-icd-loader')
 options=('!strip' '!buildflags' '!libtool' 'staticlibs')
 makedepends=('mingw-w64-gcc' 'mingw-w64-meson' 'mingw-w64-wine' 'git' 'nasm' 'doxygen')
-source=(https://downloads.videolan.org/pub/videolan/dav1d/${pkgver}/dav1d-${pkgver}.tar.xz{,.asc}
-        mingw-w64-stripping-fix.patch)
-sha512sums=('aeee206806642188839602c7040340052d8cff2168fd142516499da1718c497b3b6b45f96af2d543a0db8ef5d26acece6ac9bb6c6e00316fa222a2ea0554581c'
-            'SKIP'
-            '04dba9898475550243b6edd7dade239f67c132f0bc5c0f2ac57b60de1c9d22b5c3e4cec16aa00ad505b47d36142278bf36a1efc6c7f424c039cf1a7c87cb3cbf')
-b2sums=('152f948a89584d706b80f1334a3d430b3a97715365228bab24b610a5742ec07b371503cae18d8df83a40c85599aa9d8bf0fc181ea5c355bf0f9e1bf541f066cd'
-        'SKIP'
-	'2a3228fe1f1cb7a20aa8f79ed4fb9c366e370a8c224d62208677eb47fcd932102f373ac7cea04aec16d797be6659dda97512cb500e04168a912f554519e34baa')
+source=(https://downloads.videolan.org/pub/videolan/dav1d/${pkgver}/dav1d-${pkgver}.tar.xz{,.asc})
+sha512sums=('a2c6981ba5ad5ffe8382e32d6afb943fdd3ee2801751e4d84718171ccaeeef28ae4822b2ae282b301f4806351526cd83aa72b2535fa3a99ec534996458508521'
+            'SKIP')
+b2sums=('c601c8b03d712291e3e3357cac87fb7d4a2352503966f949bc023967a9fbeec6199477fa18381ac3eea7991de1df93e0c0ce95469d6400c0d1acbb8dc2b457a9'
+        'SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
-prepare() {
-  cd "${srcdir}/dav1d-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/mingw-w64-stripping-fix.patch"
-}
-
 build () {
   export NEED_WINE=1
   export WINEDEBUG=-all
diff --git a/mingw-w64-stripping-fix.patch b/mingw-w64-stripping-fix.patch
deleted file mode 100644
index 6f95071c31d2..000000000000
--- a/mingw-w64-stripping-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN dav1d-0.5.1/src/meson.build patched/src/meson.build
---- dav1d-0.5.1/src/meson.build	2019-10-26 02:59:52.000000000 +0200
-+++ patched/src/meson.build	2019-11-13 00:06:59.939298682 +0100
-@@ -139,14 +139,19 @@
-         )
- 
-         if dav1d_bitdepths.contains('8')
-+            # Prevent error while stripping with mingw (no sections in 32 bit x86 cdef.asm)
-+            if host_machine.cpu_family().startswith('x86_64')
-+                libdav1d_sources_asm += files(
-+                    'x86/cdef.asm',
-+                    'x86/film_grain.asm',
-+                    'x86/ipred.asm',
-+                    'x86/itx.asm',
-+                    'x86/loopfilter.asm',
-+                    'x86/looprestoration.asm',
-+                    'x86/mc.asm',
-+                )
-+            endif
-             libdav1d_sources_asm += files(
--                'x86/cdef.asm',
--                'x86/film_grain.asm',
--                'x86/ipred.asm',
--                'x86/itx.asm',
--                'x86/loopfilter.asm',
--                'x86/looprestoration.asm',
--                'x86/mc.asm',
-                 'x86/cdef_sse.asm',
-                 'x86/ipred_ssse3.asm',
-                 'x86/itx_ssse3.asm',