Merge branch 'master' of https://github.com/Alexpux/MINGW-packages

mingw-w64-babl/PKGBUILD

@@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}"-git)
 pkgver=0.1.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Dynamic Pixel Format Translation Library (mingw-w64)"
 arch=('any')
 url="http://gegl.org/babl/"

mingw-w64-ceres-solver/PKGBUILD

@@ -4,7 +4,7 @@ _realname=ceres-solver
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A large scale non-linear optimization library (mingw-w64)"
 arch=('any')
 url="http://ceres-solver.org/"

mingw-w64-crt-git/PKGBUILD

@@ -4,7 +4,7 @@ _realname=crt
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
-pkgver=5.0.0.4735.9877f24
+pkgver=5.0.0.4742.28dfd0a
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for Windows'
 arch=('any')

mingw-w64-field3d/PKGBUILD

@@ -4,7 +4,7 @@ _realname=field3d
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source library for storing voxel data (mingw-w64)"
 arch=('any')
 url="https://sites.google.com/site/field3d/"

mingw-w64-freeglut/PKGBUILD

@@ -7,7 +7,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pre=
 _ver=3.0.0
 pkgver=${_ver}${_pre}
-pkgrel=3
+pkgrel=4
 pkgdesc="Freeglut allows the user to create and manage windows containing OpenGL contexts (mingw32-w64)"
 arch=('any')
 url="http://freeglut.sourceforge.net/"

mingw-w64-headers-git/0005-bessel_complex.patch

