diff options
Diffstat (limited to 'subprojects/packagefiles')
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 42 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/msvc_build_conform.diff | 33 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/msvc_build_conform_old.diff | 22 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_3.3.9.diff | 45 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_4.2.11.diff | 26 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_5.1.8.diff | 29 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_6.1.4.diff | 29 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_7.1.3.diff | 29 | ||||
| -rw-r--r-- | subprojects/packagefiles/miniaudio/meson.build | 2 | ||||
| -rw-r--r-- | subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff | 405 | ||||
| -rw-r--r-- | subprojects/packagefiles/wuffs/meson.build | 2 |
11 files changed, 227 insertions, 437 deletions
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 46f2d31..f813c8f 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -62,12 +62,24 @@ endif #'--extra-ldflags=-Lbuild/subprojects/libalabaster -l:libalabaster.a', #'--malloc-prefix=al_', -decoders = 'flac,mp3,mp3float,aac,opus,vorbis,h264,hevc,av1,vp9' +decoders = 'flac,mp3,mp3float,aac,opus,vorbis,h264,hevc,vp9' decoders += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le' #decoders += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar' decoders += ',dca,eac3' decoders += ',pcm_dvd,mpegvideo,mpeg2video' #decoders += ',ass,srt' +if get_option('codec-hwaccels').length() == 0 + if not is_msvc + libdav1d = dependency('dav1d', required: false) + if libdav1d.found() + decoders += ',libdav1d' + extra_options += ['--enable-libdav1d'] + deps += [libdav1d] + endif + endif +else + decoders += ',av1' +endif demuxers = '' parsers = '' @@ -88,16 +100,22 @@ if not get_option('sink-only') endif endif -zlib = dependency('zlib', required: false) -if zlib.found() - extra_options += ['--enable-zlib'] - decoders += ',png,apng,mjpeg,jpeg2000,gif,' - if not get_option('sink-only') - demuxers += ',image_png_pipe,image2,mjpeg,image2pipe,image_jpeg_pipe,gif' - parsers += ',png,mjpeg,jpeg2000,gif' +ffmpeg_image_codecs = true +if ffmpeg_image_codecs + zlib = dependency('zlib', required: false) + if zlib.found() + extra_options += ['--enable-zlib'] + decoders += ',png,apng,mjpeg,jpeg2000,webp,gif,' + if not get_option('sink-only') + demuxers += ',image_png_pipe,image2,mjpeg,image2pipe,image_jpeg_pipe,image_webp_pipe,gif' + parsers += ',png,mjpeg,jpeg2000,webp,gif' + endif + deps += [zlib] + else + extra_options += ['--disable-zlib'] endif - deps += [zlib] endif +extra_options += ['--disable-xlib'] bsfs = '' if not get_option('sink-only') @@ -177,7 +195,12 @@ endif # Disable unused hwaccels. extra_options += [ + '--disable-amf', + '--disable-audiotoolbox', + '--disable-cuda-llvm', '--disable-cuvid', + '--disable-ffnvcodec', + '--disable-nvdec', '--disable-nvenc', '--disable-vdpau', '--disable-audiotoolbox', @@ -237,7 +260,6 @@ proj = ext_proj.add_project('configure', '--disable-manpages', '--disable-podpages', '--disable-txtpages', - '--disable-safe-bitstream-reader', '--disable-schannel', '--disable-network', '--disable-securetransport', diff --git a/subprojects/packagefiles/ffmpeg/msvc_build_conform.diff b/subprojects/packagefiles/ffmpeg/msvc_build_conform.diff index 3aff7e9..80c6c70 100644 --- a/subprojects/packagefiles/ffmpeg/msvc_build_conform.diff +++ b/subprojects/packagefiles/ffmpeg/msvc_build_conform.diff @@ -1,15 +1,26 @@ ---- a/configure 2025-03-02 19:22:08.000000000 -0500 -+++ b/configure 2025-05-17 18:43:08.854727216 -0400 -@@ -5184,7 +5184,7 @@ - DEPCCFLAGS=$_flags +--- a/configure 2025-11-19 21:31:28.000000000 -0500 ++++ b/configure 2025-11-24 12:35:16.905137447 -0500 +@@ -5299,8 +5299,8 @@ + arflags="rcD" + ar_o='$@' + else +- arflags="rc" +- ar_o='$@' ++ arflags="-nologo" ++ ar_o='-out:$@' fi - --if $ar 2>&1 | grep -q Microsoft; then -+if $ar 2>&1 | grep -q Microsoft || [ "$ar" == "llvm-lib" ]; then - arflags="-nologo" - ar_o='-out:$@' - elif $ar 2>&1 | grep -q "\[D\] "; then -@@ -5878,6 +5878,8 @@ + + # Treat unrecognized flags as errors on MSVC +@@ -5951,6 +5951,8 @@ + enabled x86_32 && check_ldflags -Wl,--large-address-aware + add_cppflags -DWIN32_LEAN_AND_MEAN + shlibdir_default="$bindir_default" ++ LIBPREF="" ++ LIBSUF=".lib" + SLIBPREF="" + SLIBSUF=".dll" + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' +@@ -6002,6 +6004,8 @@ enabled x86_32 && check_ldflags -LARGEADDRESSAWARE add_cppflags -DWIN32_LEAN_AND_MEAN shlibdir_default="$bindir_default" diff --git a/subprojects/packagefiles/ffmpeg/msvc_build_conform_old.diff b/subprojects/packagefiles/ffmpeg/msvc_build_conform_old.diff new file mode 100644 index 0000000..7811469 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/msvc_build_conform_old.diff @@ -0,0 +1,22 @@ +--- a/configure 2025-11-19 21:31:28.000000000 -0500 ++++ b/configure 2025-11-24 12:35:16.905137447 -0500 +@@ -5299,8 +5299,8 @@ + arflags="rcD" + ar_o='$@' + else +- arflags="rc" +- ar_o='$@' ++ arflags="-nologo" ++ ar_o='-out:$@' + fi + + # Treat unrecognized flags as errors on MSVC +@@ -5951,6 +5951,8 @@ + enabled x86_32 && check_ldflags -Wl,--large-address-aware + add_cppflags -DWIN32_LEAN_AND_MEAN + shlibdir_default="$bindir_default" ++ LIBPREF="" ++ LIBSUF=".lib" + SLIBPREF="" + SLIBSUF=".dll" + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff index 3887a2f..90911d5 100644 --- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff +++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff @@ -1,5 +1,5 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:51:35.605178588 -0400 +--- a/meson.build 2025-11-30 11:51:43.747121512 -0500 ++++ b/meson.build 2025-11-30 12:55:07.519116860 -0500 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '3.3.9', meson_version: '>=0.57.0') @@ -17,7 +17,40 @@ extra_options += ['--enable-static', '--disable-shared'] if is_windows -@@ -220,6 +216,15 @@ +@@ -68,18 +64,7 @@ + decoders += ',dca,eac3' + decoders += ',pcm_dvd,mpegvideo,mpeg2video' + #decoders += ',ass,srt' +-if get_option('codec-hwaccels').length() == 0 +- if not is_msvc +- libdav1d = dependency('dav1d', required: false) +- if libdav1d.found() +- decoders += ',libdav1d' +- extra_options += ['--enable-libdav1d'] +- deps += [libdav1d] +- endif +- endif +-else +- decoders += ',av1' +-endif ++decoders += ',av1' + + demuxers = '' + parsers = '' +@@ -195,12 +180,8 @@ + + # Disable unused hwaccels. + extra_options += [ +- '--disable-amf', + '--disable-audiotoolbox', +- '--disable-cuda-llvm', + '--disable-cuvid', +- '--disable-ffnvcodec', +- '--disable-nvdec', + '--disable-nvenc', + '--disable-vdpau', + '--disable-audiotoolbox', +@@ -243,6 +224,15 @@ args += ['-DCAMU_HAVE_SOXR'] endif @@ -33,7 +66,7 @@ ext_proj = import('unstable-external_project') proj = ext_proj.add_project('configure', -@@ -229,7 +234,6 @@ +@@ -252,7 +242,6 @@ '--incdir=@PREFIX@/@INCLUDEDIR@', '--enable-pic', '--disable-all', @@ -41,7 +74,7 @@ '--disable-everything', '--disable-programs', '--disable-doc', -@@ -255,11 +259,14 @@ +@@ -277,11 +266,14 @@ '--enable-swscale', '--disable-indevs', '--disable-outdevs', @@ -56,7 +89,7 @@ avutil = proj.dependency('avutil') avformat = proj.dependency('avformat') avcodec = proj.dependency('avcodec') -@@ -268,14 +275,14 @@ +@@ -290,14 +282,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_4.2.11.diff b/subprojects/packagefiles/ffmpeg/version_4.2.11.diff index 27d5ceb..cce132d 100644 --- a/subprojects/packagefiles/ffmpeg/version_4.2.11.diff +++ b/subprojects/packagefiles/ffmpeg/version_4.2.11.diff @@ -1,12 +1,32 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:42:23.161139654 -0400 +--- a/meson.build 2025-11-30 11:51:43.747121512 -0500 ++++ b/meson.build 2025-11-30 12:52:39.981254464 -0500 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '4.2.11', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') -@@ -268,14 +268,14 @@ +@@ -68,18 +68,7 @@ + decoders += ',dca,eac3' + decoders += ',pcm_dvd,mpegvideo,mpeg2video' + #decoders += ',ass,srt' +-if get_option('codec-hwaccels').length() == 0 +- if not is_msvc +- libdav1d = dependency('dav1d', required: false) +- if libdav1d.found() +- decoders += ',libdav1d' +- extra_options += ['--enable-libdav1d'] +- deps += [libdav1d] +- endif +- endif +-else +- decoders += ',av1' +-endif ++decoders += ',av1' + + demuxers = '' + parsers = '' +@@ -290,14 +279,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_5.1.8.diff b/subprojects/packagefiles/ffmpeg/version_5.1.8.diff new file mode 100644 index 0000000..784c8a1 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/version_5.1.8.diff @@ -0,0 +1,29 @@ +--- a/meson.build 2025-08-23 18:44:34.634014892 -0400 ++++ b/meson.build 2025-08-25 15:40:17.065798145 -0400 +@@ -1,4 +1,4 @@ +-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') ++project('ffmpeg', 'c', version: '5.1.8', meson_version: '>=0.57.0') + + compiler = meson.get_compiler('c') + +@@ -268,14 +268,14 @@ + swscale = proj.dependency('swscale') + include = include_directories('.', 'build/') + meson.override_dependency('libavutil', declare_dependency( +- dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '')) ++ dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '57.28.100')) + meson.override_dependency('libavformat', declare_dependency( +- dependencies: [avformat], include_directories: include, version: '')) ++ dependencies: [avformat], include_directories: include, version: '59.27.100')) + meson.override_dependency('libavcodec', declare_dependency( +- dependencies: [avcodec], include_directories: include, version: '')) ++ dependencies: [avcodec], include_directories: include, version: '59.37.100')) + meson.override_dependency('libavdevice', declare_dependency( +- dependencies: [avdevice], include_directories: include, version: '')) ++ dependencies: [avdevice], include_directories: include, version: '59.7.100')) + meson.override_dependency('libswresample', declare_dependency( +- dependencies: [swresample], include_directories: include, version: '')) ++ dependencies: [swresample], include_directories: include, version: '4.7.100')) + meson.override_dependency('libswscale', declare_dependency( +- dependencies: [swscale], include_directories: include, version: '')) ++ dependencies: [swscale], include_directories: include, version: '6.7.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_6.1.4.diff b/subprojects/packagefiles/ffmpeg/version_6.1.4.diff new file mode 100644 index 0000000..5f54fe5 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/version_6.1.4.diff @@ -0,0 +1,29 @@ +--- a/meson.build 2025-08-23 18:44:34.634014892 -0400 ++++ b/meson.build 2025-08-25 15:37:56.556303265 -0400 +@@ -1,4 +1,4 @@ +-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') ++project('ffmpeg', 'c', version: '6.1.4', meson_version: '>=0.57.0') + + compiler = meson.get_compiler('c') + +@@ -268,14 +268,14 @@ + swscale = proj.dependency('swscale') + include = include_directories('.', 'build/') + meson.override_dependency('libavutil', declare_dependency( +- dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '')) ++ dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '58.29.100')) + meson.override_dependency('libavformat', declare_dependency( +- dependencies: [avformat], include_directories: include, version: '')) ++ dependencies: [avformat], include_directories: include, version: '60.16.100')) + meson.override_dependency('libavcodec', declare_dependency( +- dependencies: [avcodec], include_directories: include, version: '')) ++ dependencies: [avcodec], include_directories: include, version: '60.31.102')) + meson.override_dependency('libavdevice', declare_dependency( +- dependencies: [avdevice], include_directories: include, version: '')) ++ dependencies: [avdevice], include_directories: include, version: '60.3.100')) + meson.override_dependency('libswresample', declare_dependency( +- dependencies: [swresample], include_directories: include, version: '')) ++ dependencies: [swresample], include_directories: include, version: '4.12.100')) + meson.override_dependency('libswscale', declare_dependency( +- dependencies: [swscale], include_directories: include, version: '')) ++ dependencies: [swscale], include_directories: include, version: '7.5.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_7.1.3.diff b/subprojects/packagefiles/ffmpeg/version_7.1.3.diff new file mode 100644 index 0000000..554ef02 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/version_7.1.3.diff @@ -0,0 +1,29 @@ +--- a/meson.build 2025-08-23 18:44:34.634014892 -0400 ++++ b/meson.build 2025-08-25 15:35:33.498781349 -0400 +@@ -1,4 +1,4 @@ +-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') ++project('ffmpeg', 'c', version: '7.1.3', meson_version: '>=0.57.0') + + compiler = meson.get_compiler('c') + +@@ -268,14 +268,14 @@ + swscale = proj.dependency('swscale') + include = include_directories('.', 'build/') + meson.override_dependency('libavutil', declare_dependency( +- dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '')) ++ dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '59.39.100')) + meson.override_dependency('libavformat', declare_dependency( +- dependencies: [avformat], include_directories: include, version: '')) ++ dependencies: [avformat], include_directories: include, version: '61.7.100')) + meson.override_dependency('libavcodec', declare_dependency( +- dependencies: [avcodec], include_directories: include, version: '')) ++ dependencies: [avcodec], include_directories: include, version: '61.19.100')) + meson.override_dependency('libavdevice', declare_dependency( +- dependencies: [avdevice], include_directories: include, version: '')) ++ dependencies: [avdevice], include_directories: include, version: '61.3.100')) + meson.override_dependency('libswresample', declare_dependency( +- dependencies: [swresample], include_directories: include, version: '')) ++ dependencies: [swresample], include_directories: include, version: '5.3.100')) + meson.override_dependency('libswscale', declare_dependency( +- dependencies: [swscale], include_directories: include, version: '')) ++ dependencies: [swscale], include_directories: include, version: '8.3.100')) diff --git a/subprojects/packagefiles/miniaudio/meson.build b/subprojects/packagefiles/miniaudio/meson.build index 8522b5f..a2889f1 100644 --- a/subprojects/packagefiles/miniaudio/meson.build +++ b/subprojects/packagefiles/miniaudio/meson.build @@ -1,2 +1,2 @@ -project('miniaudio', 'c', version: 'git-78cdb9c') +project('miniaudio', 'c', version: '0.11.23') miniaudio = declare_dependency(include_directories: include_directories('.')) diff --git a/subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff b/subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff deleted file mode 100644 index 37295a9..0000000 --- a/subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff +++ /dev/null @@ -1,405 +0,0 @@ -https://github.com/mstorsjo/msvc-wine/pull/187 - -diff --git a/fixinclude b/fixinclude -index 4a8c733..bd5280c 100755 ---- a/fixinclude -+++ b/fixinclude -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/env perl - # - # Copyright (c) 2019 Martin Storsjo - # -diff --git a/install.sh b/install.sh -index ac00d9f..039922f 100755 ---- a/install.sh -+++ b/install.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env sh - # - # Copyright (c) 2019 Martin Storsjo - # -diff --git a/lowercase b/lowercase -index ee10cc7..32902f7 100755 ---- a/lowercase -+++ b/lowercase -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/env perl - # - # Copyright (c) 2019 Martin Storsjo - # -diff --git a/msvcenv-native.sh b/msvcenv-native.sh -index e83c687..f3a99f1 100755 ---- a/msvcenv-native.sh -+++ b/msvcenv-native.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env sh - # - # Copyright (c) 2019 Martin Storsjo - # -@@ -33,9 +33,9 @@ else - if [ ! -f "$ENV" ]; then - echo $ENV doesn\'t exist - else -- export INCLUDE="$(bash -c ". $ENV && /bin/echo \"\$INCLUDE\"" | sed s/z://g | sed 's/\\/\//g')" -- export LIB="$(bash -c ". $ENV && /bin/echo \"\$LIB\"" | sed s/z://g | sed 's/\\/\//g')" -- MSVCARCH="$(bash -c ". $ENV && /bin/echo \"\$ARCH\"")" -+ export INCLUDE="$(bash -c ". $ENV && /usr/bin/env echo \"\$INCLUDE\"" | sed s/z://g | sed 's/\\/\//g')" -+ export LIB="$(bash -c ". $ENV && /usr/bin/env echo \"\$LIB\"" | sed s/z://g | sed 's/\\/\//g')" -+ MSVCARCH="$(bash -c ". $ENV && /usr/bin/env echo \"\$ARCH\"")" - case $MSVCARCH in - x86) TARGET_ARCH=i686 ;; - x64) TARGET_ARCH=x86_64 ;; -diff --git a/test/test-asm.sh b/test/test-asm.sh -index 5774c02..ba9511b 100755 ---- a/test/test-asm.sh -+++ b/test/test-asm.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Martin Storsjo - # -diff --git a/test/test-cl.sh b/test/test-cl.sh -index 250f092..41fe51b 100755 ---- a/test/test-cl.sh -+++ b/test/test-cl.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Huang Qinjin - # -diff --git a/test/test-clang-cl-cmds.sh b/test/test-clang-cl-cmds.sh -index 885835b..9409d2b 100755 ---- a/test/test-clang-cl-cmds.sh -+++ b/test/test-clang-cl-cmds.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Martin Storsjo - # -diff --git a/test/test-clang-cl.sh b/test/test-clang-cl.sh -index ba7f82d..f99b745 100755 ---- a/test/test-clang-cl.sh -+++ b/test/test-clang-cl.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Martin Storsjo - # -diff --git a/test/test-cmake-clang-cl.sh b/test/test-cmake-clang-cl.sh -index 78485ab..4a6ce3f 100755 ---- a/test/test-cmake-clang-cl.sh -+++ b/test/test-cmake-clang-cl.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Martin Storsjo - # -diff --git a/test/test-cmake.sh b/test/test-cmake.sh -index 6beface..994d07d 100755 ---- a/test/test-cmake.sh -+++ b/test/test-cmake.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Huang Qinjin - # -diff --git a/test/test-dumpbin.sh b/test/test-dumpbin.sh -index 68608d4..dd3841d 100755 ---- a/test/test-dumpbin.sh -+++ b/test/test-dumpbin.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Huang Qinjin - # -diff --git a/test/test-mc.sh b/test/test-mc.sh -index 836a210..2e7d8ab 100755 ---- a/test/test-mc.sh -+++ b/test/test-mc.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Mark Harmstone - # -diff --git a/test/test-meson.sh b/test/test-meson.sh -index 68ac271..bfd6d6d 100755 ---- a/test/test-meson.sh -+++ b/test/test-meson.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Martin Storsjo - # -diff --git a/test/test-midl.sh b/test/test-midl.sh -index 45d9f92..8f9319e 100755 ---- a/test/test-midl.sh -+++ b/test/test-midl.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Martin Storsjo - # -diff --git a/test/test-msbuild.sh b/test/test-msbuild.sh -index 00f03c6..faf284a 100755 ---- a/test/test-msbuild.sh -+++ b/test/test-msbuild.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Sergey Kvachonok - # -diff --git a/test/test-mt.sh b/test/test-mt.sh -index 5f1881b..eda11ab 100755 ---- a/test/test-mt.sh -+++ b/test/test-mt.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Huang Qinjin - # -diff --git a/test/test-vcpkg.sh b/test/test-vcpkg.sh -index dc3d3ce..79ebe51 100755 ---- a/test/test-vcpkg.sh -+++ b/test/test-vcpkg.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Huang Qinjin - # -diff --git a/test/test-wdk-msbuild.sh b/test/test-wdk-msbuild.sh -index b37b3de..90f4189 100755 ---- a/test/test-wdk-msbuild.sh -+++ b/test/test-wdk-msbuild.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Sergey Kvachonok - # -diff --git a/test/test.sh b/test/test.sh -index 1825216..ad9f9c1 100755 ---- a/test/test.sh -+++ b/test/test.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2023 Huang Qinjin - # -diff --git a/vsdownload.py b/vsdownload.py -index d9b4dcf..7598eec 100755 ---- a/vsdownload.py -+++ b/vsdownload.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - # - # Copyright (c) 2019 Martin Storsjo - # -diff --git a/wdk-download.sh b/wdk-download.sh -index e0ea631..7fa8bf0 100755 ---- a/wdk-download.sh -+++ b/wdk-download.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Sergey Kvachonok - # -diff --git a/wrappers/armasm b/wrappers/armasm -index 3797431..bf8ea5a 100755 ---- a/wrappers/armasm -+++ b/wrappers/armasm -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/armasm64 b/wrappers/armasm64 -index fdfdb38..eb1553f 100755 ---- a/wrappers/armasm64 -+++ b/wrappers/armasm64 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/cl b/wrappers/cl -index 35c1b23..6ca6a56 100755 ---- a/wrappers/cl -+++ b/wrappers/cl -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/cmd b/wrappers/cmd -index 88a39f0..a7ab236 100755 ---- a/wrappers/cmd -+++ b/wrappers/cmd -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/dumpbin b/wrappers/dumpbin -index c6f7f9e..18c5591 100755 ---- a/wrappers/dumpbin -+++ b/wrappers/dumpbin -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/findstr b/wrappers/findstr -index 1146022..136ac0e 100755 ---- a/wrappers/findstr -+++ b/wrappers/findstr -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Huang Qinjin - # -diff --git a/wrappers/lib b/wrappers/lib -index 143da0c..3967675 100755 ---- a/wrappers/lib -+++ b/wrappers/lib -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/link b/wrappers/link -index dba1774..53920d4 100755 ---- a/wrappers/link -+++ b/wrappers/link -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/mc b/wrappers/mc -index c1c5d80..bf71882 100755 ---- a/wrappers/mc -+++ b/wrappers/mc -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/midl b/wrappers/midl -index dd34988..adddcfa 100755 ---- a/wrappers/midl -+++ b/wrappers/midl -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/ml b/wrappers/ml -index db671c7..a5d537b 100755 ---- a/wrappers/ml -+++ b/wrappers/ml -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/ml64 b/wrappers/ml64 -index 0708ebe..df65803 100755 ---- a/wrappers/ml64 -+++ b/wrappers/ml64 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/msbuild b/wrappers/msbuild -index 65bbf8f..53fdd8f 100755 ---- a/wrappers/msbuild -+++ b/wrappers/msbuild -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2024 Sergey Kvachonok - # -diff --git a/wrappers/msvcenv.sh b/wrappers/msvcenv.sh -index 101e9bb..2d2a918 100755 ---- a/wrappers/msvcenv.sh -+++ b/wrappers/msvcenv.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/mt b/wrappers/mt -index edebd75..ed92f96 100755 ---- a/wrappers/mt -+++ b/wrappers/mt -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/nmake b/wrappers/nmake -index 88102d1..3eaf0f5 100755 ---- a/wrappers/nmake -+++ b/wrappers/nmake -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/rc b/wrappers/rc -index f7b8d97..7afb1ad 100755 ---- a/wrappers/rc -+++ b/wrappers/rc -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # -diff --git a/wrappers/wine-msvc.sh b/wrappers/wine-msvc.sh -index a267283..bb08891 100755 ---- a/wrappers/wine-msvc.sh -+++ b/wrappers/wine-msvc.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - # - # Copyright (c) 2018 Martin Storsjo - # diff --git a/subprojects/packagefiles/wuffs/meson.build b/subprojects/packagefiles/wuffs/meson.build index c595249..5d877f6 100644 --- a/subprojects/packagefiles/wuffs/meson.build +++ b/subprojects/packagefiles/wuffs/meson.build @@ -1,2 +1,2 @@ -project('wuff', 'c', version: 'git-d662ef5') +project('wuff', 'c', version: 'git-1e2e58c') wuffs = declare_dependency(include_directories: include_directories('./release/c')) |