Merge tag 'v0.23.6'

release v0.23.6
This commit is contained in:
Max Kellermann
2022-03-14 18:58:47 +01:00
11 changed files with 114 additions and 49 deletions

View File

@@ -1,14 +0,0 @@
Index: libnfs-libnfs-4.0.0/include/win32/win32_compat.h
===================================================================
--- libnfs-libnfs-4.0.0.orig/include/win32/win32_compat.h
+++ libnfs-libnfs-4.0.0/include/win32/win32_compat.h
@@ -133,7 +133,9 @@ struct pollfd {
/* Wrapper macros to call misc. functions win32 is missing */
#define poll(x, y, z) win32_poll(x, y, z)
+#ifndef __MINGW32__
#define snprintf sprintf_s
+#endif
#define inet_pton(x,y,z) win32_inet_pton(x,y,z)
#define open(x, y, z) _open(x, y, z)
#ifndef lseek

View File

@@ -1 +0,0 @@
no_sprintf_s

View File

@@ -1,4 +1,11 @@
libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac'))
if is_windows
# Our Windows build generates a static libFLAC build
libflac_dep = declare_dependency(compile_args: '-DFLAC__NO_DLL',
dependencies: libflac_dep)
endif
libopus_dep = dependency('opus', required: get_option('opus'))
if get_option('tremor').enabled()