Merge pull request #241437 from dasisdormax/astc-encoder-update-4.5.0

astc-encoder: 4.4.0 -> 4.5.0

authored by

Nick Cao and committed by
GitHub
2a59d430 74174ea5

+6 -7
+6 -7
pkgs/tools/graphics/astc-encoder/default.nix
··· 16 16 else if isAarch64 then [ "NEON" ] 17 17 else [ "NONE" ]; 18 18 19 - archFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ]; 20 - 21 19 # CMake Build flags for the selected ISAs. For a list of flags, see 22 20 # https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md 23 - isaFlags = map ( isa: "-DISA_${isa}=ON" ) isas; 21 + isaFlags = map ( isa: "-DASTCENC_ISA_${isa}=ON" ) isas; 24 22 25 23 # The suffix of the binary to link as 'astcenc' 26 24 mainBinary = builtins.replaceStrings ··· 31 29 32 30 stdenv.mkDerivation rec { 33 31 pname = "astc-encoder"; 34 - version = "4.4.0"; 32 + version = "4.5.0"; 35 33 36 34 src = fetchFromGitHub { 37 35 owner = "ARM-software"; 38 36 repo = "astc-encoder"; 39 37 rev = version; 40 - sha256 = "sha256-pJmMquORG+vN2uLPywAZY1iZTuHB4SdMP/eriAjnyUU="; 38 + sha256 = "sha256-pNoBOp//xa5F6/T1cwtdHsAWLZeIHgxZ7UKaB60fg4M="; 41 39 }; 42 40 43 41 nativeBuildInputs = [ cmake ]; 44 42 45 - cmakeFlags = isaFlags ++ archFlags ++ [ 43 + cmakeFlags = isaFlags ++ [ 46 44 "-DCMAKE_BUILD_TYPE=RelWithDebInfo" 45 + "-DASTCENC_UNIVERSAL_BUILD=OFF" 47 46 ]; 48 47 49 48 # Set a fixed build year to display within help output (otherwise, it would be 1980) 50 49 postPatch = '' 51 50 substituteInPlace Source/cmake_core.cmake \ 52 - --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")' 51 + --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2023")' 53 52 ''; 54 53 55 54 # Provide 'astcenc' link to main executable