From df8f8b264b73357442ee39d30e4aeec01f8eb052 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Fri, 2 Sep 2016 15:03:32 -0600
Subject: [PATCH] light: update embree to 2.11.0

---
 appveyor.yml               |  8 ++++----
 build-osx.sh               |  3 +--
 patches/embree2.10.0.patch | 13 -------------
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 patches/embree2.10.0.patch

diff --git a/appveyor.yml b/appveyor.yml
index 16e55830..46d010c5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,9 @@ platform:
 
 version: 1.0.{build}
 install:
-- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.10.0/embree-2.10.0.x64.windows.zip' -OutFile 'embree64.zip'
+- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x64.windows.zip' -OutFile 'embree64.zip'
 - ps: 7z x embree64.zip -oc:\
-- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.10.0/embree-2.10.0.win32.windows.zip' -OutFile 'embree.zip'
+- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.win32.windows.zip' -OutFile 'embree.zip'
 - ps: 7z x embree.zip -oc:\
 build_script:
 - ps: >-
@@ -17,9 +17,9 @@ build_script:
     cd cmakebuild
 
     If ($env:Platform -Match "x64") {
-      cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.10.0.x64.windows/lib/cmake/embree-2.10.0" -DCMAKE_GENERATOR_PLATFORM=x64
+      cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.11.0.x64.windows/lib/cmake/embree-2.11.0" -DCMAKE_GENERATOR_PLATFORM=x64
     } Else {
-      cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.10.0.win32.windows/lib/cmake/embree-2.10.0"
+      cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.11.0.win32.windows/lib/cmake/embree-2.11.0"
     }
 
     msbuild check.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
diff --git a/build-osx.sh b/build-osx.sh
index 1d591a48..f2d1b3d3 100755
--- a/build-osx.sh
+++ b/build-osx.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 BUILD_DIR=build-osx
-EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.10.0/embree-2.10.0.x86_64.macosx.tar.gz"
+EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.macosx.tar.gz"
 EMBREE_TGZ_NAME=$(basename "$EMBREE_TGZ")
 EMBREE_DIR_NAME=$(basename "$EMBREE_TGZ" ".tar.gz")
 EMBREE_WITH_VERSION=$(basename "$EMBREE_TGZ" ".x86_64.macosx.tar.gz")
@@ -15,7 +15,6 @@ mkdir "$BUILD_DIR"
 cd "$BUILD_DIR"
 wget "$EMBREE_TGZ"
 tar xf "$EMBREE_TGZ_NAME"
-patch -p0 < ../patches/embree2.10.0.patch
 EMBREE_CMAKE_DIR="$(pwd)/$EMBREE_DIR_NAME/lib/cmake/$EMBREE_WITH_VERSION"
 cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_CMAKE_DIR"
 make -j8
diff --git a/patches/embree2.10.0.patch b/patches/embree2.10.0.patch
deleted file mode 100644
index d0fc9090..00000000
--- a/patches/embree2.10.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- embree-2.10.0.x86_64.macosx/include/embree2/rtcore.h	2016-05-19 23:54:49.000000000 -0600
-+++ embree-2.10.0.x86_64.macosx/include/embree2/rtcore.h	2016-06-28 15:32:56.000000000 -0600
-@@ -50,6 +50,10 @@
-   #define RTCORE_DEPRECATED
- #endif
- 
-+#if !defined(_WIN32)
-+  #define __forceinline inline __attribute__((always_inline))
-+#endif
-+
- /*! Embree API version */
- #define RTCORE_VERSION_MAJOR 2
- #define RTCORE_VERSION_MINOR 10