@@ -0,0 +1,27 @@
+From 556ba2e45435717a4502e6c77b7af1e5daee8936 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
+ =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
+Date: Sun, 9 Oct 2016 17:33:44 +0300
+Subject: [PATCH] Allow to use bessel and complex functions without undefining
+ __STRICT_ANSI__
+
+---
+ mingw-w64-headers/crt/math.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h
+index b06ca79..d3617d0 100644
+--- a/mingw-w64-headers/crt/math.h
++++ b/mingw-w64-headers/crt/math.h
+@@ -263,7 +263,7 @@ extern "C" {
+ #define EDOM 33
+ #define ERANGE 34
+
+-#ifndef __STRICT_ANSI__
++#if !defined(__STRICT_ANSI__) || defined(_POSIX_C_SOURCE) || defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+ #ifndef _COMPLEX_DEFINED
+ #define _COMPLEX_DEFINED
+-- 
+2.9.0
+

mingw-w64-headers-git/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
 pkgdesc="MinGW-w64 headers for Windows"
-pkgver=5.0.0.4735.9877f24
+pkgver=5.0.0.4743.8eeb5fa
 pkgrel=1
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@@ -17,10 +17,12 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 options=('!strip' '!libtool' '!emptydirs')
 source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
         "0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch"
-        "0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch")
+        "0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch"
+        "0005-bessel_complex.patch")
 sha256sums=('SKIP'
             '677642bbb0df3f1e0467f075f24c720657e9ed912a6e69cbf189352271fc09c1'
-            'c6c996b273ee049a2c0b9570f007d2d76a95ff56abb3b147f156e6a221a561ef')
+            'c6c996b273ee049a2c0b9570f007d2d76a95ff56abb3b147f156e6a221a561ef'
+            '1196f65f87f9f45adb18acab5076436ab7268ac3125f829d42899624f741cd6d')
 
 pkgver() {
   cd "${srcdir}/mingw-w64"
@@ -35,6 +37,7 @@ prepare() {
 
   git am --committer-date-is-author-date "${srcdir}/"0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch
   git am --committer-date-is-author-date "${srcdir}/"0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch
+  git am --committer-date-is-author-date "${srcdir}/"0005-bessel_complex.patch
 
   cd ${srcdir}/mingw-w64/mingw-w64-headers
   touch include/windows.*.h include/wincrypt.h include/prsht.h

mingw-w64-opencolorio-git/PKGBUILD

@@ -3,8 +3,8 @@
 _realname=opencolorio
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=701.a557a85
-pkgrel=3
+pkgver=721.de9491e
+pkgrel=1
 pkgdesc="A color management framework for visual effects and animation (mingw-w64)"
 arch=('any')
 url="http://opencolorio.org"

mingw-w64-opencv/0007-vtk7-opengl2.patch

@@ -0,0 +1,29 @@
+From 64a57f7c387f201094076120bfecf59719a95aea Mon Sep 17 00:00:00 2001
+From: Dan Moodie <dtmoodie@gmail.com>
+Date: Mon, 28 Dec 2015 10:27:10 -0500
+Subject: [PATCH] Support for opengl2 in vtk 7.1
+
+---
+ cmake/OpenCVDetectVTK.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
+index 66dcdd0..e75aef8 100644
+--- a/cmake/OpenCVDetectVTK.cmake
++++ b/cmake/OpenCVDetectVTK.cmake
+@@ -3,7 +3,14 @@ if(NOT WITH_VTK)
+ endif()
+
+ # VTK 6.x components
+-find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
++find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
++IF(VTK_FOUND)
++  IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
++      find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
++  ELSE(VTK_RENDERING_BACKEND)
++      find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
++  ENDIF(VTK_RENDERING_BACKEND)
++ENDIF(VTK_FOUND)
+
+ # VTK 5.x components
+ if(NOT VTK_FOUND)

mingw-w64-opencv/PKGBUILD

@@ -4,7 +4,7 @@ _realname=opencv
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
 url="http://opencv.org/"
@@ -34,26 +34,29 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-eigen3"
             "${MINGW_PACKAGE_PREFIX}-python3-numpy: Python 3.x interface"
             "${MINGW_PACKAGE_PREFIX}-vtk: opencv_viz module")
 source=("${_realname}-${pkgver}.tar.gz"::https://github.com/Itseez/opencv/archive/${pkgver}.tar.gz
-        'mingw-w64-cmake.patch'
-        'solve_deg3-underflow.patch'
-        'issue-4107.patch'
-        'generate-proper-pkg-config-file.patch'
-        'opencv-support-python-3.5.patch')
+        '0001-mingw-w64-cmake.patch'
+        '0002-solve_deg3-underflow.patch'
+        '0003-issue-4107.patch'
+        '0004-generate-proper-pkg-config-file.patch'
+        '0005-opencv-support-python-3.5.patch'
+        '0007-vtk7-opengl2.patch')
 sha256sums=('f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf'
             '22c8e8892e6e1e88ad130518567b7e30fb5fabfc117ae257f055cde000ba8100'
             'fd4e095c3c879413184fc6b91a7b0a77dbb128612341a8be2c99d804a203e362'
             '52ebc8875b9ef3ea70897f34509228daeff73d0cab0aa9eb8b931be6a7d32d7f'
             '47447c78acc810cd0604b641644f1c546c29e925b7b9671a4fa18468ff3ad330'
-            'e50f69c6c1fbce255b3e7ef4b489bf1a01ba28cf828a6adb80c73a7f9c08a666')
+            'e50f69c6c1fbce255b3e7ef4b489bf1a01ba28cf828a6adb80c73a7f9c08a666'
+            '49476d4b9cc0061123aae5d8d5897c21fced16f88599c435ba077ee60b9dcca8')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/mingw-w64-cmake.patch"
-  patch -Np1 -i "${srcdir}/solve_deg3-underflow.patch"
-  patch -Np1 -i "${srcdir}/issue-4107.patch"
-  patch -Np1 -i "${srcdir}/generate-proper-pkg-config-file.patch"
-  patch -Np1 -i "${srcdir}/opencv-support-python-3.5.patch"
+  patch -Np1 -i "${srcdir}/0001-mingw-w64-cmake.patch"
+  patch -Np1 -i "${srcdir}/0002-solve_deg3-underflow.patch"
+  patch -Np1 -i "${srcdir}/0003-issue-4107.patch"
+  patch -Np1 -i "${srcdir}/0004-generate-proper-pkg-config-file.patch"
+  patch -Np1 -i "${srcdir}/0005-opencv-support-python-3.5.patch"
+  patch -Np1 -i "${srcdir}/0007-vtk7-opengl2.patch"
 }
 
 build() {

mingw-w64-openimageio/PKGBUILD

@@ -4,7 +4,7 @@ _realname=openimageio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 #pkgver=1.5.24
-pkgver=1.6.15
+pkgver=1.7.7
 pkgrel=1
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)"
 arch=('any')
