diff --git a/media-libs/embree/embree-3.12.1.recipe b/media-libs/embree/embree-3.12.2.recipe similarity index 92% rename from media-libs/embree/embree-3.12.1.recipe rename to media-libs/embree/embree-3.12.2.recipe index 69979e3e3..8fa501295 100644 --- a/media-libs/embree/embree-3.12.1.recipe +++ b/media-libs/embree/embree-3.12.2.recipe @@ -8,16 +8,16 @@ processors with support for SSE, AVX, AVX2, and AVX-512. Embree \ supports runtime code selection to choose the traversal and build \ algorithms that best matches the instruction set of your CPU" HOMEPAGE="https://embree.github.io" -COPYRIGHT="2013-2020 Intel Corporation" +COPYRIGHT="2013-2021 Intel Corporation" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/embree/embree/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="0c9e760b06e178197dd29c9a54f08ff7b184b0487b5ba8b8be058e219e23336e" +CHECKSUM_SHA256="22a527622497e07970e733f753cc9c10b2bd82c3b17964e4f71a5fd2cdfca210" SOURCE_FILENAME="embree-v$portVersion.tar.gz" PATCHES="embree-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="!x86" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" diff --git a/media-libs/embree/patches/embree-3.12.1.patchset b/media-libs/embree/patches/embree-3.12.2.patchset similarity index 93% rename from media-libs/embree/patches/embree-3.12.1.patchset rename to media-libs/embree/patches/embree-3.12.2.patchset index 404d48e87..3a8d8641d 100644 --- a/media-libs/embree/patches/embree-3.12.1.patchset +++ b/media-libs/embree/patches/embree-3.12.2.patchset @@ -1,11 +1,11 @@ -From 4c5ad4e7ddc1a9c1ecf77f43efcf243bc63bed0b Mon Sep 17 00:00:00 2001 +From 022c1e9ca29838bd76ab15ef52d21dcc31b0a1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 24 Aug 2019 09:32:55 +0200 Subject: Applied patches diff --git a/common/math/math.h b/common/math/math.h -index 5af0691..eb7e522 100644 +index 8403f4e..aa5d8e7 100644 --- a/common/math/math.h +++ b/common/math/math.h @@ -166,7 +166,10 @@ namespace embree @@ -33,7 +33,7 @@ index 5af0691..eb7e522 100644 #endif diff --git a/common/sys/alloc.cpp b/common/sys/alloc.cpp -index 4e89282..bafa02f 100644 +index 1bc30fe..930f7d9 100644 --- a/common/sys/alloc.cpp +++ b/common/sys/alloc.cpp @@ -240,6 +240,7 @@ namespace embree @@ -53,7 +53,7 @@ index 4e89282..bafa02f 100644 /* fallback to 4k pages */ void* ptr = (char*) mmap(0, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); diff --git a/common/sys/array.h b/common/sys/array.h -index 6f6f98e..53eca57 100644 +index 3da2a14..b470508 100644 --- a/common/sys/array.h +++ b/common/sys/array.h @@ -139,7 +139,7 @@ namespace embree @@ -66,7 +66,7 @@ index 6f6f98e..53eca57 100644 __forceinline const Ty& operator[](const size_t i) const { assert(i #include diff --git a/kernels/builders/bvh_builder_sah.h b/kernels/builders/bvh_builder_sah.h -index 79ccdf9..6451594 100644 +index fff4bf2..137729b 100644 --- a/kernels/builders/bvh_builder_sah.h +++ b/kernels/builders/bvh_builder_sah.h @@ -43,7 +43,7 @@ namespace embree @@ -151,17 +151,17 @@ index 79ccdf9..6451594 100644 if (RTC_BUILD_ARGUMENTS_HAS(settings,maxLeafSize )) maxLeafSize = settings.maxLeafSize; if (RTC_BUILD_ARGUMENTS_HAS(settings,traversalCost )) travCost = settings.traversalCost; -- -2.28.0 +2.30.0 -From 94bf7fdde66dc3021eb01e8a5632de069226288d Mon Sep 17 00:00:00 2001 +From 9467d9162b39f0e0701233f541d1fa0f915a2fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Tue, 5 Jan 2021 20:45:01 +0100 Subject: CPU count diff --git a/common/sys/sysinfo.cpp b/common/sys/sysinfo.cpp -index 13e58ce..272e00d 100644 +index a712fc6..ae2e632 100644 --- a/common/sys/sysinfo.cpp +++ b/common/sys/sysinfo.cpp @@ -10,6 +10,9 @@ @@ -174,7 +174,7 @@ index 13e58ce..272e00d 100644 //////////////////////////////////////////////////////////////////////////////// /// All Platforms -@@ -603,6 +606,10 @@ namespace embree +@@ -601,6 +604,10 @@ namespace embree #if defined(__MACOSX__) nThreads = sysconf(_SC_NPROCESSORS_ONLN); // does not work in Linux LXC container assert(nThreads); @@ -186,5 +186,5 @@ index 13e58ce..272e00d 100644 cpu_set_t set; if (pthread_getaffinity_np(pthread_self(), sizeof(set), &set) == 0) -- -2.28.0 +2.30.0