diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/x265/fix-neon-detection.patch | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/x265/fix-neon-detection.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/x265/fix-neon-detection.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/x265/fix-neon-detection.patch b/nixpkgs/pkgs/development/libraries/x265/fix-neon-detection.patch new file mode 100644 index 000000000000..dbb826e54668 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/x265/fix-neon-detection.patch @@ -0,0 +1,28 @@ +commit 72489cd0a1c229258abe4f20e4fdfd414dfa88da +Author: rnhmjoj <rnhmjoj@inventati.org> +Date: Sun Oct 2 00:15:24 2022 +0200 + + Fix NEON detection + +diff --git a/cmake/FindNeon.cmake b/cmake/FindNeon.cmake +index 0062449..9c436d9 100644 +--- a/cmake/FindNeon.cmake ++++ b/cmake/FindNeon.cmake +@@ -1,10 +1,11 @@ + include(FindPackageHandleStandardArgs) + + # Check the version of neon supported by the ARM CPU +-execute_process(COMMAND cat /proc/cpuinfo | grep Features | grep neon +- OUTPUT_VARIABLE neon_version +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-if(neon_version) +- set(CPU_HAS_NEON 1) ++message(STATUS "Detecting NEON support") ++execute_process(COMMAND sed -n "/Features.* neon/q 1" /proc/cpuinfo ++ RESULT_VARIABLE CPU_HAS_NEON) ++if(CPU_HAS_NEON) ++ message(STATUS "Detecting NEON support - supported") ++else() ++ message(STATUS "Detecting NEON support - not supported" ) + endif() |