From c54c18c20f669d3ceb8007201ebb209dc0647189 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Sun, 9 Jul 2023 19:22:09 +0200 Subject: [PATCH 1/2] Fix some ci errors Signed-off-by: Maxime Gervais --- .github/workflows/DVRescue_Checks.yml | 4 ++-- .github/workflows/dvrescue-gui.yml | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/DVRescue_Checks.yml b/.github/workflows/DVRescue_Checks.yml index e37eb2e3..5432bff5 100644 --- a/.github/workflows/DVRescue_Checks.yml +++ b/.github/workflows/DVRescue_Checks.yml @@ -19,7 +19,7 @@ jobs: run: | if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get update - sudo apt-get install -y pkg-config libxml2-utils libfreetype6-dev libraw1394-dev libavc1394-dev libiec61883-dev + sudo apt-get install -y pkg-config libxml2-utils libfreetype-dev libharfbuzz-dev libraw1394-dev libavc1394-dev libiec61883-dev fi if [ "$RUNNER_OS" == "macOS" ]; then brew install automake freetype @@ -27,7 +27,7 @@ jobs: - name: FFmpeg run: | git -C .. clone --depth=1 https://git.ffmpeg.org/ffmpeg.git - pushd ../ffmpeg && ./configure --prefix=.. --disable-doc --disable-x86asm --disable-ffplay --disable-ffprobe --enable-static --disable-everything --enable-protocol=file --enable-libfreetype --enable-indev=lavfi --enable-filter=testsrc2,scale,aresample,sine,drawtext,colorspace --enable-demuxer=dv --enable-muxer=dv --enable-encoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* --enable-decoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* && make && popd + pushd ../ffmpeg && ./configure --prefix=.. --disable-doc --disable-x86asm --disable-ffplay --disable-ffprobe --enable-static --disable-everything --enable-protocol=file --enable-libfreetype --enable-libharfbuzz --enable-indev=lavfi --enable-filter=testsrc2,scale,aresample,sine,drawtext,colorspace --enable-demuxer=dv --enable-muxer=dv --enable-encoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* --enable-decoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* && make && popd cp ../ffmpeg/ffmpeg Project/GNU/CLI/ - name: ZenLib run: | diff --git a/.github/workflows/dvrescue-gui.yml b/.github/workflows/dvrescue-gui.yml index 7108bc95..6ec66018 100644 --- a/.github/workflows/dvrescue-gui.yml +++ b/.github/workflows/dvrescue-gui.yml @@ -318,6 +318,7 @@ jobs: sudo apt-get update && sudo apt-get install -y ${{ matrix.packages }} \ libunwind-dev \ + libfreetype-dev \ libavcodec-dev \ libavformat-dev \ libavdevice-dev \ @@ -329,7 +330,7 @@ jobs: libiec61883-dev - name: Install Qt 5.15 - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: 5.15.2 @@ -399,6 +400,7 @@ jobs: sudo apt-get update && sudo apt-get install -y ${{ matrix.packages }} \ libunwind-dev \ + libfreetype-dev \ libgstreamer-plugins-base1.0-dev \ libavcodec-dev \ libavformat-dev \ @@ -409,7 +411,7 @@ jobs: libxv-dev - name: Install Qt 6.2 - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: 6.2.0 modules: 'addons.qtmultimedia qt5compat' @@ -461,7 +463,7 @@ jobs: submodule update --init --force --recursive --depth=1 - name: Install Qt 5.15 - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: arch: win64_mingw81 version: 5.15.2 @@ -541,7 +543,7 @@ jobs: submodule update --init --force --recursive --depth=1 - name: Install Qt 6.2 - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: arch: win64_mingw81 version: 6.2.0 @@ -641,7 +643,7 @@ jobs: nmake install - name: Install Qt 5.15 - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: 5.15.2 @@ -732,7 +734,7 @@ jobs: nmake install - name: Install Qt 6.2 - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: 6.2.0 modules: 'addons.qtmultimedia' From 69008fef33fa8d44856d5b038d8a568bc857c816 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Sun, 9 Jul 2023 19:51:26 +0200 Subject: [PATCH 2/2] CI: pin to Qt 6.2 for now Signed-off-by: Maxime Gervais --- .github/workflows/dvrescue-gui.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dvrescue-gui.yml b/.github/workflows/dvrescue-gui.yml index 6ec66018..70d4dc8f 100644 --- a/.github/workflows/dvrescue-gui.yml +++ b/.github/workflows/dvrescue-gui.yml @@ -95,16 +95,18 @@ jobs: - name: Install dependencies run: | - brew install ${{ matrix.packages }} pkg-config qt ffmpeg + brew install ${{ matrix.packages }} pkg-config ffmpeg + + - name: Install Qt 6.2 + uses: jurplel/install-qt-action@v3 + with: + version: 6.2.0 + modules: 'addons.qtmultimedia' - name: Install qwt run: | brew install qwt - - name: Set Qt6 environment path - run: | - echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH - - name: Build dvrescue-gui env: USE_BREW: true @@ -229,14 +231,15 @@ jobs: git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ submodule update --init --force --recursive --depth=1 - - name: Install dependencies run: | - brew install ${{ matrix.packages }} nasm qt + brew install ${{ matrix.packages }} nasm - - name: Set Qt6 environment path - run: | - echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH + - name: Install Qt 6.2 + uses: jurplel/install-qt-action@v3 + with: + version: 6.2.0 + modules: 'addons.qtmultimedia' - name: Build qwt run: |