From 762416ce702b86a6f829c894b126cad7ed6d9fdd Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 3 Jun 2023 18:05:58 +0000 Subject: [PATCH] extra/blender to 3.5.1-6 --- extra/blender/PKGBUILD | 7 +------ extra/blender/blender-sycl-path.patch | 13 ------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 extra/blender/blender-sycl-path.patch diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index dedbd3eeb..123a771e1 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -18,7 +18,7 @@ buildarch=8 pkgname=blender pkgver=3.5.1 -pkgrel=3 +pkgrel=6 epoch=17 pkgdesc="A fully integrated 3D graphics creation suite" arch=('x86_64') @@ -38,12 +38,10 @@ optdepends=('libdecor: wayland support') options=('!buildflags') source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver" https://developer.download.nvidia.com/redist/optix/v7.6/OptiX-7.6-Include.zip - blender-sycl-path.patch force-draco1.patch force-draco2.patch) sha512sums=('SKIP' 'dfe86de395dd298fb9feae73bff06a26742efa06a25bb5a4f78ffb1ba4c78f555d1af927efea98af281715cce01db219aa2adfd6bd323bf0d766c1c70ce03532' - 'bc9a80941a18aaddc3e8f2d9963e4f6b7eb1cf9f098418adb236771c3bedcab7b7a06121178f7498caba1af67116cd0ea549382e14a707163cdd5d8fbf3ee824' 'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0' 'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f') @@ -55,9 +53,6 @@ prepare() { # fix draco patch -p1 -i "$srcdir"/force-draco1.patch patch -p1 -d scripts/addons -i "$srcdir"/force-draco2.patch - - # fix SYCL include dir - patch -p1 -i "$srcdir"/blender-sycl-path.patch } get_pyver() { diff --git a/extra/blender/blender-sycl-path.patch b/extra/blender/blender-sycl-path.patch deleted file mode 100644 index 023166dd2..000000000 --- a/extra/blender/blender-sycl-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build_files/cmake/Modules/FindSYCL.cmake b/build_files/cmake/Modules/FindSYCL.cmake -index 1ccbee179fb..e72b035def6 100644 ---- a/build_files/cmake/Modules/FindSYCL.cmake -+++ b/build_files/cmake/Modules/FindSYCL.cmake -@@ -81,7 +81,7 @@ endif() - - FIND_PATH(SYCL_INCLUDE_DIR - NAMES -- sycl/sycl.hpp -+ sycl/CL/sycl.hpp - HINTS - ${_sycl_search_dirs} - PATH_SUFFIXES