[vlc-devel] [PATCH] contrib: flac: update to 1.3.2

[Tristan Matthews]

Should be ok but I'm unable to test the updated WINSTORE patches, so perhaps
someone else should give it a shot first.

---
 contrib/src/flac/SHA512SUMS          |  2 +-
 contrib/src/flac/console_write.patch | 38 +++++++++++++++++++-----------------
 contrib/src/flac/rules.mak           |  2 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/contrib/src/flac/SHA512SUMS b/contrib/src/flac/SHA512SUMS
index a6b73474c2..26b1fe663d 100644
--- a/contrib/src/flac/SHA512SUMS
+++ b/contrib/src/flac/SHA512SUMS
@@ -1 +1 @@
-923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5  flac-1.3.1.tar.xz
+b6dfc7e31dc1fad434ff751a9f4748354de242af94d56c93254245ddb740ffa19e56f32100c3723b601ba345156e927d61a80722126cc75ebe55092179427cac  flac-1.3.2.tar.xz
diff --git a/contrib/src/flac/console_write.patch b/contrib/src/flac/console_write.patch
index aa719f65ad..8015fd4970 100644
--- a/contrib/src/flac/console_write.patch
+++ b/contrib/src/flac/console_write.patch
@@ -1,41 +1,43 @@
---- flac.orig/src/share/win_utf8_io/win_utf8_io.c	2016-05-16 14:52:36.408520025 +0200
-+++ flac/src/share/win_utf8_io/win_utf8_io.c	2016-05-16 14:57:07.880507930 +0200
-@@ -42,6 +42,7 @@
- #include <stdarg.h>
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h> /* for WideCharToMultiByte and MultiByteToWideChar */
-+#include <winapifamily.h>
+--- flac.orig/src/share/win_utf8_io/win_utf8_io.c	2017-01-02 18:07:08.794676209 -0500
++++ flac/src/share/win_utf8_io/win_utf8_io.c	2017-01-02 18:10:16.633867994 -0500
+@@ -34,6 +34,7 @@
+ #endif
  
+ #include <windows.h>
++#include <winapifamily.h>
  #include "share/win_utf8_io.h"
+ #include "share/windows_unicode_filenames.h"
  
-@@ -163,16 +164,22 @@
+@@ -164,11 +165,13 @@
  int win_get_console_width(void)
  {
  	int width = 80;
 +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
  	CONSOLE_SCREEN_BUFFER_INFO csbi;
  	HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
- 	if (GetConsoleScreenBufferInfo(hOut, &csbi) != 0) width = csbi.dwSize.X;
+ 	if(hOut != INVALID_HANDLE_VALUE && hOut != NULL)
+ 		if (GetConsoleScreenBufferInfo(hOut, &csbi) != 0)
+ 			width = csbi.dwSize.X;
 +#endif
  	return width;
  }
  
- /* print functions */
--
- int print_console(FILE *stream, const wchar_t *text, size_t len)
+@@ -176,6 +179,11 @@
+ 
+ static int wprint_console(FILE *stream, const wchar_t *text, size_t len)
  {
 +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 +	(void)stream;
 +	OutputDebugStringW(text);
 +	return len;
 +#else
- 	static HANDLE hOut;
- 	static HANDLE hErr;
  	DWORD out;
-@@ -189,6 +196,7 @@
- 		if (ret < 0) return ret;
- 		return len;
- 	}
+ 	int ret;
+ 
+@@ -202,6 +210,7 @@
+ 	if (ret < 0)
+ 		return ret;
+ 	return len;
 +#endif
  }
  
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index 35e41f6982..c6d6dfd2ad 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -1,6 +1,6 @@
 # FLAC
 
-FLAC_VERSION := 1.3.1
+FLAC_VERSION := 1.3.2
 FLAC_URL := http://downloads.xiph.org/releases/flac/flac-$(FLAC_VERSION).tar.xz
 
 PKGS += flac
-- 
2.11.0