diff options
author | Daniel Bermond | 2020-03-03 01:41:13 +0000 |
---|---|---|
committer | Daniel Bermond | 2020-03-03 01:41:13 +0000 |
commit | 0c2585cbae2c4731886d571a63bda9499e8db4ac (patch) | |
tree | 622833aae2028cca8c95e96d074414a4d92461ad | |
parent | fe01c971eafa79543f298d5e6badf10eee3f8497 (diff) | |
download | aur-0c2585cbae2c4731886d571a63bda9499e8db4ac.tar.gz |
Fix build on generic architecture
The AVX2 patch does not need to be that restrictive.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 040-libjpeg-xl-git-disable-avx2-avx512.patch | 21 | ||||
-rw-r--r-- | PKGBUILD | 4 |
3 files changed, 4 insertions, 25 deletions
@@ -1,7 +1,7 @@ pkgbase = libjpeg-xl-git pkgdesc = JPEG XL image format reference implementation (git version) pkgver = r3.g0709f3a - pkgrel = 2 + pkgrel = 3 url = https://jpeg.org/jpegxl/ arch = x86_64 license = Apache @@ -43,7 +43,7 @@ pkgbase = libjpeg-xl-git sha256sums = f75738bb1041e1bf9104ca6156b2269f73e4503508803de183e57110b232bbfd sha256sums = ac5e30fb0a9034a935a463a3eaaec4b369fef6cf6e270cc85cce09e1f26f67c0 sha256sums = 5d7df9a9cfc15183915b522bfa1360e0c9034c24c7630c0da43df35326b53c3c - sha256sums = 74497628c1f689ab511aceb1ffb13480a1a55552a45f794fcbe3b209b91ebd28 + sha256sums = cd56a234f5ba5916c4b2df3472d4beb81accea12717b8e131019c3ab1736e0f2 pkgname = libjpeg-xl-git diff --git a/040-libjpeg-xl-git-disable-avx2-avx512.patch b/040-libjpeg-xl-git-disable-avx2-avx512.patch index 78d2e5a1e4ff..3c7df3955c92 100644 --- a/040-libjpeg-xl-git-disable-avx2-avx512.patch +++ b/040-libjpeg-xl-git-disable-avx2-avx512.patch @@ -1,24 +1,3 @@ -diff -Naurp a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-03-01 20:39:57.000000000 +0000 -+++ b/CMakeLists.txt 2020-03-01 23:39:56.619280694 +0000 -@@ -134,16 +134,7 @@ else() - endif() - - # CPU flags --if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64" AND NOT MSVC) --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ -- -mavx2 \ -- -mfma \ -- -Xclang -mprefer-vector-width=128 \ -- -Xclang -target-cpu -Xclang haswell \ -- -Xclang -target-feature -Xclang +avx2") --elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64" AND MSVC) --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2") --elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") -+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ - -Xclang -mprefer-vector-width=128 \ - -Xclang -target-cpu -Xclang cortex-a72") diff -Naurp a/third_party/highway/hwy/targets.h b/third_party/highway/hwy/targets.h --- a/third_party/highway/hwy/targets.h 2020-03-01 20:30:01.000000000 +0000 +++ b/third_party/highway/hwy/targets.h 2020-03-02 01:26:53.807156122 +0000 @@ -2,7 +2,7 @@ pkgname=libjpeg-xl-git pkgver=r3.g0709f3a -pkgrel=2 +pkgrel=3 pkgdesc='JPEG XL image format reference implementation (git version)' arch=('x86_64') url='https://jpeg.org/jpegxl/' @@ -38,7 +38,7 @@ sha256sums=('SKIP' 'f75738bb1041e1bf9104ca6156b2269f73e4503508803de183e57110b232bbfd' 'ac5e30fb0a9034a935a463a3eaaec4b369fef6cf6e270cc85cce09e1f26f67c0' '5d7df9a9cfc15183915b522bfa1360e0c9034c24c7630c0da43df35326b53c3c' - '74497628c1f689ab511aceb1ffb13480a1a55552a45f794fcbe3b209b91ebd28') + 'cd56a234f5ba5916c4b2df3472d4beb81accea12717b8e131019c3ab1736e0f2') prepare() { cd jpeg-xl |