diff --git a/mingw-w64-embree/001-build-fixes.patch b/mingw-w64-embree/001-build-fixes.patch index 2721de9bde..74b4a35375 100644 --- a/mingw-w64-embree/001-build-fixes.patch +++ b/mingw-w64-embree/001-build-fixes.patch @@ -71,17 +71,14 @@ SET(COMMON_CXX_FLAGS "") SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /EHsc") # catch C++ exceptions only and extern "C" functions never throw a C++ exception -@@ -91,8 +91,9 @@ - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default +@@ -92,6 +92,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-tree-vectorize") # disable auto vectorizer -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") # perform extra security checks for some standard library calls -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") # perform extra security checks for some standard library calls ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES") IF (EMBREE_STACK_PROTECTOR) -+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") # perform extra security checks for some standard library calls SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector") # protects against return address overrides ENDIF() - MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file) @@ -132,8 +133,8 @@ ELSE(APPLE) IF (NOT EMBREE_ADDRESS_SANITIZER) # for address sanitizer this causes link errors @@ -95,17 +92,14 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now") # re-arranges data sections to increase security --- a/common/cmake/gnu.cmake +++ b/common/cmake/gnu.cmake -@@ -52,8 +52,9 @@ - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default +@@ -53,6 +53,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-tree-vectorize") # disable auto vectorizer --SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") # perform extra security checks for some standard library calls + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") # perform extra security checks for some standard library calls +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES") IF (EMBREE_STACK_PROTECTOR) -+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") # perform extra security checks for some standard library calls SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector") # protects against return address overrides ENDIF() - MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file) @@ -93,10 +94,12 @@ ELSE(APPLE) IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU") diff --git a/mingw-w64-embree/PKGBUILD b/mingw-w64-embree/PKGBUILD index 9ae03bb7bf..58142f1f0b 100644 --- a/mingw-w64-embree/PKGBUILD +++ b/mingw-w64-embree/PKGBUILD @@ -4,22 +4,21 @@ _realname=embree pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.13.5 -pkgrel=1 +pkgrel=2 pkgdesc="High Performance Ray Tracing Kernels Intel Corporation (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://www.embree.org/" license=("Apache 2.0") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-tbb" - "${MINGW_PACKAGE_PREFIX}-libssp") + "${MINGW_PACKAGE_PREFIX}-tbb") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc") options=('strip' 'buildflags' '!debug') source=(${_realname}-${pkgver}.tar.gz::https://github.com/embree/embree/archive/v${pkgver}.tar.gz 001-build-fixes.patch) sha256sums=('b8c22d275d9128741265537c559d0ea73074adbf2f2b66b0a766ca52c52d665b' - '79d6d406f54b202f68935512491944599365aa7a85a717caab78304fcd87cac0') + '5ee91fb07f373b3a83f26f9f9fa3ab80661a9f0b7e1c3f4a23eb572f631fa37f') prepare() { cd ${srcdir}/${_realname}-${pkgver}