@@ -29,7 +29,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-qt5"
+             #"${MINGW_PACKAGE_PREFIX}-qt5"
              "${MINGW_PACKAGE_PREFIX}-python2"
              "${MINGW_PACKAGE_PREFIX}-boost")
 optdepends=(#"${MINGW_PACKAGE_PREFIX}-qt4: iv image viewer"
@@ -39,8 +39,8 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archi
         fix-mingw-w64.patch
         workaround-ansidecl-h-PTR-define-conflict.patch
         0001-MinGW-w64-include-winbase-h-early-for-TCHAR-types.patch)
-sha256sums=('07e7d30a2f678d519af17adeb13352a4b80fb380f4458255e1a0152000ce8c90'
-            'fd3b3ae804e89e164fd9ca07373452643b66cb4dee49306dd3a4e3b5f9249995'
+sha256sums=('1c006765d153d1c56806e78a83ece330f7905209ecf0f5d3c3b52d77a328345a'
+            'd17a0638636e838bc739455cfd93ea3f8010d0f5b941f68e5692833c330aee85'
             'ab6bde02c0c05495a9cb13441535d42f4d5929bd930859d75f589d12be9a182b'
             'b7cc78d0f535ceb1aba68b11970c32ffbf04815d229b12e64e2c2c0b3403b4b2')
 
@@ -63,12 +63,12 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
     -DUSE_FREETYPE=ON \
-    -DFREETYPE_INCLUDE_PATH=${MINGW_PREFIX}/include/freetype2 \
-    -DOPENJPEG_INCLUDE_DIR=${MINGW_PREFIX}/include/openjpeg-1.5 \
-    -DOPENJPEG_OPENJPEG_LIBRARIES=${MINGW_PREFIX}/lib/libopenjpeg.dll.a \
     -DUSE_OPENCV=ON \
     -DUSE_FIELD3D=ON \
     -DUSE_OPENSSL=ON \
+    -DFREETYPE_INCLUDE_PATH=${MINGW_PREFIX}/include/freetype2 \
+    -DOPENJPEG_INCLUDE_DIR=${MINGW_PREFIX}/include/openjpeg-2.1 \
+    -DOPENJPEG_OPENJPEG_LIBRARIES=${MINGW_PREFIX}/lib/libopenjp2.dll.a \
     -DCMAKE_SHARED_LINKER_FLAGS=" -Wl,--export-all-symbols -Wl,--enable-auto-import " \
     -DOIIO_BUILD_TESTS=ON \
     ../oiio-Release-${pkgver}
@@ -80,7 +80,6 @@ package() {
   cd "${srcdir}"/build-${MINGW_CHOST}
 
   make DESTDIR=${pkgdir} install
-  rm -r ${pkgdir}${MINGW_PREFIX}/doc
 
   install -Dm644 ${srcdir}/oiio-Release-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }

mingw-w64-openimageio/fix-mingw-w64.patch

@@ -32,16 +32,6 @@
  # include <windows.h>
  #endif
 
---- a/src/include/OpenImageIO/thread.h
-+++ b/src/include/OpenImageIO/thread.h
-@@ -100,6 +100,7 @@
- #endif
-
- #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
-+#  include <sched.h>
- #  define USE_GCC_ATOMICS
- #  if !defined(__clang__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
- #    define OIIO_USE_GCC_NEW_ATOMICS
 --- a/src/libOpenImageIO/CMakeLists.txt
 +++ b/src/libOpenImageIO/CMakeLists.txt
 @@ -258,7 +261,7 @@
@@ -137,20 +127,29 @@
  #include "typedesc.h"
 --- a/src/cmake/modules/FindOpenJpeg.cmake	2013-12-29 23:51:59.071600000 +0400
 +++ b/src/cmake/modules/FindOpenJpeg.cmake	2013-12-29 23:52:34.998400000 +0400
-@@ -78,7 +78,9 @@
-        ${OPENJPEG_HOME}/lib64)
-   set (OpenJpeg_include_paths
+@@ -78,6 +78,11 @@
+        ${OPENJPEG_HOME}/include/openjpeg
+        ${OPENJPEG_HOME}/include
         ${OpenJpeg_include_paths}
--       ${OPENJPEG_HOME}/include)
++       ${OPENJPEG_HOME}/include/openjpeg-2.1
++       ${OPENJPEG_HOME}/include/openjpeg-2.0
++       ${OPENJPEG_HOME}/include/openjpeg-1.5
 +       ${OPENJPEG_HOME}/include
 +       ${OPENJPEG_HOME}/include/openjpeg
