windows: switch to ucrt64

meson.build

@@ -48,9 +48,9 @@ zrythm_src_tarball_filename = zrythm_inner_dir_name + '.tar.gz'
 zplugins_src_tarball_filename = 'zplugins-' + zplugins_ver + '.tar.gz'
 mingw_arch = 'ucrt64'
 mingw_prefix = '/' + mingw_arch
-mingw_pkg_prefix = 'mingw-w64-ucrt-x86_64-'
-mingw_zrythm_pkg_filename = mingw_pkg_prefix + 'zrythm-' + zrythm_pkg_ver + '-1-any.pkg.tar.zst'
-mingw_zrythm_trial_pkg_filename = mingw_pkg_prefix + 'zrythm-trial-' + zrythm_pkg_ver + '-1-any.pkg.tar.zst'
+mingw_pkg_prefix = 'mingw-w64-ucrt-x86_64'
+mingw_zrythm_pkg_filename = mingw_pkg_prefix + '-zrythm-' + zrythm_pkg_ver + '-1-any.pkg.tar.zst'
+mingw_zrythm_trial_pkg_filename = mingw_pkg_prefix + '-zrythm-trial-' + zrythm_pkg_ver + '-1-any.pkg.tar.zst'
 debian_src_tarball_filename = 'zrythm_' + zrythm_pkg_ver + '.orig.tar.gz'
 carla_prefix = '/usr/lib/zrythm'
 library_prefix = meson.build_root () / 'lib_prefix'

windows-msys/PKGBUILD-carla-mingw.in

@@ -44,7 +44,7 @@ prepare() {
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  if [ "$MINGW_INSTALLS" = "mingw32" ]; then
+  if [ "$MINGW_ARCH" = "mingw32" ]; then
     make win32r PREFIX=${MINGW_PREFIX} BUILDING_FOR_WINDOWS=true DEBUG=false
   else
     make PREFIX=${MINGW_PREFIX} BUILDING_FOR_WINDOWS=true DEBUG=false
@@ -57,7 +57,7 @@ package() {
   mkdir -p "${pkgdir}/${MINGW_PREFIX}"/lib/carla
   install -D -m755 bin/*.exe "${pkgdir}/${MINGW_PREFIX}"/lib/carla/
 
-  if [ "$MINGW_INSTALLS" != "mingw32" ]; then
+  if [ "$MINGW_ARCH" != "mingw32" ]; then
     make DESTDIR=${pkgdir} PREFIX="${MINGW_PREFIX}" BUILDING_FOR_WINDOWS=true DEBUG=false install
   fi
 }

windows-msys/PKGBUILD.in

@@ -85,6 +85,7 @@ build() {
     -Dphone_home=enabled \
     -Dmanpage=false \
     -Dtrial_ver=@TRIAL_TRUE_FALSE@ \
+    -Dvamp-static=true \
     -Dinstaller_ver=true -Dcarla=enabled \
     -Dcarla_binaries_dir_32bit='C:\msys64\mingw32\lib\carla' \
     --buildtype=debugoptimized \

windows-msys/make_zrythm_mingw_pkg.sh.in

@@ -19,6 +19,7 @@
 
 set -ex
 
+mingw_arch="@MINGW_ARCH@"
 mingw_pkg_prefix="@MINGW_PKG_PREFIX@"
 
 out_file="$1"
@@ -40,7 +41,7 @@ cp $pkgbuild $private_dir/PKGBUILD
 cp $src_tarball $private_dir/
 cp $zplugins_tarball $private_dir/
 pushd $private_dir
-MINGW_INSTALLS=mingw64 makepkg-mingw -fs --noconfirm
+MINGW_ARCH=$mingw_arch makepkg-mingw -fs --noconfirm
 popd
 
 cp $private_dir/*.pkg.tar.zst $out_file

windows-msys/meson.build

@@ -24,6 +24,8 @@ windows_msys_conf.set (
   'ZPLUGINS_VER', zplugins_ver)
 windows_msys_conf.set (
   'ZRYTHM_PKG_VERSION', zrythm_pkg_ver)
+windows_msys_conf.set (
+  'ZRYTHM_PKG_SEMVER_VERSION', zrythm_pkg_semver)
 windows_msys_conf.set (
   'TRIAL_TRUE_FALSE', trial_true_false)
 windows_msys_conf.set (
@@ -40,6 +42,8 @@ windows_msys_conf.set (
   'MINGW_PKG_PREFIX', mingw_pkg_prefix)
 windows_msys_conf.set (
   'MINGW_PREFIX', mingw_prefix)
+windows_msys_conf.set (
+  'MINGW_ARCH', mingw_arch)
 windows_msys_conf.set ('IS_TAG', is_tag ? 'true' : 'false')
 
 mingw_zrythm_pkgbuild = configure_file (
@@ -164,11 +168,11 @@ rcedit_x64_exe = custom_target (
 
 # install dependencies
 carla_packages = []
-foreach arch : [ '64', '32' ]
+foreach arch : [ 'ucrt64', 'mingw32' ]
 #foreach arch : [ '32' ]
   carla_pkg_target = custom_target (
   'mingw-carla-' + arch,
-  output: 'carla' + arch + '.pkg.tar.zst',
+  output: 'carla-' + arch + '.pkg.tar.zst',
   input: [
     make_mingw_pkg, mingw_carla_pkgbuild,
     carla_zip_windows,
@@ -178,8 +182,7 @@ foreach arch : [ '64', '32' ]
     '@INPUT0@ "$1" "$2" "$3" "$4" "$5" "$6"',
     '_ignored',
     '@OUTPUT@', '@INPUT1@', '@PRIVATE_DIR@',
-    'mingw' + arch,
-    arch == '64' ? 'x86_64' : 'i686',
+    arch,
     '@INPUT2@',
     ],
   install: false,