extra/blender to 3.6.4-1

This commit is contained in:
Kevin Mihelich 2023-09-27 01:45:16 +00:00
parent 728dfa453c
commit 6146dac9d4
3 changed files with 86 additions and 39 deletions

81
extra/blender/.SRCINFO Normal file
View file

@ -0,0 +1,81 @@
pkgbase = blender
pkgdesc = A fully integrated 3D graphics creation suite
pkgver = 3.6.4
pkgrel = 1
epoch = 17
url = https://www.blender.org
arch = x86_64
license = GPL
makedepends = cmake
makedepends = boost
makedepends = mesa
makedepends = git
makedepends = svn
makedepends = llvm
makedepends = cuda
makedepends = ninja
makedepends = wayland-protocols
makedepends = libxkbcommon
makedepends = libdecor
makedepends = hip-runtime-amd
makedepends = level-zero-headers
makedepends = intel-oneapi-dpcpp-cpp
makedepends = intel-oneapi-compiler-shared-runtime
makedepends = intel-compute-runtime
depends = libpng
depends = libtiff
depends = openexr
depends = python
depends = desktop-file-utils
depends = python-requests
depends = potrace
depends = shared-mime-info
depends = hicolor-icon-theme
depends = xdg-utils
depends = glew
depends = openjpeg2
depends = python-numpy
depends = freetype2
depends = openal
depends = ffmpeg
depends = fftw
depends = boost-libs
depends = opencollada
depends = alembic
depends = openxr
depends = openimageio
depends = libsndfile
depends = jack
depends = opencolorio
depends = openimagedenoise
depends = jemalloc
depends = libspnav
depends = ptex
depends = opensubdiv
depends = openvdb
depends = sdl2
depends = embree
depends = libharu
depends = draco
depends = openpgl
depends = level-zero-loader
depends = libxkbcommon
depends = libepoxy
depends = intel-oneapi-compiler-shared-runtime-libs
depends = intel-oneapi-compiler-dpcpp-cpp-runtime-libs
optdepends = cuda: Cycles renderer CUDA support
optdepends = intel-compute-runtime: Cycles renderer Intel OneAPI support
optdepends = libdecor: wayland support
options = !buildflags
source = git+https://projects.blender.org/blender/blender.git#tag=v3.6.4
source = https://developer.download.nvidia.com/redist/optix/v7.6/OptiX-7.6-Include.zip
source = force-draco1.patch
source = force-draco2.patch
source = blender-new-sycl.patch
sha512sums = SKIP
sha512sums = dfe86de395dd298fb9feae73bff06a26742efa06a25bb5a4f78ffb1ba4c78f555d1af927efea98af281715cce01db219aa2adfd6bd323bf0d766c1c70ce03532
sha512sums = e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0
sha512sums = c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f
sha512sums = b1eb2379b673514da2599c5fc3be7fc597d4d3d23550ff392b364ae53f67e332bbed7612a0d06cbf9cd255ad6833bdb29f7e3fe668471d57e91407092419f4dd
pkgname = blender

View file

@ -16,8 +16,8 @@ buildarch=8
# fine with them.
pkgname=blender
pkgver=3.6.2
pkgrel=6
pkgver=3.6.4
pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@ -35,27 +35,22 @@ optdepends=('libdecor: wayland support')
# We're using !buildflags here as otherwise we get stuff such as FS#77557
# It'd be better to figure out exactly which of the flags is the culprit which I attempted but without any success.
options=('!buildflags')
_commit=ffe93138751e
source=("git+https://projects.blender.org/blender/blender.git#commit=$_commit"
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
force-draco1.patch
force-draco2.patch
blender-new-sycl.patch
openxr.patch)
blender-new-sycl.patch)
sha512sums=('SKIP'
'dfe86de395dd298fb9feae73bff06a26742efa06a25bb5a4f78ffb1ba4c78f555d1af927efea98af281715cce01db219aa2adfd6bd323bf0d766c1c70ce03532'
'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f'
'b1eb2379b673514da2599c5fc3be7fc597d4d3d23550ff392b364ae53f67e332bbed7612a0d06cbf9cd255ad6833bdb29f7e3fe668471d57e91407092419f4dd'
'b5f1ebee05f7099568d6dc1c5b8d4518ca0bba08a167ad979d72f6a382378019fd6c8493ccb1e7424c94866068522f5b1faaace69044639e401db0c3d958bb59')
'b1eb2379b673514da2599c5fc3be7fc597d4d3d23550ff392b364ae53f67e332bbed7612a0d06cbf9cd255ad6833bdb29f7e3fe668471d57e91407092419f4dd')
prepare() {
cd "$pkgname"
make update
patch -p1 -i "$srcdir"/openxr.patch
# fix draco
patch -p1 -i "$srcdir"/force-draco1.patch
patch -p1 -d scripts/addons -i "$srcdir"/force-draco2.patch

View file

@ -1,29 +0,0 @@
From 76dcf5b15d4789fb00b73a5b817f4768cee4c3ef Mon Sep 17 00:00:00 2001
From: ChengduLittleA <xp8110@outlook.com>
Date: Tue, 5 Sep 2023 10:11:08 +0800
Subject: [PATCH 2/2] Use XR_CURRENT_API_VERSION for different type casting
---
intern/ghost/intern/GHOST_XrGraphicsBinding.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cc b/intern/ghost/intern/GHOST_XrGraphicsBinding.cc
index dad9fab9337..4bd47ee4953 100644
--- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cc
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cc
@@ -153,7 +153,12 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
# if defined(WITH_GHOST_X11)
/* #GHOST_SystemX11. */
oxr_binding.egl.type = XR_TYPE_GRAPHICS_BINDING_EGL_MNDX;
+# if XR_CURRENT_API_VERSION >= XR_MAKE_VERSION(1, 0, 29)
+ oxr_binding.egl.getProcAddress = reinterpret_cast<PFN_xrEglGetProcAddressMNDX>(
+ eglGetProcAddress);
+# else
oxr_binding.egl.getProcAddress = eglGetProcAddress;
+# endif
oxr_binding.egl.display = ctx_egl.getDisplay();
oxr_binding.egl.config = ctx_egl.getConfig();
oxr_binding.egl.context = ctx_egl.getContext();
--
2.30.2