-+       ${OPENJPEG_HOME}/include/openjpeg-1.5)
+       )
  endif()
 
-
 --- a/CMakeLists.txt	2013-12-30 01:06:13.042400000 +0400
 +++ b/CMakeLists.txt	2013-12-30 01:06:22.293200000 +0400
- endif ()
+@@ -370,7 +370,7 @@
+ set (DEFAULT_BIN_INSTALL_DIR   "bin")
+ set (DEFAULT_LIB_INSTALL_DIR   "lib")
+ set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
+-if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
++if ((UNIX OR MINGW) AND NOT SELF_CONTAINED_INSTALL_TREE)
+     # Try to be well-behaved and install into reasonable places according to
+     # the "standard" unix directory heirarchy
+     # TODO: Figure out how to get the correct python directory
 @@ -423,7 +423,7 @@
      set (CPACK_GENERATOR "TGZ;STGZ;PackageMaker")
      set (CPACK_SOURCE_GENERATOR "TGZ")
@@ -171,39 +170,6 @@
 
  #undef bswap_32
  #undef bswap_64
---- a/src/include/OpenImageIO/simd.h.orig	2016-07-11 12:43:02.776628800 +0300
-+++ b/src/include/OpenImageIO/simd.h	2016-07-11 12:43:14.200628800 +0300
-@@ -1702,26 +1702,26 @@
-         // SSE half-to-float by Fabian "ryg" Giesen. Public domain.
-         // https://gist.github.com/rygorous/2144712
-         int4 h ((const unsigned short *)values);
--# define CONST(name) *(const __m128i *)&name
-+# define CONSTI(name) *(const __m128i *)&name
- # define CONSTF(name) *(const __m128 *)&name
-         OIIO_SIMD_UINT4_CONST(mask_nosign, 0x7fff);
-         OIIO_SIMD_UINT4_CONST(magic,       (254 - 15) << 23);
-         OIIO_SIMD_UINT4_CONST(was_infnan,  0x7bff);
-         OIIO_SIMD_UINT4_CONST(exp_infnan,  255 << 23);
--        __m128i mnosign     = CONST(mask_nosign);
-+        __m128i mnosign     = CONSTI(mask_nosign);
-         __m128i expmant     = _mm_and_si128(mnosign, h);
-         __m128i justsign    = _mm_xor_si128(h, expmant);
-         __m128i expmant2    = expmant; // copy (just here for counting purposes)
-         __m128i shifted     = _mm_slli_epi32(expmant, 13);
-         __m128  scaled      = _mm_mul_ps(_mm_castsi128_ps(shifted), *(const __m128 *)&magic);
--        __m128i b_wasinfnan = _mm_cmpgt_epi32(expmant2, CONST(was_infnan));
-+        __m128i b_wasinfnan = _mm_cmpgt_epi32(expmant2, CONSTI(was_infnan));
-         __m128i sign        = _mm_slli_epi32(justsign, 16);
-         __m128  infnanexp   = _mm_and_ps(_mm_castsi128_ps(b_wasinfnan), CONSTF(exp_infnan));
-         __m128  sign_inf    = _mm_or_ps(_mm_castsi128_ps(sign), infnanexp);
-         __m128  final       = _mm_or_ps(scaled, sign_inf);
-         // ~11 SSE2 ops.
-         m_vec = final;
--# undef CONST
-+# undef CONSTI
- # undef CONSTF
- #else /* No SIMD defined: */
-         for (int i = 0; i < elements; ++i)
 --- a/src/cmake/modules/FindFFmpeg.cmake.orig	2016-07-11 14:14:12.042802600 +0300
 +++ b/src/cmake/modules/FindFFmpeg.cmake	2016-07-11 14:14:56.699302600 +0300
 @@ -61,6 +61,7 @@

