From 62084be8176d674228b6c363b84d79aacfa79638d34d5294a01a12b87ef06875 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 13 May 2019 20:36:22 +0000 Subject: [PATCH 1/3] Accepting request 702706 from home:olh:branches:multimedia:libs - disable armv7 asm for armv6 builds OBS-URL: https://build.opensuse.org/request/show/702706 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dav1d?expand=0&rev=18 --- dav1d.armv6.patch | 18 ++++++++++++++++++ dav1d.changes | 5 +++++ dav1d.spec | 3 ++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dav1d.armv6.patch diff --git a/dav1d.armv6.patch b/dav1d.armv6.patch new file mode 100644 index 0000000..8a77a70 --- /dev/null +++ b/dav1d.armv6.patch @@ -0,0 +1,18 @@ +--- a/tests/checkasm/checkasm.h ++++ b/tests/checkasm/checkasm.h +@@ -145,6 +145,7 @@ static inline uint64_t readtime(void) { + #define readtime readtime + #endif + #elif ARCH_ARM && !defined(_MSC_VER) ++#if __ARM_ARCH > 6 + static inline uint64_t readtime(void) { + uint32_t cycle_counter; + /* This requires enabling user mode access to the cycle counter (which +@@ -156,6 +157,7 @@ static inline uint64_t readtime(void) { + } + #define readtime readtime + #endif ++#endif + + /* Verifies that clobbered callee-saved registers + * are properly saved and restored */ diff --git a/dav1d.changes b/dav1d.changes index 89244af..379c771 100644 --- a/dav1d.changes +++ b/dav1d.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 13 19:48:51 UTC 2019 - olaf@aepfle.de + +- disable armv7 asm for armv6 builds + ------------------------------------------------------------------- Sat May 11 16:06:40 UTC 2019 - Luigi Baldoni diff --git a/dav1d.spec b/dav1d.spec index ef0080d..502c0d3 100644 --- a/dav1d.spec +++ b/dav1d.spec @@ -26,6 +26,7 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://code.videolan.org/videolan/dav1d Source0: https://code.videolan.org/videolan/dav1d/-/archive/%{version}/dav1d-%{version}.tar.gz Source99: baselibs.conf +Patch0: dav1d.armv6.patch BuildRequires: meson >= 0.47.0 BuildRequires: nasm BuildRequires: pkgconfig @@ -60,7 +61,7 @@ Group: System/Libraries %{name} is an AV1 decoder library. %prep -%setup -q +%autosetup -p1 %build %meson From 421aba6429f4394f1c776853d8cc6701c3041f08e525129cb2f9f7a59ff7eae0 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 13 May 2019 21:47:36 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dav1d?expand=0&rev=19 --- dav1d.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dav1d.spec b/dav1d.spec index 502c0d3..b7af468 100644 --- a/dav1d.spec +++ b/dav1d.spec @@ -26,6 +26,7 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://code.videolan.org/videolan/dav1d Source0: https://code.videolan.org/videolan/dav1d/-/archive/%{version}/dav1d-%{version}.tar.gz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM dav1d.armv6.patch olaf@aepfle.de -- disable armv7 asm for armv6 builds Patch0: dav1d.armv6.patch BuildRequires: meson >= 0.47.0 BuildRequires: nasm From e032b7c1903e2b09f48fa8989dbc07835da6c567036239f5661d960507e287fe Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 13 May 2019 21:48:07 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dav1d?expand=0&rev=20 --- dav1d.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dav1d.changes b/dav1d.changes index 379c771..1f53a39 100644 --- a/dav1d.changes +++ b/dav1d.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon May 13 19:48:51 UTC 2019 - olaf@aepfle.de -- disable armv7 asm for armv6 builds +- Added dav1d.armv6.patch (disables armv7 asm for armv6 builds) ------------------------------------------------------------------- Sat May 11 16:06:40 UTC 2019 - Luigi Baldoni