summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-02-23 10:19:17 +0100
committerErich Eckner <git@eckner.net>2018-02-23 10:19:17 +0100
commitf792e2b34e8fce9d02e507af7ea9623cc8090fec (patch)
treeb2b5f66f9b2dbf8c2110c72cabeda18a34b7dc84
parenteb27c754bdd43a07669a8f8aa01f5d172efbe18c (diff)
downloadpackages-f792e2b34e8fce9d02e507af7ea9623cc8090fec.tar.xz
community/embree: adapt patch to new CMakeLists.txt s
-rw-r--r--community/embree/PKGBUILD6
-rw-r--r--community/embree/embree-2.16.4-32bit-compile-flags.patch35
-rw-r--r--community/embree/embree-2.17.3-32bit-compile-flags.patch39
3 files changed, 42 insertions, 38 deletions
diff --git a/community/embree/PKGBUILD b/community/embree/PKGBUILD
index 32d992ec..742d7f25 100644
--- a/community/embree/PKGBUILD
+++ b/community/embree/PKGBUILD
@@ -1,7 +1,7 @@
-source+=('embree-2.16.4-32bit-compile-flags.patch')
-sha256sums+=('ae9c42acc61ee262bbea012f071ef27e34b1cc895657e869f4d19af51d881bdf')
+source+=('embree-2.17.3-32bit-compile-flags.patch')
+sha256sums+=('b918095b300ad0532a9e217d4bf0a1c5fa5183596e63aab5547f93ce6aeb9aab')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i $srcdir/embree-2.16.4-32bit-compile-flags.patch
+ patch -p2 -i $srcdir/embree-2.17.3-32bit-compile-flags.patch
}
diff --git a/community/embree/embree-2.16.4-32bit-compile-flags.patch b/community/embree/embree-2.16.4-32bit-compile-flags.patch
deleted file mode 100644
index 02461917..00000000
--- a/community/embree/embree-2.16.4-32bit-compile-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rauN embree-2.16.4/common/algorithms/CMakeLists.txt embree-2.16.4-32bit-compile-flags/common/algorithms/CMakeLists.txt
---- embree-2.16.4/common/algorithms/CMakeLists.txt 2017-06-28 15:11:17.000000000 +0200
-+++ embree-2.16.4-32bit-compile-flags/common/algorithms/CMakeLists.txt 2017-10-12 19:37:01.900000000 +0200
-@@ -28,5 +28,6 @@
- )
-
- SET_PROPERTY(TARGET algorithms PROPERTY FOLDER common)
-+SET_TARGET_PROPERTIES(algorithms PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
-
-
-diff -rauN embree-2.16.4/common/simd/CMakeLists.txt embree-2.16.4-32bit-compile-flags/common/simd/CMakeLists.txt
---- embree-2.16.4/common/simd/CMakeLists.txt 2017-06-28 15:11:17.000000000 +0200
-+++ embree-2.16.4-32bit-compile-flags/common/simd/CMakeLists.txt 2017-10-12 19:37:11.450000002 +0200
-@@ -16,4 +16,5 @@
-
- ADD_LIBRARY(simd STATIC sse.cpp)
- SET_PROPERTY(TARGET simd PROPERTY FOLDER common)
-+SET_TARGET_PROPERTIES(simd PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
-
-diff -rauN embree-2.16.4/common/sys/CMakeLists.txt embree-2.16.4-32bit-compile-flags/common/sys/CMakeLists.txt
---- embree-2.16.4/common/sys/CMakeLists.txt 2017-06-28 15:11:17.000000000 +0200
-+++ embree-2.16.4-32bit-compile-flags/common/sys/CMakeLists.txt 2017-10-12 19:37:23.356666640 +0200
-@@ -33,3 +33,4 @@
-
- TARGET_LINK_LIBRARIES(sys ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
- SET_PROPERTY(TARGET sys PROPERTY FOLDER common)
-+SET_TARGET_PROPERTIES(sys PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
-diff -rauN embree-2.16.4/common/tasking/CMakeLists.txt embree-2.16.4-32bit-compile-flags/common/tasking/CMakeLists.txt
---- embree-2.16.4/common/tasking/CMakeLists.txt 2017-06-28 15:11:17.000000000 +0200
-+++ embree-2.16.4-32bit-compile-flags/common/tasking/CMakeLists.txt 2017-10-12 19:38:17.819999991 +0200
-@@ -29,3 +29,4 @@
- ENDIF()
-
- SET_PROPERTY(TARGET tasking PROPERTY FOLDER common)
-+SET_TARGET_PROPERTIES(tasking PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
diff --git a/community/embree/embree-2.17.3-32bit-compile-flags.patch b/community/embree/embree-2.17.3-32bit-compile-flags.patch
new file mode 100644
index 00000000..93a4570c
--- /dev/null
+++ b/community/embree/embree-2.17.3-32bit-compile-flags.patch
@@ -0,0 +1,39 @@
+--- a/embree-2.17.3/common/algorithms/CMakeLists.txt 2018-02-23 10:15:19.817068492 +0100
++++ b/embree-2.17.3/common/algorithms/CMakeLists.txt 2018-02-23 10:09:48.365065242 +0100
+@@ -28,5 +28,6 @@
+ )
+
+ SET_PROPERTY(TARGET algorithms PROPERTY FOLDER common)
++SET_TARGET_PROPERTIES(algorithms PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
+
+
+--- a/embree-2.17.3/common/simd/CMakeLists.txt 2018-02-23 10:15:19.865068664 +0100
++++ b/embree-2.17.3/common/simd/CMakeLists.txt 2018-02-23 10:09:48.365065242 +0100
+@@ -16,6 +16,7 @@
+
+ ADD_LIBRARY(simd STATIC sse.cpp)
+ SET_PROPERTY(TARGET simd PROPERTY FOLDER common)
++SET_TARGET_PROPERTIES(simd PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
+
+ IF (EMBREE_STATIC_LIB)
+ INSTALL(TARGETS simd ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+--- a/embree-2.17.3/common/sys/CMakeLists.txt 2018-02-23 10:15:19.913068835 +0100
++++ b/embree-2.17.3/common/sys/CMakeLists.txt 2018-02-23 10:13:26.240680114 +0100
+@@ -32,6 +32,7 @@
+
+ TARGET_LINK_LIBRARIES(sys ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+ SET_PROPERTY(TARGET sys PROPERTY FOLDER common)
++SET_TARGET_PROPERTIES(sys PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
+
+ IF (EMBREE_STATIC_LIB)
+ INSTALL(TARGETS sys ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+--- a/embree-2.17.3/common/tasking/CMakeLists.txt 2018-02-23 10:15:19.967069028 +0100
++++ b/embree-2.17.3/common/tasking/CMakeLists.txt 2018-02-23 10:13:54.728773837 +0100
+@@ -29,6 +29,7 @@
+ ENDIF()
+
+ SET_PROPERTY(TARGET tasking PROPERTY FOLDER common)
++SET_TARGET_PROPERTIES(tasking PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
+
+ IF (EMBREE_STATIC_LIB)
+ INSTALL(TARGETS tasking ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)