me
/
guix
Archived
1
0
Fork 0
Code

gnu: dav1d: Fix build on AArch64. 

* gnu/packages/patches/dav1d-aarch64-symbol-alignment.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/video.scm (dav1d)[source](patches): New field.
master
Marius Bakke 2019-10-20 13:01:25 +02:00
parent 10f2ae01c4
commit 9a8d4463e6
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -766,6 +766,7 @@ dist_patch_DATA = \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
%D%/packages/patches/dav1d-aarch64-symbol-alignment.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \

25
gnu/packages/patches/dav1d-aarch64-symbol-alignment.patch 100644
View File

@ -0,0 +1,25 @@
Ensure local debug symbols are aligned on AArch64.
Taken from upstream:
https://code.videolan.org/videolan/dav1d/commit/a6228f47f0eebcdfebb1753a786e3e1654b51ea4
diff --git a/src/arm/64/ipred.S b/src/arm/64/ipred.S
index 41b3c1c..9513212 100644
--- a/src/arm/64/ipred.S
+++ b/src/arm/64/ipred.S
@@ -2244,6 +2244,7 @@ L(ipred_cfl_ac_420_tbl):
.hword L(ipred_cfl_ac_420_tbl) - L(ipred_cfl_ac_420_w16)
.hword L(ipred_cfl_ac_420_tbl) - L(ipred_cfl_ac_420_w8)
.hword L(ipred_cfl_ac_420_tbl) - L(ipred_cfl_ac_420_w4)
+ .hword 0
L(ipred_cfl_ac_420_w16_tbl):
.hword L(ipred_cfl_ac_420_w16_tbl) - L(ipred_cfl_ac_420_w16_wpad0)
@@ -2432,6 +2433,7 @@ L(ipred_cfl_ac_422_tbl):
.hword L(ipred_cfl_ac_422_tbl) - L(ipred_cfl_ac_422_w16)
.hword L(ipred_cfl_ac_422_tbl) - L(ipred_cfl_ac_422_w8)
.hword L(ipred_cfl_ac_422_tbl) - L(ipred_cfl_ac_422_w4)
+ .hword 0
L(ipred_cfl_ac_422_w16_tbl):
.hword L(ipred_cfl_ac_422_w16_tbl) - L(ipred_cfl_ac_422_w16_wpad0)

1
gnu/packages/video.scm
View File

@ -3552,6 +3552,7 @@ transitions, and effects and then export your film to many common formats.")
(method url-fetch)
(uri (string-append "https://downloads.videolan.org/pub/videolan"
"/dav1d/" version "/dav1d-" version ".tar.xz"))
(patches (search-patches "dav1d-aarch64-symbol-alignment.patch"))
(sha256
(base32
"1586k439fm8db9lsxxywm34iqibj5mw4xrppr4g2wqr0hjlhcbxn"))))