diff --git a/.gitignore b/.gitignore index 7f54d09..7ea371e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /embree-3.6.0.tar.gz /embree-3.6.1.tar.gz /embree-3.7.0.tar.gz +/embree-3.8.0.tar.gz diff --git a/embree-raystream-filter.patch b/embree-raystream-filter.patch deleted file mode 100644 index 614e0dd..0000000 --- a/embree-raystream-filter.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru embree-2.13.0-orig/kernels/common/accel.cpp embree-2.13.0/kernels/common/accel.cpp ---- embree-2.13.0-orig/kernels/common/accel.cpp 2016-11-21 01:12:33.000000000 -0800 -+++ embree-2.13.0/kernels/common/accel.cpp 2017-01-28 20:47:13.979363972 -0800 -@@ -54,4 +54,13 @@ - - Accel::IntersectorN::IntersectorN (IntersectFuncN intersect, OccludedFuncN occluded, const char* name) - : intersect(intersect), occluded(occluded), name(name) {} -+ -+ RayStreamFilterFuncs::RayStreamFilterFuncs() -+ : filterAOS(nullptr), filterSOA(nullptr), filterSOP(nullptr) {} -+ -+ RayStreamFilterFuncs::RayStreamFilterFuncs(void (*ptr) ()) -+ : filterAOS((filterAOS_func) ptr), filterSOA((filterSOA_func) ptr), filterSOP((filterSOP_func) ptr) {} -+ -+ RayStreamFilterFuncs::RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop) -+ : filterAOS(aos), filterAOP(aop), filterSOA(soa), filterSOP(sop) {} - } -diff -ru embree-2.13.0-orig/kernels/common/accel.h embree-2.13.0/kernels/common/accel.h ---- embree-2.13.0-orig/kernels/common/accel.h 2016-11-21 01:12:33.000000000 -0800 -+++ embree-2.13.0/kernels/common/accel.h 2017-01-28 20:49:01.041013824 -0800 -@@ -454,15 +454,9 @@ - - struct RayStreamFilterFuncs - { -- __forceinline RayStreamFilterFuncs() -- : filterAOS(nullptr), filterSOA(nullptr), filterSOP(nullptr) {} -- -- __forceinline RayStreamFilterFuncs(void (*ptr) ()) -- : filterAOS((filterAOS_func) ptr), filterSOA((filterSOA_func) ptr), filterSOP((filterSOP_func) ptr) {} -- -- __forceinline RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop) -- : filterAOS(aos), filterAOP(aop), filterSOA(soa), filterSOP(sop) {} -- -+ RayStreamFilterFuncs(); -+ RayStreamFilterFuncs(void (*ptr) ()); -+ RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop); - public: - filterAOS_func filterAOS; - filterAOP_func filterAOP; diff --git a/embree.spec b/embree.spec index f93b7c5..fee4afe 100644 --- a/embree.spec +++ b/embree.spec @@ -6,15 +6,15 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: embree -Version: 3.7.0 +Version: 3.8.0 %if %{with_prerelease} %if %{with_snapshot} -Release: 2.%{shortcommit}%{?dist} +Release: 1.%{shortcommit}%{?dist} %else -Release: 0.2.%{prerelease}%{?dist} +Release: 0.1.%{prerelease}%{?dist} %endif %else -Release: 2%{?dist} +Release: 1%{?dist} %endif Summary: Collection of high-performance ray tracing kernels developed at Intel @@ -31,21 +31,21 @@ Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{versio %endif BuildRequires: cmake -BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: giflib-devel -BuildRequires: glfw-devel BuildRequires: ispc -BuildRequires: libXmu-devel +BuildRequires: pkgconfig(freeglut) +BuildRequires: pkgconfig(glfw3) +BuildRequires: pkgconfig(xmu) # Optional dependencies needed for examples %if %{with_examples} -BuildRequires: OpenImageIO-devel -BuildRequires: libjpeg-turbo-devel -BuildRequires: openjpeg2-devel +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(OpenImageIO) %endif -BuildRequires: tbb-devel +BuildRequires: pkgconfig(tbb) # Use 64bit architectures because of SSE2 and up ExclusiveArch: x86_64 @@ -123,6 +123,9 @@ rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt %endif %changelog +* Wed Feb 05 2020 Fedora Release Monitoring - 3.8.0-1 +- Update to 3.8.0 (#1792573) + * Tue Jan 28 2020 Fedora Release Engineering - 3.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6ace1b8..f840178 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (embree-3.7.0.tar.gz) = 03b7395d56e1837e33f49fc1dc4bf917ce28bfdb74dbabded6429ce9c1985a6e14e5e16d4390da2457b9e6a64353538286463fb957e90d9a087bf9119e8fa494 +SHA512 (embree-3.8.0.tar.gz) = d83e903330b269b5e33fedd4cfcbe42deee1781d05659cd80a9da191dbcb1a7ec360685847452f304cba805e62a1d517efff95c37faeecf5659c64117ae7978e