diff options
author | Jeremy Attali | 2020-05-19 00:08:59 -0400 |
---|---|---|
committer | Jeremy Attali | 2020-05-19 00:19:36 -0400 |
commit | 3a9d8279d662bd910dfd9661d6a6cdb88aca4fb0 (patch) | |
tree | da998415580cddbd45860e64e70cd8966b42015f | |
download | aur-3a9d8279d662bd910dfd9661d6a6cdb88aca4fb0.tar.gz |
init wayland build
-rw-r--r-- | .SRCINFO | 69 | ||||
-rw-r--r-- | .gitignore | 12 | ||||
-rw-r--r-- | PKGBUILD | 117 | ||||
-rw-r--r-- | embree.patch | 43 |
4 files changed, 241 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..d761ac99fa24 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,69 @@ +pkgbase = blender-wayland-git + pkgdesc = A fully integrated 3D graphics creation suite + pkgver = 2.90.r95473.g52ad92977e1 + pkgrel = 1 + epoch = 17 + url = http://www.blender.org + arch = x86_64 + license = GPL + makedepends = cmake + makedepends = boost + makedepends = mesa + makedepends = git + makedepends = llvm + makedepends = cuda + makedepends = ninja + depends = libpng + depends = libtiff + depends = openexr + depends = python + depends = desktop-file-utils + depends = python-requests + 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 = openimageio + depends = libsndfile + depends = jack + depends = opencolorio + depends = openshadinglanguage + depends = openimagedenoise + depends = jemalloc + depends = libspnav + depends = ptex + depends = opensubdiv + depends = openvdb + depends = log4cplus + depends = sdl2 + depends = embree + optdepends = cuda: cycles renderer cuda support + provides = blender + conflicts = blender + options = !strip + source = git://git.blender.org/blender-addons.git + source = git://git.blender.org/blender-addons-contrib.git + source = git://git.blender.org/blender-translations.git + source = git://git.blender.org/blender-dev-tools.git + source = embree.patch + source = https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip + source = blender-wayland-git::git+https://github.com/christianrauch/blender.git#branch=wayland + sha512sums = SKIP + sha512sums = SKIP + sha512sums = SKIP + sha512sums = SKIP + sha512sums = 6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca + sha512sums = b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491 + sha512sums = SKIP + +pkgname = blender-wayland-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..cdc4ec1e28d8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +/blender-addons/ +/blender-addons-contrib/ +/blender-dev-tools/ +/blender-translations/ +/blender-wayland-git/ + +/pkg/ +/src/ + +OptiX-7.0.0-include.zip + +*.xz diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..4fffc695d52b --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,117 @@ +# Maintainer: Jeremy Attali <contact@jtheoof.me> +# Contributor: Sven-Hendrik Haase <svenstaro@gmail.com> +# Contributor: John Sowiak <john@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> + +## This is a blander build based on wayland branch by Christian Rauch +## See Blender thread https://devtalk.blender.org/t/wayland-and-egl-support/11171 +## This PKGBUILD was mainly taken from blender-develop-git AUR package. + +# Sometimes blender.org takes some time to release patch releases and because Arch users +# are impatient, we sometimes need to build from git directly. +# Update because I get so many queries on this: +# Due to our other rolling deps, it's sometimes not possible to build Blender stable releases. +# More often than not, a new openshadinglanguage breaks it and I could either backport fixes +# or simply roll with a new version. I usually choose the latter when the former seems +# unreasonable. + +# For legal reasons, we can't separately package the Optix headers so we'll +# just build the package against them. I checked with NVIDIA and this way is +# fine with them. + +#_gittag=v2.82a +# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716 +_gitbranch=wayland + +pkgname=blender-wayland-git +pkgver=2.90.r95473.g52ad92977e1 +[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8} +pkgrel=1 +epoch=17 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('x86_64') +license=('GPL') +url="http://www.blender.org" +provides=('blender') +conflicts=('blender') +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests' + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg2' 'python-numpy' + 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic' + 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage' 'openimagedenoise' + 'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2' 'embree') +makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja') +optdepends=('cuda: cycles renderer cuda support') +options=(!strip) +source=("git://git.blender.org/blender-addons.git" + "git://git.blender.org/blender-addons-contrib.git" + "git://git.blender.org/blender-translations.git" + "git://git.blender.org/blender-dev-tools.git" + embree.patch + https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip) + +if [[ -n $_gitbranch ]]; then + source+=("${pkgname}::git+https://github.com/christianrauch/blender.git#branch=${_gitbranch}") +fi + +sha512sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca' + 'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491' + 'SKIP') + + +pkgver() { + blender_version=$(grep -Po "BLENDER_VERSION \K[0-9]{3}" "$srcdir"/${pkgname}/source/blender/blenkernel/BKE_blender_version.h) + printf "%d.%d.r%s.g%s" \ + $((blender_version/100)) \ + $((blender_version%100)) \ + "$(git -C "$srcdir/${pkgname}" rev-list --count HEAD)" \ + "$(git -C "$srcdir/${pkgname}" rev-parse --short HEAD)" +} + + +prepare() { + cd "$srcdir/$pkgname" + + git submodule init + git config submodule."release/scripts/addons".url "${srcdir}/blender-addons" + git config submodule."release/scripts/addons_contrib".url "${srcdir}/blender-addons-contrib" + git config submodule."release/datafiles/locale".url "${srcdir}/blender-translations" + git config submodule."source/tools".url "${srcdir}/blender-dev-tools" + git submodule update + + patch -Np1 -i "$srcdir"/embree.patch + + mkdir build +} + +build() { + cd "$srcdir/$pkgname"/build + + cmake \ + -GNinja \ + -C../build_files/cmake/config/blender_release.cmake .. \ + -DOPTIX_ROOT_DIR="$srcdir"/include \ + -DWITH_CYCLES_EMBREE=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_PYTHON_INSTALL=OFF \ + -DWITH_GHOST_WAYLAND=ON \ + -DPYTHON_VERSION=3.8 \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python3.8 \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.8 + ninja +} + +package() { + cd "$srcdir/$pkgname/build" + + DESTDIR="${pkgdir}" ninja install + install -Dm755 ../release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl" + python -m compileall "${pkgdir}/usr/share/blender" + python -O -m compileall "${pkgdir}/usr/share/blender" +} diff --git a/embree.patch b/embree.patch new file mode 100644 index 000000000000..bed0b39e744c --- /dev/null +++ b/embree.patch @@ -0,0 +1,43 @@ +diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt +index d9a2ebf8571..f3b7d156024 100644 +--- a/intern/cycles/blender/CMakeLists.txt ++++ b/intern/cycles/blender/CMakeLists.txt +@@ -66,6 +66,12 @@ if(WITH_CYCLES_LOGGING) + ) + endif() + ++if(WITH_CYCLES_EMBREE) ++ list(APPEND LIB ++ ${EMBREE_LIBRARIES} ++ ) ++endif() ++ + set(ADDON_FILES + addon/__init__.py + addon/engine.py +diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake +index d9d525d4586..03b509a28f3 100644 +--- a/build_files/cmake/Modules/FindEmbree.cmake ++++ b/build_files/cmake/Modules/FindEmbree.cmake +@@ -72,7 +72,7 @@ ENDFOREACH() + + FIND_LIBRARY(EMBREE_LIBRARY + NAMES +- libembree3 ++ embree3 + HINTS + ${_embree_SEARCH_DIRS} + PATH_SUFFIXES +@@ -83,10 +83,10 @@ FIND_LIBRARY(EMBREE_LIBRARY + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(EMBREE DEFAULT_MSG +- _embree_LIBRARIES EMBREE_INCLUDE_DIR) ++ EMBREE_LIBRARY EMBREE_INCLUDE_DIR) + + IF(EMBREE_FOUND) +- SET(EMBREE_LIBRARIES ${_embree_LIBRARIES}) ++ SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY}) + SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR}) + ENDIF(EMBREE_FOUND) + |