From ee4dd8d4d76e4a434bdfe87747a2858c4e1d971c Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Fri, 31 May 2019 12:03:25 +0300
Subject: [PATCH] libbsdf: Update to 0.9.11

---
 mingw-w64-libbsdf/PKGBUILD                     | 18 ++++++++++--------
 mingw-w64-libbsdf/missing-header.patch         | 10 ++++++++++
 .../optimisations-CMakeLists.txt.patch         | 10 +++++-----
 3 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 mingw-w64-libbsdf/missing-header.patch

diff --git a/mingw-w64-libbsdf/PKGBUILD b/mingw-w64-libbsdf/PKGBUILD
index 2f0330eec1..e50fd683d7 100644
--- a/mingw-w64-libbsdf/PKGBUILD
+++ b/mingw-w64-libbsdf/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=libbsdf
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.9.7
+pkgver=0.9.11
 pkgrel=1
 epoch=
 pkgdesc="Library for handling BSDF files (mingw-w64)"
@@ -15,29 +15,31 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-eigen3")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KimuraRyo/${_realname}/archive/v${pkgver}.tar.gz"
-        'optimisations-CMakeLists.txt.patch')
-sha256sums=('1c7c4f4c0a3f9e1cce345f43f3568f96529260cfdb4701669cabfce42348d273'
-            '9eee27da0e486e186cf75ad05dcfa0b0266dafec3881e45aa295a85474d66c14')
+        'optimisations-CMakeLists.txt.patch'
+        'missing-header.patch')
+sha256sums=('3fe061d5da76201b7b04a4d146455ccea30c581155f5af847a584409fd0c3881'
+            '4fc5acd2b1f046c75fcccb55c0bcb79f5408939af2a3a4c2220b248be4cae487'
+            'af87d5866a8a2eb121dddf5e7dde58a376f2168615928c5038ac7b6bb1d20be6')
 
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
   patch -Np0 -i "${srcdir}/optimisations-CMakeLists.txt.patch"
+  patch -Np1 -i "${srcdir}/missing-header.patch"
 }
 
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
   [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
   mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DEIGEN3_INCLUDE_DIR=${MINGW_PREFIX}/include/eigen3 \
     -DCMAKE_CXX_FLAGS=-std=c++11 \
-    ..
+    ../${_realname}-${pkgver}
 
   make
 }
@@ -50,5 +52,5 @@ package() {
   cp -rf "${srcdir}"/${_realname}-${pkgver}/include/libbsdf ${pkgdir}${MINGW_PREFIX}/include/
 
   mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
-  cp -f "${srcdir}"/${_realname}-${pkgver}/build-${MINGW_CHOST}/liblibbsdf.a ${pkgdir}${MINGW_PREFIX}/lib/
+  cp -f "${srcdir}"/build-${MINGW_CHOST}/liblibbsdf.a ${pkgdir}${MINGW_PREFIX}/lib/
 }
diff --git a/mingw-w64-libbsdf/missing-header.patch b/mingw-w64-libbsdf/missing-header.patch
new file mode 100644
index 0000000000..313b5d7df3
--- /dev/null
+++ b/mingw-w64-libbsdf/missing-header.patch
@@ -0,0 +1,10 @@
+--- libbsdf-0.9.11/applications/Utility/ArgumentParser.cpp.orig	2019-05-31 11:57:14.612321000 +0300
++++ libbsdf-0.9.11/applications/Utility/ArgumentParser.cpp	2019-05-31 11:57:16.812324100 +0300
+@@ -7,6 +7,7 @@
+ // =================================================================== //
+ 
+ #include <ArgumentParser.h>
++#include <algorithm>
+ 
+ ArgumentParser::ArgumentParser(int argc, char** argv)
+ {
diff --git a/mingw-w64-libbsdf/optimisations-CMakeLists.txt.patch b/mingw-w64-libbsdf/optimisations-CMakeLists.txt.patch
index 008ed63bc2..87b5c5a485 100644
--- a/mingw-w64-libbsdf/optimisations-CMakeLists.txt.patch
+++ b/mingw-w64-libbsdf/optimisations-CMakeLists.txt.patch
@@ -1,13 +1,13 @@
 --- CMakeLists.txt	2016-03-05 15:12:41.000000000 +0100
 +++ CMakeLists.txt	2016-03-20 00:30:26.784591500 +0100
 @@ -39,8 +39,8 @@
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
- else(MSVC)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+     endif()
+ else()
 -    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse3")
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse3")
 +    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse3 -O2")
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse3 -O2")
- endif(MSVC)
+ endif()
  
- option(USE_OpenMP "Use OpenMP." ON)
+ option(USE_OpenMP "Use OpenMP" ON)