PR#3: testing enabled - rpms/embree - src.fedoraproject.org

rpms / embree

#3 testing enabled

Merged a year ago by luya. Opened a year ago by aekoroglu.

rpms/ aekoroglu/embree rawhide into rawhide

testing enabled

aekoroglu • a year ago

c295358

embree.spec

file modified

+17 -22

		`@@ -1,7 +1,6 @@`
		`%global __cmake_in_source_build 1`

		`%global with_snapshot 0`
		`- %global with_examples 0`
		`#%%global prerelease beta`
		`#%%global commit 40b9aca2668f443cae6bfbfa7cc5a354f1087011`
		`#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})`
		`@@ -20,6 +19,9 @@`
		`Source: https://github.com/%{name}/%{name}/archive/v%{version}%{?prerelease:%{-prerelease}.0}.tar.gz#/%{name}-%{version}%{?prerelease:-%{prerelease}.0}.tar.gz`
		`%endif`

		`+ # https://github.com/embree/embree/pull/438`
		`+ Patch0: imgui_aarch64-sse.patch`
		`+`
		`BuildRequires: cmake`
		`BuildRequires: gcc-c++`
		`BuildRequires: giflib-devel`
		`@@ -29,14 +31,9 @@`
		`BuildRequires: pkgconfig(glut)`
		`BuildRequires: pkgconfig(glfw3)`
		`BuildRequires: pkgconfig(xmu)`
		`- # Optional dependencies needed for examples`
		`- %if %{with_examples}`
		`BuildRequires: pkgconfig(libjpeg)`
		`- BuildRequires: pkgconfig(libopenjp2)`
		`BuildRequires: pkgconfig(libpng)`
		`- BuildRequires: pkgconfig(libtiff-4)`
		`BuildRequires: pkgconfig(OpenImageIO)`
		`- %endif`
		`BuildRequires: pkgconfig(tbb)`

		`# Embree only supports these architectures with SSE2 and up enabled`
		`@@ -52,16 +49,7 @@`

		`%description devel`
		`The %{name}-devel package contains libraries and header files for`
		`- applications that use %{name}.`
		`-`
		`- %if %{with_examples}`
		`- %package examples`
		`- Summary: Example of application using %{name}`
		`- Requires: %{name}%{?_isa} = %{version}-%{release}`
		`-`
		`- %description examples`
		`- The %{name}-examples package contains sample binaries using %{name}.`
		`- %endif`
		`+ applications that use %{name}.`

		`%prep`
		`%if %{with_snapshot}`
		`@@ -81,17 +69,24 @@`
		`%if %{with ispc}`
		`-DEMBREE_ISPC_SUPPORT=ON \`
		`%endif`
		`+ -DEMBREE_MAX_ISA=NONE \`
		`%ifarch x86_64`
		`-DEMBREE_ISA_SSE2=ON \`
		`-DEMBREE_ISA_SSE4=ON \`
		`-DEMBREE_ISA_AVX=ON \`
		`-DEMBREE_ISA_AVX2=ON \`
		`%else`
		`+ -DEMBREE_ARM=ON \`
		`-DEMBREE_ISA_NEON=ON \`
		`%endif`
		`- -DEMBREE_TUTORIALS=OFF`
		`+ -DEMBREE_TUTORIALS=ON \`
		`+ -DEMBREE_TESTING=ON \`
		`+ -DEMBREE_STATIC_LIB=OFF`
		`%cmake_build`

		`+ %check`
		`+ %ctest`
		`+`
		`%install`
		`%cmake_install`

		`@@ -102,6 +97,11 @@`
		`mv %{buildroot}%{_docdir}/%{name}4 %{buildroot}%{_docdir}/%{name}`
		`rm %{buildroot}%{_docdir}/%{name}/LICENSE.txt`

		`+ # Remove the testing products`
		`+ rm -r %{buildroot}%{_prefix}/src`
		`+ rm -r %{buildroot}%{_bindir}/models`
		`+ rm %{buildroot}%{_bindir}/embree_*`
		`+`
		`%files`
		`%license LICENSE.txt`
		`%doc README.md CHANGELOG.md readme.pdf third-party-programs{,-TBB,-DPCPP,-OIDN,-oneAPI-DPCPP}.txt`
		`@@ -113,10 +113,5 @@`
		`%{_includedir}/%{name}4/`
		`%{_libdir}/cmake/%{name}-%{version}/`

		`- %if %{with_examples}`
		`- %files examples`
		`- %{_bindir}/%{name}4/*`
		`- %endif`
		`-`
		`%changelog`
		`%autochangelog`

imgui_aarch64-sse.patch

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ --- a/tutorials/common/imgui/CMakeLists.txt 2023-03-20 21:00:27.644317977 +0200`
		`+ +++ b/tutorials/common/imgui/CMakeLists.txt 2023-03-20 21:04:39.341450899 +0200`
		`+ @@ -15,6 +15,6 @@`
		`+ SET_PROPERTY(TARGET imgui PROPERTY FOLDER tutorials/common)`
		`+ SET_PROPERTY(TARGET imgui APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")`
		`+`
		`+ -if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")`
		`+ +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")`
		`+ TARGET_COMPILE_DEFINITIONS(imgui PUBLIC IMGUI_DISABLE_SSE)`
		`+ endif()`