From 5d1f7f0206078e367f7de723094d66c95b4f81fe Mon Sep 17 00:00:00 2001 From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com> Date: Mon, 25 Sep 2023 07:46:03 +0800 Subject: [PATCH] opt: remove ffmpeg player (#1164) * opt: remove ffmpeg player * opt: remove ffmpeg player --- .github/workflows/macos-homebrew-PR-check.yml | 8 ++--- .github/workflows/macos-homebrew-breakpad.yml | 2 +- .github/workflows/macos-homebrew.yml | 29 +++++++++---------- .github/workflows/ubuntu-6.2.yml | 2 +- .github/workflows/windows-6.x.yml | 2 +- package-lock.json | 2 +- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml index c89823ff..e27dfbfe 100644 --- a/.github/workflows/macos-homebrew-PR-check.yml +++ b/.github/workflows/macos-homebrew-PR-check.yml @@ -56,9 +56,9 @@ jobs: brew install libtool brew install opencc - brew install speex - brew tap homebrew-ffmpeg/ffmpeg - brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex + # brew install speex + # brew tap homebrew-ffmpeg/ffmpeg + # brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex brew install libao brew install libiconv brew install lzo bzip2 @@ -78,6 +78,6 @@ jobs: - name: compile run: | - qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_iconv CONFIG+=use_xapian + qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_iconv CONFIG+=use_xapian CONFIG+=no_ffmpeg_player make diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml index 1aa57287..a62a49d9 100644 --- a/.github/workflows/macos-homebrew-breakpad.yml +++ b/.github/workflows/macos-homebrew-breakpad.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-13] - qt_ver: [ 6.4.3,6.5.2 ] + qt_ver: [ 6.5.2 ] qt_arch: [clang_64] env: targetName: GoldenDict diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index e69a063f..b88ca732 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-12,macos-13] - qt_ver: [ 6.4.3,6.6.0 ] + qt_ver: [ 6.6.0 ] qt_arch: [clang_64] env: targetName: GoldenDict @@ -47,15 +47,14 @@ jobs: brew install autoconf brew install libtool brew install opencc - brew install speex + # brew install speex brew install wavpack - brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm - brew install speex - + brew install automake git lame libass libtool sdl shtool texi2html theora wget xvid nasm + # brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm - brew tap homebrew-ffmpeg/ffmpeg - brew options homebrew-ffmpeg/ffmpeg/ffmpeg - brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex + # brew tap homebrew-ffmpeg/ffmpeg + # brew options homebrew-ffmpeg/ffmpeg/ffmpeg + # brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex brew install libiconv brew install lzo bzip2 @@ -102,7 +101,7 @@ jobs: - name: compile run: | - qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian + qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=no_ffmpeg_player make -j8 - name: package @@ -112,8 +111,8 @@ jobs: otool -L GoldenDict.app/Contents/MacOS/GoldenDict ls -al GoldenDict.app/Contents/Frameworks otool -L GoldenDict.app/Contents/Frameworks/libzim.8.dylib - otool -L GoldenDict.app/Contents/Frameworks/libav* - otool -L GoldenDict.app/Contents/Frameworks/libjxl.0.8.dylib + # otool -L GoldenDict.app/Contents/Frameworks/libav* + # otool -L GoldenDict.app/Contents/Frameworks/libjxl.0.8.dylib cp -r /usr/local/Cellar/icu4c/7*/lib/libicu*.dylib GoldenDict.app/Contents/Frameworks cp -r /usr/local/Cellar/zstd/1.5.5/lib/libzstd.1.dylib GoldenDict.app/Contents/Frameworks # dylibbundler -of -x GoldenDict.app/Contents/Frameworks/libzim.8.dylib -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks @@ -126,11 +125,11 @@ jobs: dylibbundler -of -x GoldenDict.app/Contents/Frameworks/libicui18n.73.dylib -x GoldenDict.app/Contents/Frameworks/libicudata.73.dylib -x GoldenDict.app/Contents/Frameworks/libicuuc.73.dylib -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local - dylibbundler -of -x GoldenDict.app/Contents/Frameworks/libavformat.60.dylib -x GoldenDict.app/Contents/Frameworks/libavcodec.60.dylib -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local/ -s /opt/ - dylibbundler -of -b -x GoldenDict.app/Contents/Frameworks/libjxl.0.8.dylib -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local/ -s /opt/ + # dylibbundler -of -x GoldenDict.app/Contents/Frameworks/libavformat.60.dylib -x GoldenDict.app/Contents/Frameworks/libavcodec.60.dylib -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local/ -s /opt/ + # dylibbundler -of -b -x GoldenDict.app/Contents/Frameworks/libjxl.0.8.dylib -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local/ -s /opt/ - otool -L GoldenDict.app/Contents/Frameworks/libav* - otool -L GoldenDict.app/Contents/Frameworks/libjxl.0.8.dylib + # otool -L GoldenDict.app/Contents/Frameworks/libav* + # otool -L GoldenDict.app/Contents/Frameworks/libjxl.0.8.dylib otool -L GoldenDict.app/Contents/Frameworks/libzim.8.dylib otool -L GoldenDict.app/Contents/Frameworks/libxapian.30.dylib otool -L GoldenDict.app/Contents/Frameworks/liblzma.5.dylib diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml index b6e560c2..37898bad 100644 --- a/.github/workflows/ubuntu-6.2.yml +++ b/.github/workflows/ubuntu-6.2.yml @@ -83,7 +83,7 @@ jobs: - name: build goldendict run: | cmake -S . -B build_dir -G Ninja \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release -DWITH_FFMPEG_PLAYER=OFF cmake --build build_dir cmake --install ./build_dir --prefix=appdir/usr diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml index f971273f..6ed41ae2 100644 --- a/.github/workflows/windows-6.x.yml +++ b/.github/workflows/windows-6.x.yml @@ -151,7 +151,7 @@ jobs: id: build shell: cmd run: | - qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_xapian CONFIG+=use_iconv CONFIG+=use_breakpad + qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_xapian CONFIG+=use_iconv CONFIG+=use_breakpad CONFIG+=no_ffmpeg_player nmake echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% diff --git a/package-lock.json b/package-lock.json index 192ef511..0b2eaaf7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "goldendict", + "name": "goldendict-ng", "lockfileVersion": 3, "requires": true, "packages": {