Fix oiio:2.2.12 requires c++14

3 files changed, 44 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a58140a7e900..48c974fc5ba0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,16 +29,19 @@ pkgbase = appleseed
 	source = cmake.extra.install.dirs.remove.patch
 	source = boost_107200.patch
 	source = python39.patch
+	source = oiio_cxx_std_14.patch
 	sha256sums = 5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898
 	sha256sums = 0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133
 	sha256sums = 87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301
 	sha256sums = 125d5191b52122434984ccc11a6f2677697a4fee3b9f4571ee0d3742a43a74a4
 	sha256sums = 5e0bffb5a1c1a877abf75c55a5485b2bf6220caa9886ba073e7513cbf4245886
+	sha256sums = 2e619021829cebfa5e5a805c6a38d7946c370e3a1666aab1cacccab8f78f26bc
 	b2sums = 67005025f46c8fa8ac236e56e8fc3f447bd2e2a9862f8db37015cafeaf4d67536dc01aace81f2683586eced54221284e6cc7d697399f873c4e53de5b0fd59ae0
 	b2sums = cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0
 	b2sums = 85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328
 	b2sums = 74ee6d8ef1d26155ec3775bf9c8793a760939835e8b09d574d0c152ecca90b78e31e8c1de3b576cf13c640131d5ce757c8488ab902439decd5f80b8d511f6251
 	b2sums = 115d48a3b570f9b7c1bbd5b38f1b5bdb8ded6b21ccb9c83ccbb305fad00942336b2cfd7ec3674a80a94edec0512d14c9d7ada4eed57a08f8d78ab23b7e636600
+	b2sums = 05909887108da2e7247697048dee9da2a6e50fcabaa55917ea855d31101680f07284274ed85d4a9a2937255d816560fb6cfb77297f4f7f002b25cfd3197a0784
 
 pkgname = appleseed
 
diff --git a/PKGBUILD b/PKGBUILD
index 402d580431d8..4317781b5dcc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,17 +20,20 @@ source=(appleseed.tgz::"${_github}/archive/${_pkgver}.tar.gz"
         "cmake.extra.install.dirs.remove.patch"
         "boost_107200.patch"
         "python39.patch"
+        "oiio_cxx_std_14.patch"
         )
 sha256sums=('5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898'
             '0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133'
             '87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301'
             '125d5191b52122434984ccc11a6f2677697a4fee3b9f4571ee0d3742a43a74a4'
-            '5e0bffb5a1c1a877abf75c55a5485b2bf6220caa9886ba073e7513cbf4245886')
+            '5e0bffb5a1c1a877abf75c55a5485b2bf6220caa9886ba073e7513cbf4245886'
+            '2e619021829cebfa5e5a805c6a38d7946c370e3a1666aab1cacccab8f78f26bc')
 b2sums=('67005025f46c8fa8ac236e56e8fc3f447bd2e2a9862f8db37015cafeaf4d67536dc01aace81f2683586eced54221284e6cc7d697399f873c4e53de5b0fd59ae0'
         'cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0'
         '85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328'
         '74ee6d8ef1d26155ec3775bf9c8793a760939835e8b09d574d0c152ecca90b78e31e8c1de3b576cf13c640131d5ce757c8488ab902439decd5f80b8d511f6251'
-        '115d48a3b570f9b7c1bbd5b38f1b5bdb8ded6b21ccb9c83ccbb305fad00942336b2cfd7ec3674a80a94edec0512d14c9d7ada4eed57a08f8d78ab23b7e636600')
+        '115d48a3b570f9b7c1bbd5b38f1b5bdb8ded6b21ccb9c83ccbb305fad00942336b2cfd7ec3674a80a94edec0512d14c9d7ada4eed57a08f8d78ab23b7e636600'
+        '05909887108da2e7247697048dee9da2a6e50fcabaa55917ea855d31101680f07284274ed85d4a9a2937255d816560fb6cfb77297f4f7f002b25cfd3197a0784')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do
diff --git a/oiio_cxx_std_14.patch b/oiio_cxx_std_14.patch
new file mode 100644
index 000000000000..7968c304862a
--- /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