diff options
| author | bartus | 2018-11-21 13:48:09 +0100 |
|---|---|---|
| committer | bartus | 2018-11-21 13:48:09 +0100 |
| commit | 0a377dae9487cb445cb05f8ba275b90b5e6a4a06 (patch) | |
| tree | bea97bb784958d4e3ddadb7f3e6ef53d004151d1 | |
| parent | e3a8a05544a3c21363caf2f4304c8f2a23db56ad (diff) | |
| download | aur-0a377dae9487cb445cb05f8ba275b90b5e6a4a06.tar.gz | |
update submodule, drop audaspace path
* update submodule now trace remote branch form .gitmodules
* audaspace ffmpeg_compat fix now longer needed
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
2 files changed, 4 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = blender-2.8-git pkgdesc = Development version of Blender 2.8 branch - pkgver = 2.8_r78999.c86b5fa820d + pkgver = 2.8_r82468.ed1ee89288e pkgrel = 1 url = http://blender.org/ install = blender.install @@ -42,7 +42,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 = ffmpeg.patch md5sums = SKIP md5sums = SKIP md5sums = SKIP @@ -50,7 +49,6 @@ pkgbase = blender-2.8-git md5sums = SKIP md5sums = cd108dca1c77607c6a7cc45aa284ea97 md5sums = 9454ff7e994f72ead5027356e227cbd2 - md5sums = 9d4bfb5b3dd33e95b13cc6c7d9d2d2e1 pkgname = blender-2.8-git @@ -2,7 +2,7 @@ pkgname=blender-2.8-git -pkgver=2.8_r78999.c86b5fa820d +pkgver=2.8_r82468.ed1ee89288e pkgrel=1 pkgdesc="Development version of Blender 2.8 branch" arch=('i686' 'x86_64') @@ -28,7 +28,6 @@ source=('git://git.blender.org/blender.git#branch=blender2.8' \ 'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git' \ blender-2.8.desktop \ SelectCudaComputeArch.patch \ - ffmpeg.patch \ ) md5sums=('SKIP' 'SKIP' @@ -37,7 +36,7 @@ md5sums=('SKIP' 'SKIP' 'cd108dca1c77607c6a7cc45aa284ea97' '9454ff7e994f72ead5027356e227cbd2' - '9d4bfb5b3dd33e95b13cc6c7d9d2d2e1') + ) # determine whether we can precompile CUDA kernels _CUDA_PKG=`pacman -Qq cuda 2>/dev/null` || true @@ -54,11 +53,8 @@ pkgver() { prepare() { cd "$srcdir/blender" # update the submodules - git submodule update --init --recursive - git submodule foreach git checkout master - git submodule foreach git pull --rebase origin master + git submodule update --init --recursive --remote git apply ${srcdir}/SelectCudaComputeArch.patch - git apply ${srcdir}/ffmpeg.patch } build() { |