mingw-w64-openshadinglanguage/0001-install-dirs.patch

@@ -0,0 +1,11 @@
+--- OpenShadingLanguage-Release-1.7.4/CMakeLists.txt.orig	2016-10-09 22:50:19.369197900 +0300
++++ OpenShadingLanguage-Release-1.7.4/CMakeLists.txt	2016-10-09 22:50:44.078611200 +0300
+@@ -344,7 +344,7 @@
+ set (DEFAULT_BIN_INSTALL_DIR   "bin")
+ set (DEFAULT_LIB_INSTALL_DIR   "lib")
+ set (DEFAULT_INCLUDE_INSTALL_DIR "include/OSL")
+-if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
++if ((UNIX OR MINGW) AND NOT SELF_CONTAINED_INSTALL_TREE)
+     # Try to be well-behaved and install into reasonable places according to
+     # the "standard" unix directory heirarchy
+     # TODO: Figure out how to get the correct python directory

mingw-w64-openshadinglanguage/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Advanced shading language for production GI renderers (mingw-w64)"
 arch=('any')
@@ -27,12 +27,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-python2"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
 source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+        0001-install-dirs.patch
         0002-dont-add-flex-include-dir.patch
         0003-fix-OIIO-windows.patch
         0004-fix-installing-docs.patch
         0005-Fix-cast-from-void-ptr.patch
         0007-Fix-bad-casts-with-intptr_t.patch)
-sha256sums=('ef33cb968a1cc029460dd9c2e6195a28179386ef0aeb4c2300b756fe5aa3f0b8'
+sha256sums=('a5c71dc5890544d562039415f6b6f83d7a53f7f8076ad36437dd721237462371'
+            'e3f6ad09619d122ada129cbc77d7778751abfecef9ac7e0a60d9550c811df643'
             'c9e02624cf6e607118f1f7fd8bf8bda9af5103afde5770a11fa5ccf49916fc5b'
             '597241b0d10799b9d38629f64a98c2cc54e48dbbf9b893fdd078cb40da019240'
             '08bee2c1bbe45a1e8a2face08bdf1bc28f63dd22fe2e2df9fde7a136b77561de'
@@ -41,6 +43,7 @@ sha256sums=('ef33cb968a1cc029460dd9c2e6195a28179386ef0aeb4c2300b756fe5aa3f0b8'
 
 prepare() {
   cd ${srcdir}/OpenShadingLanguage-Release-${pkgver}
+  patch -p1 -i ${srcdir}/0001-install-dirs.patch
   patch -p1 -i ${srcdir}/0002-dont-add-flex-include-dir.patch
   patch -p1 -i ${srcdir}/0003-fix-OIIO-windows.patch
   patch -p1 -i ${srcdir}/0004-fix-installing-docs.patch
@@ -62,6 +65,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DSTOP_ON_WARNING=OFF \
     -DILMBASE_CUSTOM=True \
     -DILMBASE_CUSTOM_INCLUDE_DIR=${MINGW_PREFIX}/include \
     -DILMBASE_CUSTOM_LIB_DIR=${MINGW_PREFIX}/lib \