opt: remove ffmpeg player (#1164)

* opt: remove ffmpeg player

* opt: remove ffmpeg player
This commit is contained in:
xiaoyifang 2023-09-25 07:46:03 +08:00 committed by GitHub
parent 200894e5a2
commit 5d1f7f0206
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 23 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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%

2
package-lock.json generated
View file

@ -1,5 +1,5 @@
{
"name": "goldendict",
"name": "goldendict-ng",
"lockfileVersion": 3,
"requires": true,
"packages": {