diff --git a/releases.json b/releases.json index 4127a74728..4f0b50a023 100644 --- a/releases.json +++ b/releases.json @@ -1446,6 +1446,7 @@ "sndfile" ], "versions": [ + "1.2.2-1", "1.2.0-1", "1.1.0-6", "1.1.0-5", diff --git a/subprojects/libsndfile.wrap b/subprojects/libsndfile.wrap index 6df5ba3e18..174b5f5cf2 100644 --- a/subprojects/libsndfile.wrap +++ b/subprojects/libsndfile.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory = libsndfile-1.2.0 -source_url = https://github.com/libsndfile/libsndfile/releases/download/1.2.0/libsndfile-1.2.0.tar.xz -source_filename = libsndfile-1.2.0.tar.xz -source_hash = 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a +directory = libsndfile-1.2.2 +source_url = https://github.com/libsndfile/libsndfile/releases/download/1.2.2/libsndfile-1.2.2.tar.xz +source_filename = libsndfile-1.2.2.tar.xz +source_hash = 3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e patch_directory = libsndfile [provide] diff --git a/subprojects/packagefiles/libsndfile/meson.build b/subprojects/packagefiles/libsndfile/meson.build index a7a0649bb0..5aefc46a76 100644 --- a/subprojects/packagefiles/libsndfile/meson.build +++ b/subprojects/packagefiles/libsndfile/meson.build @@ -2,7 +2,7 @@ project( 'libsndfile', 'c', license: 'LGPL-2.1-or-later', - version: '1.2.0', + version: '1.2.2', meson_version: '>=0.54.1', ) @@ -104,7 +104,9 @@ funcs = [ 'getpagesize', 'gettimeofday', 'gmtime', + 'gmtime_r', 'localtime', + 'localtime_r', 'lrint', 'lrintf', 'lround', @@ -137,15 +139,15 @@ cdata.set('SIZEOF_VOIDP_CODE', '#define VOIDP_CODE') sizes += {'double': '', 'float': '', 'int': '', 'loff_t': '', 'off64_t': '', 'short': '', 'size_t': ''} foreach f : funcs - cdata.set10('HAVE_@0@'.format(f.underscorify().to_upper()), cc.has_function(f)) -endforeach - -foreach f : ['gmtime_r', 'localtime_r'] - cdata.set('HAVE_@0@'.format(f.underscorify().to_upper()), cc.has_header_symbol('time.h', f, args: '-D_POSIX_C_SOURCE')) + if cc.has_function(f) + cdata.set('HAVE_@0@'.format(f.underscorify().to_upper()), 1) + endif endforeach foreach h : headers - cdata.set10('HAVE_@0@'.format(h.underscorify().to_upper()), cc.has_header(h)) + if cc.has_header(h) + cdata.set('HAVE_@0@'.format(h.underscorify().to_upper()), 1) + endif endforeach foreach s, h : sizes