summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2018-06-23 10:47:33 +0200
committerbartus2018-06-23 10:47:33 +0200
commit64fa1c554284344906983ccccf5a35fc7ea271c1 (patch)
tree444a0105bc4a15434ab31da67731014d6e0953ad
parent700d4a6af9437f9ccf15e9ccd44077cf90849231 (diff)
downloadaur-64fa1c554284344906983ccccf5a35fc7ea271c1.tar.gz
remove upstream merged patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--gcc8.patch10
3 files changed, 4 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bca8757e381..494a75dfe01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = appleseed-git
pkgdesc = physically-based global illumination rendering engine primarily designed for animation and visual effects.
- pkgver = 1.9.0.beta.r55.g636ef9edb
+ pkgver = 1.9.0.beta.r110.gffd4efbde
pkgrel = 1
url = http://appleseedhq.net
arch = i686
@@ -22,10 +22,8 @@ pkgbase = appleseed-git
conflicts = appleseed
source = appleseed-git::git+https://github.com/appleseedhq/appleseed.git
source = cmake.extra.install.dirs.remove.patch
- source = gcc8.patch
md5sums = SKIP
md5sums = 1cc8d927665c126dde4d1135e500c0dc
- md5sums = 6e6b997cbfe06e0d74cdc3f74de12324
pkgname = appleseed-git
diff --git a/PKGBUILD b/PKGBUILD
index ca15b446680..9e006a3b68d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: bartus <aur@bartus.33mail.com>
pkgname=appleseed-git
#_fragment="#tag=1.7.1-beta"
-pkgver=1.9.0.beta.r55.g636ef9edb
+pkgver=1.9.0.beta.r110.gffd4efbde
pkgrel=1
pkgdesc="physically-based global illumination rendering engine primarily designed for animation and visual effects. "
arch=(i686 x86_64)
@@ -14,10 +14,9 @@ makedepends=(git cmake)
options=()
source=("${pkgname}::git+https://github.com/appleseedhq/appleseed.git${_fragment}"
"cmake.extra.install.dirs.remove.patch"
- gcc8.patch)
+ )
md5sums=('SKIP'
- '1cc8d927665c126dde4d1135e500c0dc'
- '6e6b997cbfe06e0d74cdc3f74de12324')
+ '1cc8d927665c126dde4d1135e500c0dc')
CMAKE_FLAGS="-DUSE_EXTERNAL_EXR=ON \
-DUSE_EXTERNAL_OCIO=ON \
@@ -42,7 +41,6 @@ pkgver() {
prepare() {
cd ${pkgname}
git apply -v ../cmake.extra.install.dirs.remove.patch
- git apply -v ../gcc8.patch
grep -q avx /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_AVX=ON"
grep -q avx2 /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_AVX2=ON"
grep -q sse4_2 /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_SSE42=ON"
diff --git a/gcc8.patch b/gcc8.patch
deleted file mode 100644
index 2065b8c6f10..00000000000
--- a/gcc8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/appleseed-1.9.0-beta/src/appleseed/renderer/kernel/texturing/oiiotexturesystem.h 2018-05-01 00:27:50.000000000 +0200
-+++ appleseed-1.9.0-beta/src/appleseed/renderer/kernel/texturing/oiiotexturesystem.h 2018-05-22 21:24:28.824974453 +0200
-@@ -45,6 +45,7 @@
-
- private:
- ~OIIOTextureSystem() override;
-+ void operator delete (void*) {}
- };
-
- class OIIOTextureSystemFactory