Fix osl shaders path.

3 files changed, 22 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42e5d9e7fc0e..062863edb163 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.r92593.09122883b2a
+	pkgver = 2.83.r93435.819af2094b2
 	pkgrel = 1
 	url = https://blender.org/
 	install = blender.install
@@ -44,6 +44,7 @@ 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
@@ -51,6 +52,7 @@ 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 61133f7dc5d9..a3b28a927776 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=blender-2.8-git
 _fragment="#branch=master"
-pkgver=2.83.r92593.09122883b2a
+pkgver=2.83.r93435.819af2094b2
 pkgrel=1
 pkgdesc="Development version of Blender 2.8 branch"
 arch=('i686' 'x86_64')
@@ -35,6 +35,7 @@ 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'
@@ -42,7 +43,8 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'cd108dca1c77607c6a7cc45aa284ea97'
-         '4441d9a6db38b85b7dc5c3c9e6872951')
+         '4441d9a6db38b85b7dc5c3c9e6872951'
+         '3cac70b24bcf8866c45fb84350f25835')
 
 pkgver() {
   cd "$srcdir/blender"
@@ -56,6 +58,7 @@ prepare() {
   if [ -z "$_cuda_capability" ] && grep -q nvidia <(lsmod); then 
     git apply -v ${srcdir}/SelectCudaComputeArch.patch
   fi
+  git apply -v ${srcdir}/osl.patch
 }
 
 build() {
@@ -89,6 +92,7 @@ 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
new file mode 100644
index 000000000000..b016e62d921d
--- /dev/null
+++ b/osl.patch
@@ -0,0 +1,13 @@
+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}