From 75666684321a94e94dc533410de3a8cfe6945069 Mon Sep 17 00:00:00 2001 From: YiFang Xiao Date: Fri, 2 Jun 2023 20:01:51 +0800 Subject: [PATCH] action: upgrade qt version from qt6.4.3 to qt6.5.1 remove unused action files --- .github/workflows/build.yml | 2 +- .github/workflows/cmake build check.yml | 6 +- .github/workflows/ffmpeg-macos-build.yml | 223 ------------------ .github/workflows/ffmpeg.yml | 52 ---- .github/workflows/macos-homebrew-PR-check.yml | 2 +- .github/workflows/macos-homebrew-xapian.yml | 2 +- .github/workflows/ubuntu-6.2-xapian.yml | 2 +- .github/workflows/ubuntu-PR-check.yml | 2 +- .github/workflows/windows-6.x-xapian.yml | 2 +- .github/workflows/windows-PR-check.yml | 2 +- tools/scripts/Build ffmpeg on macos.md | 194 +++++++++++++++ 11 files changed, 204 insertions(+), 285 deletions(-) delete mode 100644 .github/workflows/ffmpeg-macos-build.yml delete mode 100644 .github/workflows/ffmpeg.yml create mode 100644 tools/scripts/Build ffmpeg on macos.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17f6b388..cd1490d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.4.3 + version: 6.5.1 arch: gcc_64 cached: 'false' #serialport linuxdeploy need serialport to work. diff --git a/.github/workflows/cmake build check.yml b/.github/workflows/cmake build check.yml index 8b3dc2d1..9af441d3 100644 --- a/.github/workflows/cmake build check.yml +++ b/.github/workflows/cmake build check.yml @@ -26,7 +26,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.4.3 + version: 6.5.1 arch: gcc_64 cached: 'false' #serialport linuxdeploy need serialport to work. @@ -70,7 +70,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.4.3 + version: 6.5.1 arch: win64_msvc2019_64 cached: 'false' #serialport linuxdeploy need serialport to work. @@ -96,7 +96,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.4.3 + version: 6.5.1 arch: clang_64 cached: 'false' #serialport linuxdeploy need serialport to work. diff --git a/.github/workflows/ffmpeg-macos-build.yml b/.github/workflows/ffmpeg-macos-build.yml deleted file mode 100644 index 79db44fd..00000000 --- a/.github/workflows/ffmpeg-macos-build.yml +++ /dev/null @@ -1,223 +0,0 @@ -name: ffmpeg-macos-build -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - -jobs: - build: - name: Build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-12] - - steps: - # macos 11.0 默认环境变了,要指定 - - name: prepare env - if: ${{ matrix.os == 'macos-11' }} - run: | - softwareupdate --all --install --force - sudo xcode-select --print-path - sudo xcode-select --switch /Library/Developer/CommandLineTools - - - name: build ffmpeg - run: | - mkdir build - brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm - brew install speex - git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg - cd ffmpeg - ./configure --prefix=../build/ \ - --enable-shared \ - --disable-static \ - --disable-debug \ - --disable-programs \ - --disable-network \ - --disable-avdevice \ - --disable-avfilter \ - --disable-swscale \ - --disable-network \ - --disable-muxers \ - --disable-demuxers \ - --enable-rdft \ - --enable-demuxer=aac \ - --enable-demuxer=ac3 \ - --enable-demuxer=aiff \ - --enable-demuxer=ape \ - --enable-demuxer=asf \ - --enable-demuxer=flac \ - --enable-demuxer=matroska \ - --enable-demuxer=mp3 \ - --enable-demuxer=mpc \ - --enable-demuxer=mov \ - --enable-demuxer=mpc8 \ - --enable-demuxer=ogg \ - --enable-demuxer=tta \ - --enable-demuxer=wav \ - --enable-demuxer=wv \ - --disable-bsfs \ - --disable-filters \ - --disable-parsers \ - --enable-parser=aac \ - --enable-parser=ac3 \ - --enable-parser=mpegaudio \ - --disable-protocols \ - --disable-indevs \ - --disable-outdevs \ - --disable-encoders \ - --disable-decoders \ - --enable-decoder=eightsvx_exp \ - --enable-decoder=eightsvx_fib \ - --enable-decoder=aac \ - --enable-decoder=aac_latm \ - --enable-decoder=ac3 \ - --enable-decoder=adpcm_4xm \ - --enable-decoder=adpcm_adx \ - --enable-decoder=adpcm_afc \ - --enable-decoder=adpcm_ct \ - --enable-decoder=adpcm_ea \ - --enable-decoder=adpcm_ea_maxis_xa \ - --enable-decoder=adpcm_ea_r1 \ - --enable-decoder=adpcm_ea_r2 \ - --enable-decoder=adpcm_ea_r3 \ - --enable-decoder=adpcm_ea_xas \ - --enable-decoder=adpcm_g722 \ - --enable-decoder=adpcm_g726 \ - --enable-decoder=adpcm_ima_amv \ - --enable-decoder=adpcm_ima_apc \ - --enable-decoder=adpcm_ima_dk3 \ - --enable-decoder=adpcm_ima_dk4 \ - --enable-decoder=adpcm_ima_ea_eacs \ - --enable-decoder=adpcm_ima_ea_sead \ - --enable-decoder=adpcm_ima_iss \ - --enable-decoder=adpcm_ima_oki \ - --enable-decoder=adpcm_ima_qt \ - --enable-decoder=adpcm_ima_smjpeg \ - --enable-decoder=adpcm_ima_wav \ - --enable-decoder=adpcm_ima_ws \ - --enable-decoder=adpcm_ms \ - --enable-decoder=adpcm_sbpro_2 \ - --enable-decoder=adpcm_sbpro_3 \ - --enable-decoder=adpcm_sbpro_4 \ - --enable-decoder=adpcm_swf \ - --enable-decoder=adpcm_thp \ - --enable-decoder=adpcm_xa \ - --enable-decoder=adpcm_yamaha \ - --enable-decoder=alac \ - --enable-decoder=amrnb \ - --enable-decoder=libopencore_amrnb \ - --enable-decoder=amrwb \ - --enable-decoder=libopencore_amrwb \ - --enable-decoder=ape \ - --enable-decoder=atrac1 \ - --enable-decoder=atrac3 \ - --enable-decoder=binkaudio_dct \ - --enable-decoder=binkaudio_rdft \ - --enable-decoder=bmv_audio \ - --enable-decoder=comfortnoise \ - --enable-decoder=cook \ - --enable-decoder=dsicinaudio \ - --enable-decoder=dca \ - --enable-decoder=eac3 \ - --enable-decoder=flac \ - --enable-decoder=g723_1 \ - --enable-decoder=g729 \ - --enable-decoder=gsm \ - --enable-decoder=libgsm \ - --enable-decoder=gsm_ms \ - --enable-decoder=libgsm_ms \ - --enable-decoder=iac \ - --enable-decoder=imc \ - --enable-decoder=interplay_dpcm \ - --enable-decoder=mace3 \ - --enable-decoder=mace6 \ - --enable-decoder=mlp \ - --enable-decoder=mp1 \ - --enable-decoder=mp1float \ - --enable-decoder=mp2 \ - --enable-decoder=mp2float \ - --enable-decoder=mp3 \ - --enable-decoder=mp3float \ - --enable-decoder=mp3adu \ - --enable-decoder=mp3adufloat \ - --enable-decoder=mp3on4 \ - --enable-decoder=mp3on4float \ - --enable-decoder=als \ - --enable-decoder=mpc7 \ - --enable-decoder=mpc8 \ - --enable-decoder=nellymoser \ - --enable-decoder=libopus \ - --enable-decoder=paf_audio \ - --enable-decoder=pcm_alaw \ - --enable-decoder=pcm_bluray \ - --enable-decoder=pcm_dvd \ - --enable-decoder=pcm_f32be \ - --enable-decoder=pcm_f32le \ - --enable-decoder=pcm_f64be \ - --enable-decoder=pcm_f64le \ - --enable-decoder=pcm_lxf \ - --enable-decoder=pcm_mulaw \ - --enable-decoder=pcm_s16be \ - --enable-decoder=pcm_s16be_planar \ - --enable-decoder=pcm_s16le \ - --enable-decoder=pcm_s16le_planar \ - --enable-decoder=pcm_s24be \ - --enable-decoder=pcm_s24daud \ - --enable-decoder=pcm_s24le \ - --enable-decoder=pcm_s24le_planar \ - --enable-decoder=pcm_s32be \ - --enable-decoder=pcm_s32le \ - --enable-decoder=pcm_s32le_planar \ - --enable-decoder=pcm_s8 \ - --enable-decoder=pcm_s8_planar \ - --enable-decoder=pcm_u16be \ - --enable-decoder=pcm_u16le \ - --enable-decoder=pcm_u24be \ - --enable-decoder=pcm_u24le \ - --enable-decoder=pcm_u32be \ - --enable-decoder=pcm_u32le \ - --enable-decoder=pcm_u8 \ - --enable-decoder=pcm_zork \ - --enable-decoder=qcelp \ - --enable-decoder=qdm2 \ - --enable-decoder=ra_144 \ - --enable-decoder=ra_288 \ - --enable-decoder=ralf \ - --enable-decoder=roq_dpcm \ - --enable-decoder=s302m \ - --enable-decoder=shorten \ - --enable-decoder=sipr \ - --enable-decoder=smackaud \ - --enable-decoder=sol_dpcm \ - --enable-decoder=sonic \ - --enable-decoder=libspeex \ - --enable-decoder=tak \ - --enable-decoder=truehd \ - --enable-decoder=truespeech \ - --enable-decoder=tta \ - --enable-decoder=twinvq \ - --enable-decoder=vima \ - --enable-decoder=vmdaudio \ - --enable-decoder=vorbis \ - --enable-decoder=ffwavesynth \ - --enable-decoder=wavpack \ - --enable-decoder=ws_snd1 \ - --enable-decoder=wmalossless \ - --enable-decoder=wmapro \ - --enable-decoder=wmav1 \ - --enable-decoder=wmav2 \ - --enable-decoder=wmavoice \ - --enable-decoder=xan_dpcm \ - --enable-libspeex - make - sudo make install - - ls -al ../build - # otool -L build/*.dylib - - # - uses: actions/upload-artifact@v2 - # with: - # name: build - # path: build/* \ No newline at end of file diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml deleted file mode 100644 index aaa9bdbd..00000000 --- a/.github/workflows/ffmpeg.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: ffmpeg-build -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - -jobs: - build: - name: Build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-12] - - steps: - # macos 11.0 默认环境变了,要指定 - - name: prepare env - if: ${{ matrix.os == 'macos-11' }} - run: | - softwareupdate --all --install --force - sudo xcode-select --print-path - sudo xcode-select --switch /Library/Developer/CommandLineTools - - - name: build ffmpeg - run: | - mkdir build - - brew install autoconf automake libtool - brew install nasm - export VCPKG_OSX_ARCHITECTURES="x86_64 arm64" - vcpkg install ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl]:arm64-osx-dynamic --x-install-root=build - vcpkg install ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl]:x64-osx-dynamic --x-install-root=build - ls -al build/arm64-osx-dynamic/lib - ls -al build/ - lipo -info build/arm64-osx-dynamic/lib/libavco* - - cd build - lipo -create -output libavcodec.dylib arm64-osx-dynamic/lib/libavcodec.dylib x64-osx-dynamic/lib/libavcodec.dylib - lipo -create -output libspeex.dylib arm64-osx-dynamic/lib/libspeex.dylib x64-osx-dynamic/lib/libspeex.dylib - lipo -detailed_info libavcodec.dylib - lipo -detailed_info libspeex.dylib - - - uses: actions/upload-artifact@v2 - with: - name: build - path: build/* - - - uses: actions/upload-artifact@v2 - with: - name: build-lipo - path: build/*.dylib diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml index 4eb2042c..b154a928 100644 --- a/.github/workflows/macos-homebrew-PR-check.yml +++ b/.github/workflows/macos-homebrew-PR-check.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [macos-12] - qt_ver: [6.4.3] + qt_ver: [6.5.1] qt_arch: [clang_64] env: targetName: GoldenDict diff --git a/.github/workflows/macos-homebrew-xapian.yml b/.github/workflows/macos-homebrew-xapian.yml index 304c8d3c..3acbe1f0 100644 --- a/.github/workflows/macos-homebrew-xapian.yml +++ b/.github/workflows/macos-homebrew-xapian.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-11,macos-12] - qt_ver: [6.4.3] + qt_ver: [6.5.1] qt_arch: [clang_64] env: targetName: GoldenDict diff --git a/.github/workflows/ubuntu-6.2-xapian.yml b/.github/workflows/ubuntu-6.2-xapian.yml index 0a602405..a6684b7b 100644 --- a/.github/workflows/ubuntu-6.2-xapian.yml +++ b/.github/workflows/ubuntu-6.2-xapian.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - qt_ver: [6.4.3] + qt_ver: [6.5.1] qt_arch: [gcc_64] env: version: 23.06.02 diff --git a/.github/workflows/ubuntu-PR-check.yml b/.github/workflows/ubuntu-PR-check.yml index 0bcca739..5de0b5c9 100644 --- a/.github/workflows/ubuntu-PR-check.yml +++ b/.github/workflows/ubuntu-PR-check.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - qt_ver: [5.15.2,6.4.3] + qt_ver: [5.15.2,6.5.1] qt_arch: [gcc_64] steps: diff --git a/.github/workflows/windows-6.x-xapian.yml b/.github/workflows/windows-6.x-xapian.yml index 66cba9db..9dfa1791 100644 --- a/.github/workflows/windows-6.x-xapian.yml +++ b/.github/workflows/windows-6.x-xapian.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [windows-2019] - qt_ver: [6.4.3] + qt_ver: [6.5.1] qt_arch: [win64_msvc2019_64] env: targetName: GoldenDict.exe diff --git a/.github/workflows/windows-PR-check.yml b/.github/workflows/windows-PR-check.yml index b68a207c..665d4852 100644 --- a/.github/workflows/windows-PR-check.yml +++ b/.github/workflows/windows-PR-check.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [windows-2019] - qt_ver: [5.15.2,6.4.3] + qt_ver: [5.15.2,6.5.1] qt_arch: [win64_msvc2019_64] steps: - uses: actions/setup-python@v3 diff --git a/tools/scripts/Build ffmpeg on macos.md b/tools/scripts/Build ffmpeg on macos.md new file mode 100644 index 00000000..5a3a172a --- /dev/null +++ b/tools/scripts/Build ffmpeg on macos.md @@ -0,0 +1,194 @@ +``` +brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm +brew install speex +git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg +cd ffmpeg +./configure --prefix=../build/ \ +--enable-shared \ +--disable-static \ +--disable-debug \ +--disable-programs \ +--disable-network \ +--disable-avdevice \ +--disable-avfilter \ +--disable-swscale \ +--disable-network \ +--disable-muxers \ +--disable-demuxers \ +--enable-rdft \ +--enable-demuxer=aac \ +--enable-demuxer=ac3 \ +--enable-demuxer=aiff \ +--enable-demuxer=ape \ +--enable-demuxer=asf \ +--enable-demuxer=flac \ +--enable-demuxer=matroska \ +--enable-demuxer=mp3 \ +--enable-demuxer=mpc \ +--enable-demuxer=mov \ +--enable-demuxer=mpc8 \ +--enable-demuxer=ogg \ +--enable-demuxer=tta \ +--enable-demuxer=wav \ +--enable-demuxer=wv \ +--disable-bsfs \ +--disable-filters \ +--disable-parsers \ +--enable-parser=aac \ +--enable-parser=ac3 \ +--enable-parser=mpegaudio \ +--disable-protocols \ +--disable-indevs \ +--disable-outdevs \ +--disable-encoders \ +--disable-decoders \ +--enable-decoder=eightsvx_exp \ +--enable-decoder=eightsvx_fib \ +--enable-decoder=aac \ +--enable-decoder=aac_latm \ +--enable-decoder=ac3 \ +--enable-decoder=adpcm_4xm \ +--enable-decoder=adpcm_adx \ +--enable-decoder=adpcm_afc \ +--enable-decoder=adpcm_ct \ +--enable-decoder=adpcm_ea \ +--enable-decoder=adpcm_ea_maxis_xa \ +--enable-decoder=adpcm_ea_r1 \ +--enable-decoder=adpcm_ea_r2 \ +--enable-decoder=adpcm_ea_r3 \ +--enable-decoder=adpcm_ea_xas \ +--enable-decoder=adpcm_g722 \ +--enable-decoder=adpcm_g726 \ +--enable-decoder=adpcm_ima_amv \ +--enable-decoder=adpcm_ima_apc \ +--enable-decoder=adpcm_ima_dk3 \ +--enable-decoder=adpcm_ima_dk4 \ +--enable-decoder=adpcm_ima_ea_eacs \ +--enable-decoder=adpcm_ima_ea_sead \ +--enable-decoder=adpcm_ima_iss \ +--enable-decoder=adpcm_ima_oki \ +--enable-decoder=adpcm_ima_qt \ +--enable-decoder=adpcm_ima_smjpeg \ +--enable-decoder=adpcm_ima_wav \ +--enable-decoder=adpcm_ima_ws \ +--enable-decoder=adpcm_ms \ +--enable-decoder=adpcm_sbpro_2 \ +--enable-decoder=adpcm_sbpro_3 \ +--enable-decoder=adpcm_sbpro_4 \ +--enable-decoder=adpcm_swf \ +--enable-decoder=adpcm_thp \ +--enable-decoder=adpcm_xa \ +--enable-decoder=adpcm_yamaha \ +--enable-decoder=alac \ +--enable-decoder=amrnb \ +--enable-decoder=libopencore_amrnb \ +--enable-decoder=amrwb \ +--enable-decoder=libopencore_amrwb \ +--enable-decoder=ape \ +--enable-decoder=atrac1 \ +--enable-decoder=atrac3 \ +--enable-decoder=binkaudio_dct \ +--enable-decoder=binkaudio_rdft \ +--enable-decoder=bmv_audio \ +--enable-decoder=comfortnoise \ +--enable-decoder=cook \ +--enable-decoder=dsicinaudio \ +--enable-decoder=dca \ +--enable-decoder=eac3 \ +--enable-decoder=flac \ +--enable-decoder=g723_1 \ +--enable-decoder=g729 \ +--enable-decoder=gsm \ +--enable-decoder=libgsm \ +--enable-decoder=gsm_ms \ +--enable-decoder=libgsm_ms \ +--enable-decoder=iac \ +--enable-decoder=imc \ +--enable-decoder=interplay_dpcm \ +--enable-decoder=mace3 \ +--enable-decoder=mace6 \ +--enable-decoder=mlp \ +--enable-decoder=mp1 \ +--enable-decoder=mp1float \ +--enable-decoder=mp2 \ +--enable-decoder=mp2float \ +--enable-decoder=mp3 \ +--enable-decoder=mp3float \ +--enable-decoder=mp3adu \ +--enable-decoder=mp3adufloat \ +--enable-decoder=mp3on4 \ +--enable-decoder=mp3on4float \ +--enable-decoder=als \ +--enable-decoder=mpc7 \ +--enable-decoder=mpc8 \ +--enable-decoder=nellymoser \ +--enable-decoder=libopus \ +--enable-decoder=paf_audio \ +--enable-decoder=pcm_alaw \ +--enable-decoder=pcm_bluray \ +--enable-decoder=pcm_dvd \ +--enable-decoder=pcm_f32be \ +--enable-decoder=pcm_f32le \ +--enable-decoder=pcm_f64be \ +--enable-decoder=pcm_f64le \ +--enable-decoder=pcm_lxf \ +--enable-decoder=pcm_mulaw \ +--enable-decoder=pcm_s16be \ +--enable-decoder=pcm_s16be_planar \ +--enable-decoder=pcm_s16le \ +--enable-decoder=pcm_s16le_planar \ +--enable-decoder=pcm_s24be \ +--enable-decoder=pcm_s24daud \ +--enable-decoder=pcm_s24le \ +--enable-decoder=pcm_s24le_planar \ +--enable-decoder=pcm_s32be \ +--enable-decoder=pcm_s32le \ +--enable-decoder=pcm_s32le_planar \ +--enable-decoder=pcm_s8 \ +--enable-decoder=pcm_s8_planar \ +--enable-decoder=pcm_u16be \ +--enable-decoder=pcm_u16le \ +--enable-decoder=pcm_u24be \ +--enable-decoder=pcm_u24le \ +--enable-decoder=pcm_u32be \ +--enable-decoder=pcm_u32le \ +--enable-decoder=pcm_u8 \ +--enable-decoder=pcm_zork \ +--enable-decoder=qcelp \ +--enable-decoder=qdm2 \ +--enable-decoder=ra_144 \ +--enable-decoder=ra_288 \ +--enable-decoder=ralf \ +--enable-decoder=roq_dpcm \ +--enable-decoder=s302m \ +--enable-decoder=shorten \ +--enable-decoder=sipr \ +--enable-decoder=smackaud \ +--enable-decoder=sol_dpcm \ +--enable-decoder=sonic \ +--enable-decoder=libspeex \ +--enable-decoder=tak \ +--enable-decoder=truehd \ +--enable-decoder=truespeech \ +--enable-decoder=tta \ +--enable-decoder=twinvq \ +--enable-decoder=vima \ +--enable-decoder=vmdaudio \ +--enable-decoder=vorbis \ +--enable-decoder=ffwavesynth \ +--enable-decoder=wavpack \ +--enable-decoder=ws_snd1 \ +--enable-decoder=wmalossless \ +--enable-decoder=wmapro \ +--enable-decoder=wmav1 \ +--enable-decoder=wmav2 \ +--enable-decoder=wmavoice \ +--enable-decoder=xan_dpcm \ +--enable-libspeex +make +sudo make install + +ls -al ../build +# otool -L build/*.dylib + +``` \ No newline at end of file