Revert "Fix osl shaders path."

This reverts commit c6f95f0c0acadf8fa37d896aa9d17d3c044d3781.

3 files changed, 3 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 062863edb163..a48746d99ecf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-2.8-git
 	pkgdesc = Development version of Blender 2.8 branch
-	pkgver = 2.83.r93435.819af2094b2
+	pkgver = 2.83.r93502.cef4d344f94
 	pkgrel = 1
 	url = https://blender.org/
 	install = blender.install
@@ -44,7 +44,6 @@ pkgbase = blender-2.8-git
 	source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
 	source = blender-2.8.desktop
 	source = SelectCudaComputeArch.patch
-	source = osl.patch
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
@@ -52,7 +51,6 @@ pkgbase = blender-2.8-git
 	md5sums = SKIP
 	md5sums = cd108dca1c77607c6a7cc45aa284ea97
 	md5sums = 4441d9a6db38b85b7dc5c3c9e6872951
-	md5sums = 3cac70b24bcf8866c45fb84350f25835
 
 pkgname = blender-2.8-git
 
diff --git a/PKGBUILD b/PKGBUILD
index a3b28a927776..b83c16168224 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=blender-2.8-git
 _fragment="#branch=master"
-pkgver=2.83.r93435.819af2094b2
+pkgver=2.83.r93502.cef4d344f94
 pkgrel=1
 pkgdesc="Development version of Blender 2.8 branch"
 arch=('i686' 'x86_64')
@@ -35,7 +35,6 @@ source=("git://git.blender.org/blender.git${_fragment}"
         'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git'
         blender-2.8.desktop
         SelectCudaComputeArch.patch
-        osl.patch
         )
 md5sums=('SKIP'
          'SKIP'
@@ -43,8 +42,7 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'cd108dca1c77607c6a7cc45aa284ea97'
-         '4441d9a6db38b85b7dc5c3c9e6872951'
-         '3cac70b24bcf8866c45fb84350f25835')
+         '4441d9a6db38b85b7dc5c3c9e6872951')
 
 pkgver() {
   cd "$srcdir/blender"
@@ -58,7 +56,6 @@ prepare() {
   if [ -z "$_cuda_capability" ] && grep -q nvidia <(lsmod); then 
     git apply -v ${srcdir}/SelectCudaComputeArch.patch
   fi
-  git apply -v ${srcdir}/osl.patch
 }
 
 build() {
@@ -92,7 +89,6 @@ build() {
         -DWITH_SYSTEM_GLEW=ON \
         -DWITH_PYTHON_INSTALL=OFF \
         -DPYTHON_VERSION=${_pyver} \
-        -DOSL_SHADER_DIR:PATH=/usr/share/OSL/shaders \
         ${_EXTRAOPTS[@]}
   export NINJA_STATUS="[%p | %f<%r<%u | %cbps ] "
   ((DISABLE_NINJA)) && make || ninja $([ -v MAKEFLAGS ] || echo -j1) -d stats
diff --git a/osl.patch b/osl.patch
deleted file mode 100644
index b016e62d921d..000000000000
--- a/osl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt
-index 1c9445107ad..b1604978cce 100644
---- a/intern/cycles/kernel/shaders/CMakeLists.txt
-+++ b/intern/cycles/kernel/shaders/CMakeLists.txt
-@@ -131,7 +131,7 @@ foreach(_file ${SRC_OSL})
-   string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE})
-   add_custom_command(
-     OUTPUT ${_OSO_FILE}
--    COMMAND ${OSL_COMPILER} -q -O2  -I"${CMAKE_CURRENT_SOURCE_DIR}" -o ${_OSO_FILE} ${_OSL_FILE}
-+    COMMAND ${OSL_COMPILER} -q -O2  -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE}
-     DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER})
-   list(APPEND SRC_OSO
-     ${_OSO_FILE}