diff options
| author | Brendan Coles <bcoles@gmail.com> | 2021-04-17 08:30:03 +0000 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-04-17 11:19:33 +0200 |
| commit | a89986608ad1d85c83ce7c99795f3d7660a9c064 (patch) | |
| tree | 495f9bba3e38fb8a4efbff42ff281f82af977f92 /Ports | |
| parent | c33592d28cac46a4193c1d727f6b3a34aebea978 (diff) | |
| download | serenity-a89986608ad1d85c83ce7c99795f3d7660a9c064.zip | |
Ports: c-ray: Pin version to latest commit rather than use master branch
Diffstat (limited to 'Ports')
| -rwxr-xr-x | Ports/c-ray/package.sh | 8 | ||||
| -rw-r--r-- | Ports/c-ray/patches/replace-micro-symbol.patch | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Ports/c-ray/package.sh b/Ports/c-ray/package.sh index ea586b79d9..27a68f9bd8 100755 --- a/Ports/c-ray/package.sh +++ b/Ports/c-ray/package.sh @@ -1,12 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh port=c-ray -version=git -workdir=c-ray-master +version=c094d64570c30c70f4003e9428d31a2a0d9d3d41 useconfigure=true -files="https://github.com/vkoskiv/c-ray/archive/master.tar.gz c-ray-git.tar.gz 939b40cdb642b78a2b300b5b2981e337" +files="https://github.com/vkoskiv/c-ray/archive/${version}.tar.gz ${version}.tar.gz b83e3c6a1462486257dfe38d309b47c2" auth_type=md5 configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt" depends="SDL2" +workdir="${port}-${version}" configure() { run cmake $configopts @@ -14,5 +14,5 @@ configure() { install() { mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray" - cp -r c-ray-master/* "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray" + cp -r "${port}-${version}"/* "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray" } diff --git a/Ports/c-ray/patches/replace-micro-symbol.patch b/Ports/c-ray/patches/replace-micro-symbol.patch index 8aba698723..6c67328d59 100644 --- a/Ports/c-ray/patches/replace-micro-symbol.patch +++ b/Ports/c-ray/patches/replace-micro-symbol.patch @@ -1,9 +1,8 @@ ---- c-ray-master/src/renderer/renderer.c 2021-03-13 22:08:24.699323180 +0100 -+++ c-ray-master/src/renderer/renderer.c 2021-03-13 22:08:53.513237904 +0100 -@@ -108,7 +108,7 @@ - float sps = (1000000.0f/usPerRay) * r->prefs.threadCount; ++++ c-ray-master/src/renderer/renderer.c 2021-04-16 13:21:09.364524790 -0700 +@@ -138,7 +138,7 @@ + float sps = (1000000.0f / usPerRay) * (r->prefs.threadCount + remoteThreads); char rem[64]; - smartTime((msecTillFinished) / r->prefs.threadCount, rem); + smartTime((msecTillFinished) / (r->prefs.threadCount + remoteThreads), rem); - logr(info, "[%s%.0f%%%s] Ξs/path: %.02f, etf: %s, %.02lfMs/s %s \r", + logr(info, "[%s%.0f%%%s] us/path: %.02f, etf: %s, %.02lfMs/s %s \r", KBLU, |