summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-03-25 00:55:01 +0100
committerbartus2021-03-25 00:55:01 +0100
commit7b5fd15e2d3052cf450fbd4bf6d8650d18762406 (patch)
treeece9ef415768d74406552376abe2761e8e6329a4
parentbaf4ee65cdcb2242805778af8fe9490934fd93ad (diff)
downloadaur-appleseed-git.tar.gz
Fix oiio:2.2.12 requires c++14
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--oiio_cxx_std_14.patch36
3 files changed, 47 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51bab2ecc23..712f4c58558 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 (development vesion).
- pkgver = 2.1.0.beta.r275.g390d5cda9
+ pkgver = 2.1.0.beta.r281.g00c304dbd
pkgrel = 1
epoch = 1
url = https://appleseedhq.net
@@ -30,14 +30,17 @@ pkgbase = appleseed-git
source = boost_107400.patch
source = cmake.extra.install.dirs.remove.patch
source = osl_1.11.8.patch::https://github.com/appleseedhq/appleseed/pull/2900.patch
+ source = oiio_cxx_std_14.patch
sha256sums = SKIP
sha256sums = 8e7d453ced2a58b162b6e8e2ace09916755b70821837b2c7502a3417f03a25a3
sha256sums = 87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301
sha256sums = 0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133
+ sha256sums = 194902d8c32f23155dddd4205ce3744852e0b86fc22e74739ce5ab7bf97924a7
b2sums = SKIP
b2sums = 8461888dc541113700f377379b0e688bdbc6a5b79bfda4c1b061c2e3811a03c43583272862d6b084f092c6bb372c15b31d2a25849b9e2d89d1e3ed657f680846
b2sums = 85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328
b2sums = cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0
+ b2sums = e999b4aaf4efcb3671de7f197d9ab92fd90cee34aaf879d30f959c88cea55416b0715ce85ce0452203484e4b336aed453ecff9166e12b9da9170101a3118138c
pkgname = appleseed-git
diff --git a/PKGBUILD b/PKGBUILD
index 104865adeb9..1e8941db0f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
#_fragment="#branch=2.0.5-beta-maintenance"
pkgname=appleseed-git
-pkgver=2.1.0.beta.r275.g390d5cda9
+pkgver=2.1.0.beta.r281.g00c304dbd
pkgrel=1
epoch=1
pkgdesc="Physically-based global illumination rendering engine primarily designed for animation and visual effects (development vesion)."
@@ -20,22 +20,25 @@ source=("${pkgname}::git+https://github.com/appleseedhq/appleseed.git${_fragment
"boost_107400.patch"
"cmake.extra.install.dirs.remove.patch"
osl_1.11.8.patch::"https://github.com/appleseedhq/appleseed/pull/2900.patch"
+ "oiio_cxx_std_14.patch"
)
sha256sums=('SKIP'
'8e7d453ced2a58b162b6e8e2ace09916755b70821837b2c7502a3417f03a25a3'
'87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301'
- '0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133')
+ '0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133'
+ '194902d8c32f23155dddd4205ce3744852e0b86fc22e74739ce5ab7bf97924a7')
b2sums=('SKIP'
'8461888dc541113700f377379b0e688bdbc6a5b79bfda4c1b061c2e3811a03c43583272862d6b084f092c6bb372c15b31d2a25849b9e2d89d1e3ed657f680846'
'85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328'
- 'cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0')
+ 'cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0'
+ 'e999b4aaf4efcb3671de7f197d9ab92fd90cee34aaf879d30f959c88cea55416b0715ce85ce0452203484e4b336aed453ecff9166e12b9da9170101a3118138c')
pkgver() {
git -C "${srcdir}/${pkgname}" describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
- git -C "${srcdir}/${pkgname}" apply -v "${srcdir}"/{boost_107400,cmake.extra.install.dirs.remove,osl_1.11.8}.patch
+ git -C "${srcdir}/${pkgname}" apply -v "${srcdir}"/{boost_107400,cmake.extra.install.dirs.remove,osl_1.11.8,oiio_cxx_std_14}.patch
sed '/python37/s/37/39/' -i "${srcdir}/${pkgname}"/src/appleseed.python/CMakeLists.txt
}
diff --git a/oiio_cxx_std_14.patch b/oiio_cxx_std_14.patch
new file mode 100644
index 00000000000..c0c9e7875ae
--- /dev/null
+++ b/oiio_cxx_std_14.patch
@@ -0,0 +1,36 @@
+diff --git a/src/appleseed.qtcommon/CMakeLists.txt b/src/appleseed.qtcommon/CMakeLists.txt
+index 5bed9b025..2be2ceebb 100644
+--- a/src/appleseed.qtcommon/CMakeLists.txt
++++ b/src/appleseed.qtcommon/CMakeLists.txt
+@@ -192,6 +192,7 @@ add_library (appleseed.qtcommon STATIC
+ )
+
+ set_target_properties (appleseed.qtcommon PROPERTIES FOLDER "Core")
++set_target_properties (appleseed.qtcommon PROPERTIES CXX_STANDARD 14)
+
+
+ #--------------------------------------------------------------------------------------------------
+diff --git a/src/appleseed.studio/CMakeLists.txt b/src/appleseed.studio/CMakeLists.txt
+index 0c191c815..9587c060c 100644
+--- a/src/appleseed.studio/CMakeLists.txt
++++ b/src/appleseed.studio/CMakeLists.txt
+@@ -438,6 +438,7 @@ add_executable (appleseed.studio
+ )
+
+ set_target_properties (appleseed.studio PROPERTIES FOLDER "Applications")
++set_target_properties (appleseed.studio PROPERTIES CXX_STANDARD 14)
+
+ if (WIN32)
+ set_target_properties (appleseed.studio PROPERTIES
+diff --git a/src/appleseed/CMakeLists.txt b/src/appleseed/CMakeLists.txt
+index d56d5ed18..20a18ff04 100644
+--- a/src/appleseed/CMakeLists.txt
++++ b/src/appleseed/CMakeLists.txt
+@@ -2340,6 +2340,7 @@ add_library (appleseed SHARED
+ )
+
+ set_target_properties (appleseed PROPERTIES FOLDER "Core")
++set_target_properties (appleseed PROPERTIES CXX_STANDARD 14)
+
+ if (USE_VISIBILITY_MAP)
+ set_target_properties (appleseed PROPERTIES