From 3580286807a09d9737d9a95160d3d96f3a6aa5d6 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 13 Jul 2024 17:27:03 -0500 Subject: [PATCH] Update prebuilt libraries SDL2 -> 3b7eafe dav1d -> 1.4.3 openssl -> 3.3.1 libplacebo -> 7.349.0 libva -> 2.22.0 --- appveyor.yml | 6 +++--- libs | 2 +- scripts/clean-libs.sh | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 25b32d43..a4784603 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,11 +29,11 @@ install: - sh: '[ "$BUILD_TARGET" != linux ] || sudo apt update || true' - sh: '[ "$BUILD_TARGET" != linux ] || sudo apt install -y qt515base qt515quickcontrols2 qt515svg qt515wayland python3-pip nasm libgbm-dev libdrm-dev libfreetype6-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev libxcb-dri3-dev libx11-xcb-dev wayland-protocols libopus-dev libvdpau-dev vulkan-sdk' - sh: '[ "$BUILD_TARGET" != linux ] || sudo pip3 install meson' - - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export SDL2_REV=ab5740bde2ac593f5a6821ec2ac3800cdfcaf754 && git clone https://github.com/libsdl-org/SDL.git SDL2 && cd SDL2 && git checkout $SDL2_REV && ./configure --enable-video-kmsdrm && make -j$(nproc) && sudo make install && cd ..; fi' + - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export SDL2_REV=3b7eafedb35829e6ba9d9024c051b81cd25fcfea && git clone https://github.com/libsdl-org/SDL.git SDL2 && cd SDL2 && git checkout $SDL2_REV && ./configure && make -j$(nproc) && sudo make install && cd ..; fi' - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export SDL2_TTF_VER=2.22.0 && wget https://github.com/libsdl-org/SDL_ttf/releases/download/release-$SDL2_TTF_VER/SDL2_ttf-$SDL2_TTF_VER.tar.gz && tar -xf SDL2_ttf-$SDL2_TTF_VER.tar.gz && cd SDL2_ttf-$SDL2_TTF_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi' - - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export LIBVA_VER=2.21.0 && git clone --branch $LIBVA_VER --depth 1 https://github.com/intel/libva.git && cd libva && ./autogen.sh && ./configure --enable-x11 --enable-wayland && make -j$(nproc) && sudo make install && cd ..; fi' + - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export LIBVA_VER=2.22.0 && git clone --branch $LIBVA_VER --depth 1 https://github.com/intel/libva.git && cd libva && ./autogen.sh && ./configure --enable-x11 --enable-wayland && make -j$(nproc) && sudo make install && cd ..; fi' - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export DAV1D_VER=1.4.3 && git clone --branch $DAV1D_VER --depth 1 https://code.videolan.org/videolan/dav1d.git && cd dav1d && meson setup build -Ddefault_library=static -Dbuildtype=release -Denable_tools=false -Denable_tests=false && ninja -C build && sudo ninja install -C build && sudo ldconfig && cd ..; fi' - - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export LIBPLACEBO_REV=7b29435072143ee8b7e131947e055d3780ae4e47 && git clone https://code.videolan.org/videolan/libplacebo.git && cd libplacebo && git checkout $LIBPLACEBO_REV && git apply ../app/deploy/linux/appimage/*.patch && git submodule update --init --recursive && meson setup build -Dvulkan=enabled -Dopengl=disabled -Ddemos=false && ninja -C build && sudo ninja install -C build && sudo ldconfig && cd ..; fi' + - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export LIBPLACEBO_REV=v7.349.0 && git clone https://code.videolan.org/videolan/libplacebo.git && cd libplacebo && git checkout $LIBPLACEBO_REV && git apply ../app/deploy/linux/appimage/*.patch && git submodule update --init --recursive && meson setup build -Dvulkan=enabled -Dopengl=disabled -Ddemos=false && ninja -C build && sudo ninja install -C build && sudo ldconfig && cd ..; fi' - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export FFMPEG_VER=7.0.1 && wget https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VER.tar.bz2 && tar -xf ffmpeg-$FFMPEG_VER.tar.bz2 && cd ffmpeg-$FFMPEG_VER && ./configure $FFMPEG_CONFIGURE_ARGS && make -j$(nproc) && sudo make install && sudo ldconfig && cd ..; fi' - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then mkdir $HOME/bin && wget -O $HOME/bin/linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage && chmod a+x $HOME/bin/linuxdeployqt; fi' diff --git a/libs b/libs index 1b32bfe0..ddc3b97a 160000 --- a/libs +++ b/libs @@ -1 +1 @@ -Subproject commit 1b32bfe0a79ef999e6dec832f765c7a7904a731c +Subproject commit ddc3b97a9577b4cabf4ced134653ab8a8f520f2b diff --git a/scripts/clean-libs.sh b/scripts/clean-libs.sh index ac74701e..0fec4d89 100755 --- a/scripts/clean-libs.sh +++ b/scripts/clean-libs.sh @@ -59,6 +59,11 @@ while [[ "$#" -gt 0 ]]; do rm $LIB_PATH/mac/lib/libavcodec* $LIB_PATH/mac/lib/libavutil* $LIB_PATH/mac/lib/libavformat* shift ;; + --libplacebo_win) + rm -r $LIB_PATH/windows/include/*/libplacebo + rm $LIB_PATH/windows/lib/*/libplacebo* + shift + ;; --) shift; break