Fix CI on master due to CVE in zlib and changed BASS folder layout (#881)

* Bump zlib version

* Libbass changed the folder structure, it seems.

* Should update the rest too.
This commit is contained in:
Salanto 2022-12-04 19:09:27 +00:00 committed by GitHub
parent e29ac843fa
commit 59f5cccfbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -73,7 +73,7 @@ jobs:
cd QtApng cd QtApng
cd src/3rdparty cd src/3rdparty
chmod +x get_libs.sh chmod +x get_libs.sh
./get_libs.sh 1.2.12 1.6.37 ./get_libs.sh 1.2.13 1.6.37
cd ../.. cd ../..
qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation" QT_PLATFORM=${{matrix.platform}} qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation" QT_PLATFORM=${{matrix.platform}}
${{steps.qt.outputs.make}} qmake_all ${{steps.qt.outputs.make}} qmake_all
@ -130,18 +130,18 @@ jobs:
run: | run: |
curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
unzip -d bass -o bass.zip unzip -d bass -o bass.zip
cp ./bass/x64/libbass.so ./lib/ cp ./bass/libs/x86_64/libbass.so ./lib/
cp ./bass/x64/libbass.so ./bin/ cp ./bass/libs/x86_64/libbass.so ./bin/
curl http://www.un4seen.com/files/bassmidi24-linux.zip -o bassmidi.zip curl http://www.un4seen.com/files/bassmidi24-linux.zip -o bassmidi.zip
unzip -d bass -o bassmidi.zip unzip -d bass -o bassmidi.zip
cp ./bass/x64/libbassmidi.so ./lib/ cp ./bass/libs/x86_64/libbassmidi.so ./lib/
cp ./bass/x64/libbassmidi.so ./bin/ cp ./bass/libs/x86_64/libbassmidi.so ./bin/
curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
unzip -d bass -o bassopus.zip unzip -d bass -o bassopus.zip
cp ./bass/x64/libbassopus.so ./lib/ cp ./bass/libs/x86_64/libbassopus.so ./lib/
cp ./bass/x64/libbassopus.so ./bin/ cp ./bass/libs/x86_64/libbassopus.so ./bin/
- name: Install Mac BASS - name: Install Mac BASS
if: matrix.os == 'macos-latest' if: matrix.os == 'macos-latest'