Fix openexr:v3, fix gcc:11 defaulting to c++17

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 180ac29ef3f4..990f363ccbd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mitsuba-git
 	pkgdesc = Mitsuba physically based renderer.
 	pkgver = 0.6.0.r2172.cfeb7766
-	pkgrel = 2
+	pkgrel = 3
 	url = http://mitsuba-renderer.org/
 	arch = i686
 	arch = x86_64
@@ -36,4 +36,3 @@ pkgbase = mitsuba-git
 	sha256sums = c4c571653c86e7c21d702f1f5cb9695edc32bf9fc05f6246e67a660693a32322
 
 pkgname = mitsuba-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 9149021d327b..6cb3a8887d43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname="mitsuba"
 _pkgver="0.6.0"
 pkgname="${_pkgname}-git"
 pkgver=0.6.0.r2172.cfeb7766
-pkgrel=2
+pkgrel=3
 pkgdesc="Mitsuba physically based renderer."
 url="http://mitsuba-renderer.org/"
 license=("GPL3")
@@ -53,10 +53,14 @@ prepare() {
 
     # Scons doesn't honor environment variables
     # user has to export then manually in Sconscript file.
+    export CXXFLAGS+=" -std=gnu++14"
     sed -E -i "s/^(SH)?LINKFLAGS[ ]*= \[/&\'${LDFLAGS}\', /g" config.py
     sed -i "s/^CFLAGS[ ]*= \[/&\'${CFLAGS// /\',\'}\', /g" config.py
     sed -i "s/^CXXFLAGS[ ]*= \[/&\'${CXXFLAGS// /\',\'}\', /g" config.py
 
+    # Fix openexr:v3
+    sed -i "s/^OEXRLIB.*/OEXRLIB = ['OpenEXR']/g" config.py
+
     git apply -v ${srcdir}/{python3.9,boost_107400}.patch
 }