Switch to new windows build image.

.github/opam/liquidsoap-core-windows.opam

@@ -30,6 +30,11 @@ depends: [
   "magic-mime-windows"
   "menhir"
   "menhirLib-windows"
+  "uri"
+  "uri-windows"
+  "fileutils"
+  "fileutils-windows"
+  "curl-windows"
   "mem_usage-windows" {>= "0.1.1"}
   "metadata-windows" {>= "0.3.0"}
   "dune-site-windows"
@@ -123,7 +128,7 @@ build: [
     "LIQUIDSOAP_BUILD_TARGET=standalone"
     "LIQUIDSOAP_SYS_CONFIG=mingw"
     "LIQUIDSOAP_ENABLE_BUILD_CONFIG=false"
-    "LDFLAGS=-lssp -lfdk-aac"
+    "LIQ_LDFLAGS=-lcurl -lwldap32 -ldl -lnghttp2 -lpsl -lssh2 -lidn2 -lzstd -lunistring -lbrotlicommon -lbrotlidec -lcrypt32 -liconv -lpthread -lz -lbcrypt -lwinmm -lksuser -link /usr/src/mxe/usr/x86_64-w64-mingw32.static/lib/libavutil.a"
     "dune"
     "build"
     "-x"

.github/scripts/build-win32.sh

@@ -42,15 +42,8 @@ export CC=""
 echo "::group::Installing deps"
 
 eval "$(opam config env)"
-opam repository set-url default https://github.com/ocaml/opam-repository.git
 opam repository set-url windows https://github.com/ocaml-cross/opam-cross-windows.git
 opam update windows
-# shellcheck disable=SC2046
-opam upgrade -y $(echo "$OPAM_DEPS" | sed -e 's#,# #g') ffmpeg-windows ffmpeg-avutil-windows
-opam remove -y pcre-windows
-
-# Debug
-opam reinstall -y cry-windows
 
 echo "::endgroup::"
 

.github/workflows/ci.yml

@@ -482,14 +482,14 @@ jobs:
           path: ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
 
   build_win32:
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-22.04-4
     needs: build_details
     strategy:
       fail-fast: false
       matrix:
         system: [x64]
     container:
-      image: savonet/liquidsoap-win32-deps-${{ matrix.system }}
+      image: savonet/liquidsoap-win32-${{ matrix.system }}
       options: --user root -v ${{ github.workspace }}/${{ github.run_number }}:/tmp/${{ github.run_number }}
     env:
       OPAM_DEPS: ao-windows,lastfm-windows,camomile-windows,cry-windows,dtools-windows,duppy-windows,ffmpeg-windows,ffmpeg-avutil-windows,mm-windows,re-windows,portaudio-windows,samplerate-windows,sedlex-windows,ssl-windows,srt-windows,winsvc-windows,mem_usage-windows

scripts/dune

@@ -1,6 +1,6 @@
 (executable
  (name gen_emacs_completion)
- (link_flags -cclib %{env:LDFLAGS=})
+ (link_flags -cclib %{env:LIQ_LDFLAGS=})
  (libraries liquidsoap_runtime)
  (modules gen_emacs_completion))
 

src/bin/dune

@@ -2,7 +2,7 @@
  (name liquidsoap)
  (public_name liquidsoap)
  (package liquidsoap-core)
- (link_flags -cclib %{env:LDFLAGS=})
+ (link_flags -cclib %{env:LIQ_LDFLAGS=})
  (libraries liquidsoap_runtime)
  (modules liquidsoap))
 

src/core/tools/unix_c.c

@@ -1,5 +1,6 @@
 #ifdef _WIN32
 #include <processthreadsapi.h>
+#include <winsock2.h>
 #include <windows.h>
 #else
 #define _GNU_SOURCE