From 5d552ca23643b8f6f981c80ef4ca56f19f1ec296 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 18 Jun 2025 09:57:19 -0700 Subject: [PATCH 1/4] Add Timeout to FreeBSD build --- .github/workflows/rpcs3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index c9772102db..1981f78edb 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -409,6 +409,7 @@ jobs: if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master') name: RPCS3 FreeBSD runs-on: ubuntu-latest + timeout-minutes: 60 env: CCACHE_DIR: ${{ github.workspace }}/ccache QT_VER_MAIN: '6' From 424f9306c44dfd9f845ae00b0a81a43fb52e923e Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 18 Jun 2025 12:49:19 -0700 Subject: [PATCH 2/4] Use system LibUSB for FreeBSD --- .ci/build-freebsd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 2102f32315..8acbec31c1 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -14,6 +14,7 @@ CONFIGURE_ARGS=" -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_LIBPNG=ON + -DUSE_SYSTEM_LIBUSB=ON -DUSE_SYSTEM_OPENCV=ON " From c6c72d372150a80228700e3713921971e30dca16 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 18 Jun 2025 12:49:46 -0700 Subject: [PATCH 3/4] install opencv FreeBSD --- .ci/install-freebsd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh index de10561dfa..04efc6c0e9 100755 --- a/.ci/install-freebsd.sh +++ b/.ci/install-freebsd.sh @@ -15,4 +15,4 @@ pkg install "llvm$LLVM_COMPILER_VER" pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg # Optional dependencies (libevdev is pulled by qtX-base) -pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader +pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader opencv From 9c93ec0bc31bbc94ca4dce2a76ceea80da6f6554 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Thu, 19 Jun 2025 08:00:34 -0700 Subject: [PATCH 4/4] exclude libusb submodule --- .ci/build-freebsd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 8acbec31c1..7f35412b58 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -4,7 +4,7 @@ # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 git config --global --add safe.directory . -git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ && !/libpng/ && !/libsdl-org/ && !/curl/ && !/zlib/ { print $3 }' .gitmodules) +git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ && !/libpng/ && !/libsdl-org/ && !/curl/ && !/zlib/ && !/libusb/ { print $3 }' .gitmodules) CONFIGURE_ARGS=" -DWITH_LLVM=ON