* [gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
@ 2022-08-11 7:33 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2022-08-11 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 8736545cf858627f6f1725da4bcf375e7216a5bb
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 15:57:12 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:33:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8736545c
media-libs/embree: Version bump to 3.13.4
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/embree/Manifest | 1 +
media-libs/embree/embree-3.13.4.ebuild | 133 +++++++++++++++++++++
.../files/embree-3.13.4-fix-openimageio-test.patch | 71 +++++++++++
3 files changed, 205 insertions(+)
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 9807f5532831..cf510251420e 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +1,4 @@
DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd
+DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild
new file mode 100644
index 000000000000..7d71777f2596
--- /dev/null
+++ b/media-libs/embree/embree-3.13.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ >=media-libs/glfw-3.2.1
+ virtual/opengl
+ ispc? ( dev-lang/ispc )
+ tbb? ( dev-cpp/tbb:= )
+ tutorial? (
+ media-libs/libjpeg-turbo
+ >=media-libs/libpng-1.6.34:0=
+ >=media-libs/openimageio-1.8.7:0=
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.13.4-fix-openimageio-test.patch
+)
+
+pkg_setup() {
+ CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+ WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable RPM package building
+ sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # NOTE: You can make embree accept custom CXXFLAGS by turning off
+ # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+ # any "m*" compile flags. This is because embree builds modules for the
+ # different supported ISAs and picks the correct one at runtime.
+ # "m*" will pull in cpu instructions that shouldn't be in specific modules
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -m*
+
+ local mycmakeargs=(
+ # Currently Intel only host their test files on their internal network.
+ # So it seems like users can't easily get a hold of these and do
+ # regression testing on their own.
+ -DBUILD_TESTING:BOOL=OFF
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+ # default
+ -DEMBREE_BACKFACE_CULLING=OFF
+ -DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+ # default
+ -DEMBREE_FILTER_FUNCTION=ON
+ # default
+ -DEMBREE_GEOMETRY_CURVE=ON
+ # default
+ -DEMBREE_GEOMETRY_GRID=ON
+ # default
+ -DEMBREE_GEOMETRY_INSTANCE=ON
+ # default
+ -DEMBREE_GEOMETRY_POINT=ON
+ # default
+ -DEMBREE_GEOMETRY_QUAD=ON
+ # default
+ -DEMBREE_GEOMETRY_SUBDIVISION=ON
+ # default
+ -DEMBREE_GEOMETRY_TRIANGLE=ON
+ # default
+ -DEMBREE_GEOMETRY_USER=ON
+ # default
+ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+ # default
+ -DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+ # Set to NONE so we can manually switch on ISAs below
+ -DEMBREE_MAX_ISA:STRING="NONE"
+ -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+ -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+ -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+ -DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+ -DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+ -DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DEMBREE_ISPC_SUPPORT=$(usex ispc)
+ -DEMBREE_RAY_MASK=$(usex raymask)
+ # default
+ -DEMBREE_RAY_PACKETS=ON
+ -DEMBREE_STACK_PROTECTOR=$(usex ssp)
+ -DEMBREE_STATIC_LIB=OFF
+ -DEMBREE_STAT_COUNTERS=OFF
+ -DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+ -DEMBREE_TUTORIALS=$(usex tutorial))
+
+ # Disable asserts
+ append-cppflags -DNDEBUG
+
+ if use tutorial; then
+ mycmakeargs+=(
+ -DEMBREE_TUTORIALS_LIBJPEG=ON
+ -DEMBREE_TUTORIALS_LIBPNG=ON
+ -DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+ )
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch b/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch
new file mode 100644
index 000000000000..9c9893815bc7
--- /dev/null
+++ b/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch
@@ -0,0 +1,71 @@
+diff --git a/common/cmake/FindOpenImageIO.cmake b/common/cmake/FindOpenImageIO.cmake
+index 086b91183..5816f3bc5 100644
+--- a/common/cmake/FindOpenImageIO.cmake
++++ b/common/cmake/FindOpenImageIO.cmake
+@@ -53,6 +53,7 @@ SET(OPENIMAGEIO_HINTS
+ )
+ SET(OPENIMAGEIO_PATHS PATHS /usr/lib /usr/lib64 /lib /lib64)
+ FIND_LIBRARY(OPENIMAGEIO_LIBRARY OpenImageIO ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY OpenImageIO_Util ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
+
+ SET(OPENIMAGEIO_ROOT_LAST ${OPENIMAGEIO_ROOT} CACHE INTERNAL "Last value of OPENIMAGEIO_ROOT to detect changes")
+
+@@ -68,8 +69,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO
+
+ IF (OPENIMAGEIO_FOUND)
+ SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+- SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++ SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+ ENDIF()
+
+ MARK_AS_ADVANCED(OPENIMAGEIO_INCLUDE_DIR)
+ MARK_AS_ADVANCED(OPENIMAGEIO_LIBRARY)
++MARK_AS_ADVANCED(OPENIMAGEIO_UTIL_LIBRARY)
+diff --git a/common/cmake/clang.cmake b/common/cmake/clang.cmake
+index 01480ac73..4380823ed 100644
+--- a/common/cmake/clang.cmake
++++ b/common/cmake/clang.cmake
+@@ -86,7 +86,6 @@ ELSE()
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules
+diff --git a/common/cmake/dpcpp.cmake b/common/cmake/dpcpp.cmake
+index aecb35169..fcdfb4ce4 100644
+--- a/common/cmake/dpcpp.cmake
++++ b/common/cmake/dpcpp.cmake
+@@ -83,7 +83,6 @@ ELSE()
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules
+diff --git a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake
+index 1b2682d9e..cb96ecb64 100644
+--- a/common/cmake/gnu.cmake
++++ b/common/cmake/gnu.cmake
+@@ -44,7 +44,6 @@ IF (NOT APPLE)
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules
+diff --git a/common/cmake/intel.cmake b/common/cmake/intel.cmake
+index 2c8e86e6c..abdffba90 100644
+--- a/common/cmake/intel.cmake
++++ b/common/cmake/intel.cmake
+@@ -120,7 +120,6 @@ ELSE()
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-ansi-alias") # disables strict aliasing rules
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
@ 2023-05-01 15:15 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-01 15:15 UTC (permalink / raw
To: gentoo-commits
commit: a745fa9c26344a753e39289694f72b9375aaba1f
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Mon May 1 11:48:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 15:14:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a745fa9c
media-libs/embree: Bump to 3.13.5
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/embree/Manifest | 1 +
media-libs/embree/embree-3.13.5.ebuild | 134 +++++++++++++++++++++
.../files/embree-3.13.5-fix-openimageio-test.patch | 71 +++++++++++
3 files changed, 206 insertions(+)
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index a056b4c9a819..514a411dba17 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1 +1,2 @@
DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
+DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95
diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild
new file mode 100644
index 000000000000..7b1ffb2691e9
--- /dev/null
+++ b/media-libs/embree/embree-3.13.5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )
+ x86? ( cpu_flags_x86_sse2 )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ >=media-libs/glfw-3.2.1
+ virtual/opengl
+ ispc? ( dev-lang/ispc )
+ tbb? ( dev-cpp/tbb:= )
+ tutorial? (
+ media-libs/libjpeg-turbo
+ >=media-libs/libpng-1.6.34:0=
+ >=media-libs/openimageio-1.8.7:0=
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.patch
+)
+
+pkg_setup() {
+ CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+ WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable RPM package building
+ sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # NOTE: You can make embree accept custom CXXFLAGS by turning off
+ # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+ # any "m*" compile flags. This is because embree builds modules for the
+ # different supported ISAs and picks the correct one at runtime.
+ # "m*" will pull in cpu instructions that shouldn't be in specific modules
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -m*
+
+ local mycmakeargs=(
+ # Currently Intel only host their test files on their internal network.
+ # So it seems like users can't easily get a hold of these and do
+ # regression testing on their own.
+ -DBUILD_TESTING:BOOL=OFF
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+ # default
+ -DEMBREE_BACKFACE_CULLING=OFF
+ -DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+ # default
+ -DEMBREE_FILTER_FUNCTION=ON
+ # default
+ -DEMBREE_GEOMETRY_CURVE=ON
+ # default
+ -DEMBREE_GEOMETRY_GRID=ON
+ # default
+ -DEMBREE_GEOMETRY_INSTANCE=ON
+ # default
+ -DEMBREE_GEOMETRY_POINT=ON
+ # default
+ -DEMBREE_GEOMETRY_QUAD=ON
+ # default
+ -DEMBREE_GEOMETRY_SUBDIVISION=ON
+ # default
+ -DEMBREE_GEOMETRY_TRIANGLE=ON
+ # default
+ -DEMBREE_GEOMETRY_USER=ON
+ # default
+ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+ # default
+ -DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+ # Set to NONE so we can manually switch on ISAs below
+ -DEMBREE_MAX_ISA:STRING="NONE"
+ -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+ -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+ -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+ -DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+ -DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+ -DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DEMBREE_ISPC_SUPPORT=$(usex ispc)
+ -DEMBREE_RAY_MASK=$(usex raymask)
+ # default
+ -DEMBREE_RAY_PACKETS=ON
+ -DEMBREE_STACK_PROTECTOR=$(usex ssp)
+ -DEMBREE_STATIC_LIB=OFF
+ -DEMBREE_STAT_COUNTERS=OFF
+ -DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+ -DEMBREE_TUTORIALS=$(usex tutorial))
+
+ # Disable asserts
+ append-cppflags -DNDEBUG
+
+ if use tutorial; then
+ mycmakeargs+=(
+ -DEMBREE_TUTORIALS_LIBJPEG=ON
+ -DEMBREE_TUTORIALS_LIBPNG=ON
+ -DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+ )
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-libs/embree/files/embree-3.13.5-fix-openimageio-test.patch b/media-libs/embree/files/embree-3.13.5-fix-openimageio-test.patch
new file mode 100644
index 000000000000..b5763e8c5dda
--- /dev/null
+++ b/media-libs/embree/files/embree-3.13.5-fix-openimageio-test.patch
@@ -0,0 +1,71 @@
+diff --git a/common/cmake/FindOpenImageIO.cmake b/common/cmake/FindOpenImageIO.cmake
+index 086b91183..5816f3bc5 100644
+--- a/common/cmake/FindOpenImageIO.cmake
++++ b/common/cmake/FindOpenImageIO.cmake
+@@ -53,6 +53,7 @@ SET(OPENIMAGEIO_HINTS
+ )
+ SET(OPENIMAGEIO_PATHS PATHS /usr/lib /usr/lib64 /lib /lib64)
+ FIND_LIBRARY(OPENIMAGEIO_LIBRARY OpenImageIO ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY OpenImageIO_Util ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
+
+ SET(OPENIMAGEIO_ROOT_LAST ${OPENIMAGEIO_ROOT} CACHE INTERNAL "Last value of OPENIMAGEIO_ROOT to detect changes")
+
+@@ -68,8 +69,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO
+
+ IF (OPENIMAGEIO_FOUND)
+ SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+- SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++ SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+ ENDIF()
+
+ MARK_AS_ADVANCED(OPENIMAGEIO_INCLUDE_DIR)
+ MARK_AS_ADVANCED(OPENIMAGEIO_LIBRARY)
++MARK_AS_ADVANCED(OPENIMAGEIO_UTIL_LIBRARY)
+diff --git a/common/cmake/clang.cmake b/common/cmake/clang.cmake
+index 01480ac73..4380823ed 100644
+--- a/common/cmake/clang.cmake
++++ b/common/cmake/clang.cmake
+@@ -86,7 +86,6 @@ ELSE()
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules
+diff --git a/common/cmake/dpcpp.cmake b/common/cmake/dpcpp.cmake
+index aecb35169..fcdfb4ce4 100644
+--- a/common/cmake/dpcpp.cmake
++++ b/common/cmake/dpcpp.cmake
+@@ -83,7 +83,6 @@ ELSE()
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules
+diff --git a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake
+index 1b2682d9e..cb96ecb64 100644
+--- a/common/cmake/gnu.cmake
++++ b/common/cmake/gnu.cmake
+@@ -44,7 +44,6 @@ IF (NOT APPLE)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ ENDIF()
+
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules
+diff --git a/common/cmake/intel.cmake b/common/cmake/intel.cmake
+index 2c8e86e6c..abdffba90 100644
+--- a/common/cmake/intel.cmake
++++ b/common/cmake/intel.cmake
+@@ -120,7 +120,6 @@ ELSE()
+ ENDIF()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-ansi-alias") # disables strict aliasing rules
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
@ 2023-05-09 17:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-09 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 6e16952c578fdc0e662e2986bf8139df0d8c3530
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Mon May 8 12:59:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 9 17:50:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e16952c
media-libs/embree: Fix arches and REQUIRED_USE
Embree does not support anything else than amd64 and arm64.
The other arches will not compile.
arm64 needs a patch to work on linux in the current 3.x.x release
Closes: https://bugs.gentoo.org/851705
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/embree/embree-3.13.5.ebuild | 12 ++---
.../embree/files/embree-3.13.5-fix-arm64.patch | 53 ++++++++++++++++++++++
2 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild
index 7b1ffb2691e9..1f94e528f380 100644
--- a/media-libs/embree/embree-3.13.5.ebuild
+++ b/media-libs/embree/embree-3.13.5.ebuild
@@ -11,13 +11,11 @@ SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+KEYWORDS="-* ~amd64 ~arm64"
+X86_CPU_FLAGS=( sse2 sse4_2 avx avx2 avx512dq )
CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
-# Let's be explicit here even though we could simplify it.
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )
- x86? ( cpu_flags_x86_sse2 )"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]}"
+REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )"
BDEPEND="
virtual/pkgconfig
@@ -39,6 +37,7 @@ DOCS=( CHANGELOG.md README.md readme.pdf )
PATCHES=(
"${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.patch
+ "${FILESDIR}"/${PN}-3.13.5-fix-arm64.patch
)
pkg_setup() {
@@ -106,6 +105,7 @@ src_configure() {
-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+ # TODO look into neon 2x support
-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
diff --git a/media-libs/embree/files/embree-3.13.5-fix-arm64.patch b/media-libs/embree/files/embree-3.13.5-fix-arm64.patch
new file mode 100644
index 000000000000..ae6e39c43e75
--- /dev/null
+++ b/media-libs/embree/files/embree-3.13.5-fix-arm64.patch
@@ -0,0 +1,53 @@
+Based on: https://github.com/embree/embree/commit/82ca6b5ccb7abe0403a658a0e079926478f04cb1
+Tested in: https://bugs.gentoo.org/851705
+
+Without this patch, it will only build on ARM Mac computers
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e807351401..e8b08b1247 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,11 +160,13 @@ OPTION(EMBREE_MIN_WIDTH "Enables min-width feature to enlarge curve and point th
+ # Platform detection and defaults
+ ##############################################################
+
+-IF (APPLE)
+- IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64"))
+- MESSAGE(STATUS "Building for Apple silicon")
+- SET(EMBREE_ARM ON)
+- ENDIF()
++# detect ARM compilation
++IF (APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64"))
++ MESSAGE(STATUS "Building for Apple silicon")
++ SET(EMBREE_ARM ON)
++ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
++ MESSAGE(STATUS "Building for AArch64")
++ SET(EMBREE_ARM ON)
+ ENDIF()
+
+ SET(EMBREE_TASKING_SYSTEM "TBB" CACHE STRING "Selects tasking system")
+diff --git a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake
+index f36d79ca25..365212bdda 100644
+--- a/common/cmake/gnu.cmake
++++ b/common/cmake/gnu.cmake
+@@ -26,9 +26,12 @@ IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
+ ENDIF()
+
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++
+ IF (EMBREE_ARM)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char") # treat 'char' as 'signed char'
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions") # allow lax vector type conversions
+ ENDIF (EMBREE_ARM)
++
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") # enables most warnings
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security") # enables string format vulnerability warnings
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess") # disables clearing an object of type ‘XXX’ with no trivial copy-assignment; use assignment or value-initialization instead
+@@ -89,7 +92,6 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")
+ IF (APPLE)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7") # makes sure code runs on older MacOSX versions
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") # link against libc++ which supports C++11 features
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions")
+ ELSE(APPLE)
+ IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # issues link error for undefined symbols in shared library
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
@ 2024-03-25 18:57 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-03-25 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 853f778d6113be2e57db1d9927b1ded860ff3580
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Wed Jan 17 11:39:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 18:54:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=853f778d
media-libs/embree: Bump to 4.3.0
Closes: https://bugs.gentoo.org/912279
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/embree/Manifest | 1 +
media-libs/embree/embree-4.3.0.ebuild | 118 ++++++++++++
.../embree-4.3.0-dont-install-tutorials.patch | 203 +++++++++++++++++++++
3 files changed, 322 insertions(+)
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 514a411dba17..3478edbe8dae 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,2 +1,3 @@
DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95
+DIST embree-4.3.0.tar.gz 71028239 BLAKE2B 7834ed7851d36c32ce3e88a3ddb02e8316422699ec78a662ef81ef0eb9f66b260ce2f7438739531e2b63f817a931a19ba35da156e8e09a42a78e6c077314e615 SHA512 8f61401175464b34243e899464f44a196b520c08e1c44a417bf980cfa7b191859bbaab1029278123654e5ffb91e2f8a85af1d881affddcc7e344a7e8a8066262
diff --git a/media-libs/embree/embree-4.3.0.ebuild b/media-libs/embree/embree-4.3.0.ebuild
new file mode 100644
index 000000000000..05a813da049f
--- /dev/null
+++ b/media-libs/embree/embree-4.3.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="-* ~amd64 ~arm64"
+X86_CPU_FLAGS=( sse2 sse4_2 avx avx2 avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="compact-polys ispc +raymask ssp +tbb test ${CPU_FLAGS[@]}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ispc? ( dev-lang/ispc )
+ tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+ "${FILESDIR}"/embree-4.3.0-dont-install-tutorials.patch
+)
+
+pkg_setup() {
+ CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+ WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable RPM package building
+ sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # NOTE: You can make embree accept custom CXXFLAGS by turning off
+ # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+ # any "m*" compile flags. This is because embree builds modules for the
+ # different supported ISAs and picks the correct one at runtime.
+ # "m*" will pull in cpu instructions that shouldn't be in specific modules
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -m*
+
+ # https://bugs.gentoo.org/910164
+ tc-is-clang && filter-lto
+
+ local mycmakeargs=(
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+ # Default culling settings for Blender
+ # (Cycles will not render correctly without these)
+ # Some Embree tests will fail with these settings though...
+ -DEMBREE_BACKFACE_CULLING=OFF
+ -DEMBREE_BACKFACE_CULLING_CURVES=ON
+ -DEMBREE_BACKFACE_CULLING_SPHERES=ON
+
+ -DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+ # Make sure that we are using our custom compilie flags
+ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+
+ # Set to NONE so we can manually switch on ISAs below
+ -DEMBREE_MAX_ISA:STRING="NONE"
+ -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+ -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+ -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+ # TODO look into neon 2x support
+ -DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+ -DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+ -DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DEMBREE_ISPC_SUPPORT=$(usex ispc)
+ -DEMBREE_RAY_MASK=$(usex raymask)
+
+ -DEMBREE_STACK_PROTECTOR=$(usex ssp)
+ -DEMBREE_STATIC_LIB=OFF
+ -DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+ # Tutorial binaries are required by the tests
+ -DEMBREE_TUTORIALS=$(usex test)
+ -DEMBREE_ZIP_MODE=OFF
+ )
+
+ # Disable asserts
+ append-cppflags -DNDEBUG
+
+ if use test; then
+ mycmakeargs+=(
+ -DBUILD_TESTING=ON
+ -DEMBREE_TESTING_INSTALL_TESTS=OFF
+ -DEMBREE_TESTING_INTENSITY=4
+ # These tutorials are not used by the default tests
+ -DEMBREE_TUTORIALS_GLFW=OFF
+ -DEMBREE_TUTORIALS_INSTALL=OFF
+ -DEMBREE_TUTORIALS_LIBJPEG=OFF
+ -DEMBREE_TUTORIALS_LIBPNG=OFF
+ -DEMBREE_TUTORIALS_OPENIMAGEIO=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-libs/embree/files/embree-4.3.0-dont-install-tutorials.patch b/media-libs/embree/files/embree-4.3.0-dont-install-tutorials.patch
new file mode 100644
index 000000000000..8643c7168a71
--- /dev/null
+++ b/media-libs/embree/files/embree-4.3.0-dont-install-tutorials.patch
@@ -0,0 +1,203 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c6750758f..6df7d2f34 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,7 +95,8 @@ IF (BUILD_DOC)
+ ADD_SUBDIRECTORY(doc)
+ ENDIF()
+
+-OPTION(EMBREE_TUTORIALS "Enable to build Embree tutorials" ON)
++OPTION(EMBREE_TUTORIALS "Enable to build Embree tutorials" ON)
++OPTION(EMBREE_TUTORIALS_INSTALL "Enable to include the built tutorials in the Embree package" ON)
+
+ ##############################################################
+ # Embree configuration
+diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
+index f7a182f7f..92ac45de0 100644
+--- a/common/cmake/package.cmake
++++ b/common/cmake/package.cmake
+@@ -145,7 +145,7 @@ ENDIF()
+ # Install Models
+ ##############################################################
+
+-IF (EMBREE_TUTORIALS)
++IF (EMBREE_TUTORIALS AND EMBREE_TUTORIALS_INSTALL)
+ INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+ ENDIF()
+
+diff --git a/common/cmake/tutorial.cmake b/common/cmake/tutorial.cmake
+index 0f23d0204..cba0c4b13 100644
+--- a/common/cmake/tutorial.cmake
++++ b/common/cmake/tutorial.cmake
+@@ -9,7 +9,9 @@ MACRO (ADD_TUTORIAL TUTORIAL_NAME)
+ TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME} embree image tutorial noise ${ADDITIONAL_LIBRARIES})
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME} PROPERTY FOLDER tutorials/single)
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME} APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+- INSTALL(TARGETS embree_${TUTORIAL_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_${TUTORIAL_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ ENDIF ()
+ SIGN_TARGET(embree_${TUTORIAL_NAME})
+ ENDMACRO ()
+
+@@ -21,7 +23,9 @@ MACRO (ADD_TUTORIAL_SYCL TUTORIAL_NAME)
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl PROPERTY FOLDER tutorials/sycl)
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST} ${CMAKE_CXX_FLAGS_SYCL}")
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl APPEND PROPERTY LINK_FLAGS "${CMAKE_LINK_FLAGS_SYCL}")
+- INSTALL(TARGETS embree_${TUTORIAL_NAME}_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
++ IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_${TUTORIAL_NAME}_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
++ ENDIF ()
+ SIGN_TARGET(embree_${TUTORIAL_NAME}_sycl)
+ ENDIF()
+ ENDMACRO ()
+@@ -32,7 +36,9 @@ MACRO (ADD_TUTORIAL_ISPC TUTORIAL_NAME)
+ TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME}_ispc embree image tutorial_ispc noise noise_ispc)
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_ispc PROPERTY FOLDER tutorials/ispc)
+ SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_ispc APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+- INSTALL(TARGETS embree_${TUTORIAL_NAME}_ispc DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_${TUTORIAL_NAME}_ispc DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ ENDIF ()
+ SIGN_TARGET(embree_${TUTORIAL_NAME}_ispc)
+ ENDIF()
+ ENDMACRO ()
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index 122dae2e4..96a69d17e 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -4,7 +4,9 @@
+ include(CMakeDependentOption)
+
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/README.md.in" "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+-INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md" DESTINATION "src" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md" DESTINATION "src" COMPONENT examples)
++ENDIF()
+
+ ADD_SUBDIRECTORY(common/image)
+ CMAKE_DEPENDENT_OPTION(EMBREE_TUTORIALS_GLFW "Enables GLFW usage in tutorials. When disabled tutorial can only render to disk." ON "EMBREE_TUTORIALS" OFF)
+diff --git a/tutorials/bvh_access/CMakeLists.txt b/tutorials/bvh_access/CMakeLists.txt
+index 3bc801d24..1b7fa1fb2 100644
+--- a/tutorials/bvh_access/CMakeLists.txt
++++ b/tutorials/bvh_access/CMakeLists.txt
+@@ -8,9 +8,11 @@ TARGET_LINK_LIBRARIES(embree_bvh_access embree math sys tasking tutorial)
+
+ SET_PROPERTY(TARGET embree_bvh_access PROPERTY FOLDER tutorials/single)
+ SET_PROPERTY(TARGET embree_bvh_access APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+-INSTALL(TARGETS embree_bvh_access DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_bvh_access DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ENDIF()
+ SIGN_TARGET(embree_bvh_access)
+
+ ENDIF()
+
+-ADD_EMBREE_TEST_ECS(bvh_access embree_bvh_access NO_REFERENCE NO_ISPC NO_SYCL)
+\ No newline at end of file
++ADD_EMBREE_TEST_ECS(bvh_access embree_bvh_access NO_REFERENCE NO_ISPC NO_SYCL)
+diff --git a/tutorials/convert/CMakeLists.txt b/tutorials/convert/CMakeLists.txt
+index 5c1b7795d..6730bc96d 100644
+--- a/tutorials/convert/CMakeLists.txt
++++ b/tutorials/convert/CMakeLists.txt
+@@ -5,5 +5,7 @@ ADD_EXECUTABLE(embree_convert ../../kernels/embree.rc convert.cpp distribution1d
+ TARGET_LINK_LIBRARIES(embree_convert scenegraph image tasking)
+ SET_PROPERTY(TARGET embree_convert PROPERTY FOLDER tutorials/single)
+ SET_PROPERTY(TARGET embree_convert APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+-INSTALL(TARGETS embree_convert DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_convert DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ENDIF()
+ SIGN_TARGET(embree_convert)
+diff --git a/tutorials/embree_info/CMakeLists.txt b/tutorials/embree_info/CMakeLists.txt
+index fa8b74b89..6d10279ff 100644
+--- a/tutorials/embree_info/CMakeLists.txt
++++ b/tutorials/embree_info/CMakeLists.txt
+@@ -18,8 +18,10 @@ ADD_EXECUTABLE(embree_info embree_info.cpp)
+ TARGET_LINK_LIBRARIES(embree_info embree)
+
+ SET_PROPERTY(TARGET embree_info PROPERTY FOLDER tutorials/single)
+-INSTALL(TARGETS embree_info DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+-#INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DESTINATION "src" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_info DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ #INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DESTINATION "src" COMPONENT examples)
++ENDIF()
+
+ IF (EMBREE_SYCL_SUPPORT)
+ SET_PROPERTY(TARGET embree_info APPEND PROPERTY COMPILE_FLAGS "-fsycl -Xclang -fsycl-allow-func-ptr -fsycl-targets=spir64")
+@@ -31,4 +33,4 @@ IF (COMMAND SIGN_TARGET)
+ SIGN_TARGET(embree_info)
+ ENDIF()
+
+-ENDIF()
+\ No newline at end of file
++ENDIF()
+diff --git a/tutorials/embree_tests/CMakeLists.txt b/tutorials/embree_tests/CMakeLists.txt
+index ab62b1954..b3647bc2d 100644
+--- a/tutorials/embree_tests/CMakeLists.txt
++++ b/tutorials/embree_tests/CMakeLists.txt
+@@ -40,8 +40,10 @@ endif()
+
+ SET_PROPERTY(TARGET embree_tests PROPERTY FOLDER tutorials)
+ SET_PROPERTY(TARGET embree_tests APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+-INSTALL(TARGETS embree_tests DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_tests DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ENDIF()
+ SIGN_TARGET(embree_tests)
+
+ ADD_EMBREE_TEST_ECS(embree_tests embree_tests NO_REFERENCE NO_ISPC NO_SYCL)
+-SET_EMBREE_TEST_PROPERTIES(embree_tests PROPERTIES TIMEOUT 7000)
+\ No newline at end of file
++SET_EMBREE_TEST_PROPERTIES(embree_tests PROPERTIES TIMEOUT 7000)
+diff --git a/tutorials/minimal/CMakeLists.txt b/tutorials/minimal/CMakeLists.txt
+index 962c2f4e8..4fa642544 100644
+--- a/tutorials/minimal/CMakeLists.txt
++++ b/tutorials/minimal/CMakeLists.txt
+@@ -16,8 +16,10 @@ ADD_EXECUTABLE(embree_minimal minimal.cpp)
+ TARGET_LINK_LIBRARIES(embree_minimal embree)
+
+ SET_PROPERTY(TARGET embree_minimal PROPERTY FOLDER tutorials/single)
+-INSTALL(TARGETS embree_minimal DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+-INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DESTINATION "src" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_minimal DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DESTINATION "src" COMPONENT examples)
++ENDIF()
+ IF (COMMAND SIGN_TARGET)
+ SIGN_TARGET(embree_minimal)
+ ENDIF()
+@@ -30,7 +32,9 @@ IF (EMBREE_SYCL_SUPPORT)
+ SET_PROPERTY(TARGET embree_minimal_sycl APPEND PROPERTY LINK_FLAGS "-fsycl -fsycl-targets=spir64")
+
+ SET_PROPERTY(TARGET embree_minimal_sycl PROPERTY FOLDER tutorials/sycl)
+- INSTALL(TARGETS embree_minimal_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
++ IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_minimal_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
++ ENDIF()
+ IF (COMMAND SIGN_TARGET)
+ SIGN_TARGET(embree_minimal_sycl)
+ ENDIF()
+diff --git a/tutorials/verify/CMakeLists.txt b/tutorials/verify/CMakeLists.txt
+index c12d9caf8..ec3c928d7 100644
+--- a/tutorials/verify/CMakeLists.txt
++++ b/tutorials/verify/CMakeLists.txt
+@@ -13,7 +13,9 @@ ADD_EXECUTABLE(embree_verify ../../kernels/embree.rc verify.cpp
+ TARGET_LINK_LIBRARIES(embree_verify ${EMBREE_LIBRARIES} sys math scenegraph embree tasking)
+ SET_PROPERTY(TARGET embree_verify PROPERTY FOLDER tutorials)
+ SET_PROPERTY(TARGET embree_verify APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+-INSTALL(TARGETS embree_verify DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++IF (EMBREE_TUTORIALS_INSTALL)
++ INSTALL(TARGETS embree_verify DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
++ENDIF()
+ SIGN_TARGET(embree_verify)
+
+ ADD_EMBREE_TEST_ECS(embree_verify embree_verify NO_REFERENCE NO_ISPC NO_SYCL ARGS --no-colors)
+@@ -39,4 +41,4 @@ ADD_EMBREE_TEST_ECS(embree_verify_benchmark embree_verify NO_REFERENCE NO_ISPC N
+ --skip .*_120.* --skip .*_1k.* --skip .*_10k.* --skip .*100k.* # skip all smaller build benchmarks
+ --run .*embree_reported_memory.*
+ )
+-SET_EMBREE_TEST_PROPERTIES(embree_verify_benchmarks PROPERTIES TIMEOUT 10800)
+\ No newline at end of file
++SET_EMBREE_TEST_PROPERTIES(embree_verify_benchmarks PROPERTIES TIMEOUT 10800)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-25 18:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-11 7:33 [gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-05-01 15:15 Sam James
2023-05-09 17:51 Sam James
2024-03-25 18:57 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox