Update version.

3 files changed, 9 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34345161c812..a950f6f94a08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-openimageio
-	pkgdesc = A library for reading and writing images (mingw-w64)
-	pkgver = 2.2.6.1
-	pkgrel = 6
+	pkgdesc = A library for reading and writing images. (mingw-w64)
+	pkgver = 2.2.7.0
+	pkgrel = 1
 	url = http://www.openimageio.org/
 	arch = any
 	license = BSD-3-Clause
@@ -28,11 +28,9 @@ pkgbase = mingw-w64-openimageio
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/OpenImageIO/oiio/archive/Release-2.2.6.1.tar.gz
-	source = mingw-compile-fix.patch
+	source = https://github.com/OpenImageIO/oiio/archive/Release-2.2.7.0.tar.gz
 	source = mingw-dependency-fix.patch
-	sha256sums = adc245c9b2fa2bce1dd2decbdd1d03974e1e9818219d267d1da3dd1bd91216df
-	sha256sums = 87e13ccaf0359ad86713721448f14073d9e4b8904fb1353b259c351482c326a7
+	sha256sums = 857ac83798d6d2bda5d4d11a90618ff19486da2e5a4c4ff022c5976b5746fe8c
 	sha256sums = 9afbed7e3f989dba04a8bb784af24dda26b362f13d4b5933c56bed68289ee352
 
 pkgname = mingw-w64-openimageio
diff --git a/PKGBUILD b/PKGBUILD
index 817fbebbcc64..3bfd65c4abed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
 
 pkgname=mingw-w64-openimageio
-pkgver=2.2.6.1
-pkgrel=6
-pkgdesc="A library for reading and writing images (mingw-w64)"
+pkgver=2.2.7.0
+pkgrel=1
+pkgdesc="A library for reading and writing images. (mingw-w64)"
 url="http://www.openimageio.org/"
 license=("BSD-3-Clause")
 depends=(
@@ -32,13 +32,11 @@ arch=("any")
 options=(!strip !buildflags staticlibs)
 optdepends=()
 sha256sums=(
-	"adc245c9b2fa2bce1dd2decbdd1d03974e1e9818219d267d1da3dd1bd91216df"
-	"87e13ccaf0359ad86713721448f14073d9e4b8904fb1353b259c351482c326a7"
+	"857ac83798d6d2bda5d4d11a90618ff19486da2e5a4c4ff022c5976b5746fe8c"
 	"9afbed7e3f989dba04a8bb784af24dda26b362f13d4b5933c56bed68289ee352"
 )
 source=(
 	"https://github.com/OpenImageIO/oiio/archive/Release-${pkgver}.tar.gz"
-	"mingw-compile-fix.patch"
 	"mingw-dependency-fix.patch"
 )
 
@@ -46,7 +44,6 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
 	cd "oiio-Release-${pkgver}"
-	patch -uNp1 < "../mingw-compile-fix.patch"
 	patch -uNp1 < "../mingw-dependency-fix.patch"
 	rm -f src/cmake/modules/FindOpenCV.cmake
 	sed -i -r 's/set \(REQUIED_DEPS/set \(REQUIRED_DEPS/' "src/cmake/externalpackages.cmake"
diff --git a/mingw-compile-fix.patch b/mingw-compile-fix.patch
deleted file mode 100644
index 660e43483dd4..000000000000
--- a/mingw-compile-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN orig/src/include/OpenImageIO/fstream_mingw.h new/src/include/OpenImageIO/fstream_mingw.h
---- orig/src/include/OpenImageIO/fstream_mingw.h	2020-05-10 23:43:52.000000000 -0400
-+++ new/src/include/OpenImageIO/fstream_mingw.h	2020-05-20 09:41:53.992747647 -0400
-@@ -18,7 +18,7 @@
- #include <ostream>
- 
- #if defined(_WIN32) && defined(__GLIBCXX__)
--#    include <Share.h>
-+#    include <share.h>
- #    include <ext/stdio_filebuf.h>  // __gnu_cxx::stdio_filebuf
- #    include <fcntl.h>
- #    include <sys/stat.h>
-diff -ruN orig/src/libutil/sysutil.cpp new/src/libutil/sysutil.cpp
---- orig/src/libutil/sysutil.cpp	2020-05-10 23:43:52.000000000 -0400
-+++ new/src/libutil/sysutil.cpp	2020-05-20 09:41:54.029414435 -0400
-@@ -41,7 +41,7 @@
- #ifdef _WIN32
- #    define WIN32_LEAN_AND_MEAN
- #    define DEFINE_CONSOLEV2_PROPERTIES
--#    include <Psapi.h>
-+#    include <psapi.h>
- #    include <cstdio>
- #    include <io.h>
- #    include <malloc.h>
-@@ -207,7 +207,7 @@
- void
- Sysutil::get_local_time(const time_t* time, struct tm* converted_time)
- {
--#ifdef _MSC_VER
-+#ifdef _WIN32
-     localtime_s(converted_time, time);
- #else
-     localtime_r(time, converted_time);