diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adb040870d..a95e4e8781 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -378,7 +378,7 @@ jobs: if brew list openssl@1.1 &> /dev/null; then brew rm openssl@1.1; fi brew install -q autoconf automake curl pkgconf libtool python freetype fribidi little-cms2 \ luajit libass ffmpeg-full meson rust uchardet mujs libplacebo molten-vk vulkan-loader vulkan-headers \ - libarchive libbluray libcaca libcdio-paranoia libdvdnav libdvdread rubberband vapoursynth zimg + libarchive libbluray libcaca libcdio-paranoia libdvdnav libdvdread libsixel rubberband vapoursynth zimg brew link ffmpeg-full - name: Build with meson @@ -514,6 +514,7 @@ jobs: lua5.2-dev \ pulseaudio-dev \ libplacebo-dev \ + libsixel-dev \ libx11-dev \ libxfixes-dev \ libxkbcommon-dev \ @@ -577,6 +578,7 @@ jobs: libdvdnav \ libiconv \ libplacebo \ + libsixel \ libv4l \ libxkbcommon \ luajit \ @@ -652,6 +654,7 @@ jobs: libdvdread \ libdisplay-info \ libplacebo \ + libsixel \ libXinerama \ libxkbcommon \ libXpresent \ diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh index 4d52f356bc..e7d579181e 100755 --- a/ci/build-freebsd.sh +++ b/ci/build-freebsd.sh @@ -20,6 +20,7 @@ meson setup build $common_args \ -Dlua=enabled \ -Degl-drm=enabled \ -Dopenal=enabled \ + -Dsixel=enabled \ -Dsndio=enabled \ -Dvapoursynth=enabled \ -Dvdpau=enabled \ diff --git a/ci/build-linux-old.sh b/ci/build-linux-old.sh index 6e91d7b76e..3292aac545 100755 --- a/ci/build-linux-old.sh +++ b/ci/build-linux-old.sh @@ -11,6 +11,7 @@ git clone https://code.videolan.org/videolan/libplacebo.git \ meson setup build $common_args \ -Dlibplacebo:vulkan=disabled \ -Dlua=enabled \ + -Dsixel=enabled \ -Dwayland=enabled meson compile -C build ./build/mpv -v --no-config diff --git a/ci/build-macos.sh b/ci/build-macos.sh index 1272e56210..c48f928d22 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -19,7 +19,7 @@ meson setup build $common_args \ -Dobjc_args="${objc_args}" \ -Dc_args="${c_args}" \ -D{caca,cdda,dvda,dvdnav,gl,iconv,lcms2,libarchive,libbluray,lua,jpeg}=enabled \ - -D{plain-gl,rubberband,vapoursynth,zimg,zlib}=enabled \ + -D{plain-gl,rubberband,sixel,vapoursynth,zimg,zlib}=enabled \ -D{cocoa,coreaudio,gl-cocoa,videotoolbox-gl,videotoolbox-pl}=enabled \ -D{swift-build,macos-cocoa-cb,macos-media-player,macos-touchbar,vulkan}=enabled \ -Dswift-flags="${SWIFT_FLAGS}" diff --git a/ci/build-mingw64-full.sh b/ci/build-mingw64-full.sh index df5940ac0a..682061a567 100755 --- a/ci/build-mingw64-full.sh +++ b/ci/build-mingw64-full.sh @@ -59,6 +59,16 @@ make TARGET_SYS=Windows PREFIX="$FFBUILD_PREFIX" HOST_CC="$HOST_CC" \ popd endgroup +group "Building libsixel" +$gitclone https://github.com/saitoha/libsixel.git +pushd libsixel +./configure --prefix="$FFBUILD_PREFIX" --host="$FFBUILD_TOOLCHAIN" --disable-shared \ + --disable-{img2sixel,sixel2png,python} --without-{jpeg,libcurl,png} +make -j"$(nproc)" +make install +popd +endgroup + group "Building subrandr" build_subrandr "$FFBUILD_PREFIX" --target "$FFBUILD_RUST_TARGET" \ --static-library true --shared-library false @@ -101,8 +111,8 @@ mpv_args=( -Dmujs:werror=false -Dmujs:default_library=static -Dlua=luajit - -D{amf,d3d11,javascript,lcms2,libbluray,libcurl,shaderc,spirv-cross}=enabled - -D{subrandr,vapoursynth,vulkan,win32-smtc,zimg}=enabled + -D{amf,d3d11,javascript,lcms2,libbluray,libcurl,shaderc,sixel}=enabled + -D{spirv-cross,subrandr,vapoursynth,vulkan,win32-smtc,zimg}=enabled ) if $gpl; then # Only the GPL image carries the dependencies of the GPL features. diff --git a/ci/build-openbsd.sh b/ci/build-openbsd.sh index e82aa7ca2a..04b42dd05f 100755 --- a/ci/build-openbsd.sh +++ b/ci/build-openbsd.sh @@ -14,6 +14,7 @@ meson setup build $common_args \ -Dlua=enabled \ -Dopenal=enabled \ -Dpulse=enabled \ + -Dsixel=enabled \ -Dvulkan=enabled \ -Ddvdnav=enabled \ -Dcdda=disabled diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh index dffa687d42..a9a95ebbfd 100755 --- a/ci/build-tumbleweed.sh +++ b/ci/build-tumbleweed.sh @@ -12,6 +12,7 @@ meson setup build $common_args $@ \ -Dlibarchive=enabled \ -Dmanpage-build=enabled \ -Dpipewire=enabled \ + -Dsixel=enabled \ -Dsubrandr=enabled \ -Dvapoursynth=enabled \ -Dvulkan=enabled