Merge branch 'master' into python-embed

.github/workflows/build.yml

@@ -12,24 +12,33 @@ on:
 jobs:
   mingw:
     runs-on: ubuntu-22.04
+    env:
+      CCACHE_BASEDIR: ${{ github.workspace }}
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_MAXSIZE: 500M
     strategy:
+      fail-fast: false
       matrix:
         target: [i686-w64-mingw32, x86_64-w64-mingw32]
     steps:
       - uses: actions/checkout@v3
 
-      # Increase -N suffix here to force full rebuild after changes
+      - name: Get time
+        id: get_time
+        run: echo "timestamp=`date +%s%N`" >> $GITHUB_OUTPUT
+
       - uses: actions/cache@v3
         with:
-          path: mingw_prefix/
-          key: "${{ matrix.target }}-7"
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ matrix.target }}-${{ steps.get_time.outputs.timestamp }}
+          restore-keys: ${{ matrix.target }}-
 
       - name: Install dependencies
         run: |
+          sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install -y autoconf automake pkg-config g++-mingw-w64 gcc-multilib python3-pip ninja-build nasm
+          sudo apt-get install -y autoconf automake pkg-config g++-mingw-w64 gcc-multilib python3-pip ninja-build nasm wine wine32 wine64 ccache
           sudo python3 -m pip install meson
-          ./bootstrap.py
 
       - name: Build libraries
         run: |
@@ -49,18 +58,6 @@ jobs:
         run: |
           cat ./build/meson-logs/meson-log.txt
 
-      - name: Build with waf
-        id: build_waf
-        run: |
-          ./ci/build-mingw64.sh waf
-        env:
-          TARGET: ${{ matrix.target }}
-
-      - name: Print waf log
-        if: ${{ failure() && steps.build_waf.outcome == 'failure' }}
-        run: |
-          cat ./build_waf/config.log
-
       - uses: actions/upload-artifact@v3
         with:
           name: mpv-${{ matrix.target }}
@@ -91,7 +88,7 @@ jobs:
       - name: Build with meson
         id: build
         run: |
-          ./ci/build-macos.sh meson
+          ./ci/build-macos.sh
         env:
           CC: "${{ matrix.cc }}"
           TRAVIS_OS_NAME: "${{ matrix.os }}"
@@ -111,19 +108,6 @@ jobs:
         run: |
           cat ./build/meson-logs/testlog.txt
 
-      - name: Build with waf
-        id: build_waf
-        run: |
-          ./ci/build-macos.sh waf
-        env:
-          CC: "${{ matrix.cc }}"
-          TRAVIS_OS_NAME: "${{ matrix.os }}"
-
-      - name: Print waf log
-        if: ${{ failure() && steps.build_waf.outcome == 'failure' }}
-        run: |
-          cat ./build_waf/config.log
-
   linux:
     runs-on: "ubuntu-22.04"
     container:
@@ -140,14 +124,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          ./bootstrap.py
           # workaround to avoid "fatal: unsafe repository" error
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Build with meson
         id: build
         run: |
-          ./ci/build-tumbleweed.sh meson
+          ./ci/build-tumbleweed.sh
 
       - name: Print meson log
         if: ${{ failure() && steps.build.outcome == 'failure' }}
@@ -164,23 +147,15 @@ jobs:
         run: |
           cat ./build/meson-logs/testlog.txt
 
-      - name: Build with waf
-        id: build_waf
-        run: |
-          ./ci/build-tumbleweed.sh waf
-
-      - name: Print waf log
-        if: ${{ failure() && steps.build_waf.outcome == 'failure' }}
-        run: |
-          cat ./build_waf/config.log
-
   freebsd:
     runs-on: macos-12 # until https://github.com/actions/runner/issues/385
     steps:
     - uses: actions/checkout@v3
     - name: Test in FreeBSD VM
       uses: vmactions/freebsd-vm@v0
       with:
+        mem: 8192
+        copyback: false
         usesh: true
         prepare: |
             # Requested in ci/build-freebsd.sh
@@ -224,21 +199,6 @@ jobs:
           ./ci/build-freebsd.sh
           meson test -C build
 
-    - name: Print meson log
-      if: ${{ failure() }}
-      run: |
-        cat ./build/meson-logs/meson-log.txt
-
-    - name: Print meson test log
-      if: ${{ failure() }}
-      run: |
-        cat ./build/meson-logs/testlog.txt
-
-    - name: Print waf log
-      if: ${{ failure() }}
-      run: |
-        cat ./build_waf/config.log
-
   msys2:
     runs-on: windows-latest
     strategy:
@@ -262,6 +222,7 @@ jobs:
           install: git
           pacboy: >-
             angleproject:p
+            ca-certificates:p
             cc:p
             diffutils:p
             ffmpeg:p
@@ -272,11 +233,10 @@ jobs:
             libdvdnav:p
             libjpeg-turbo:p
             libplacebo:p
-            luajit:p
-            meson:p
+            lua51:p
             ninja:p
             pkgconf:p
-            python:p
+            python3.11:p
             rst2pdf:p
             rubberband:p
             shaderc:p
@@ -298,19 +258,10 @@ jobs:
       - name: Run meson tests
         id: tests
         run: |
+          source ./venv/bin/activate
           meson test -C build
 
       - name: Print meson test log
         if: ${{ failure() && steps.tests.outcome == 'failure' }}
         run: |
           cat ./build/meson-logs/testlog.txt
-
-      - name: Build with waf
-        id: build_waf
-        run: |
-          ./ci/build-msys2.sh waf
-
-      - name: Print waf log
-        if: ${{ failure() && steps.build_waf.outcome == 'failure' }}
-        run: |
-          cat ./build_waf/config.log

.gitignore

@@ -1,40 +1 @@
-*.o
-*.a
-*.d
-*.exe
-*.pyc
-.depend
-
-/config.h
-/config.mak
-/config.log
-/mpv
-/mpv.app
-/version.h
-/input/input_conf.h
-/tags
-/TAGS
-/video/out/x11_icon.inc
-/demux/ebml_defs.c
-/demux/ebml_types.h
-/sub/osd_font.h
-/player/lua/*.inc
-/player/builtin_conf.inc
-/DOCS/man/mpv.1
-/DOCS/man/mpv.aux
-/DOCS/man/mpv.log
-/DOCS/man/mpv.out
-/DOCS/man/mpv.pdf
-/DOCS/man/mpv.toc
-
-/waf
-/waf-*
-/waf3-*
-/build
-/.waf*
-/.lock-waf_*
-
-/old_build
-/Makefile
-
 /subprojects

DOCS/interface-changes.rst

@@ -27,6 +27,11 @@ Interface changes
 ::
 
  --- mpv 0.36.0 ---
+    - add `--target-contrast`
+    - Target luminance value is now also applied when ICC profile is used.
+      `--icc-use-luma` has been added to use ICC profile luminance value.
+      If target luminance and ICC luminance is not used, old behavior apply,
+      defaulting to 203 nits. (Only applies for `--vo=gpu-next`)
     - `playlist/N/title` gets set upon opening the file if it wasn't already set
       and a title is available.
     - add the `--vo=kitty` video output driver, as well as the options
@@ -61,6 +66,30 @@ Interface changes
       `--gamma` to float.
     - add `platform` property
     - add `--auto-window-resize`
+    - `--save-position-on-quit` and its associated commands now store state files in
+      the XDG_STATE_HOME directory by default. This only has an effect on linux/bsd
+      systems.
+    - mpv now implictly saves cache files in XDG_CACHE_HOME by default. This only has
+      an effect if the user enables options that would lead to cache being stored and
+      only makes a difference on linux/bsd systems.
+    - `--cache-on-disk` no longer requires explictly setting the `--cache-dir` option
+    - add `--icc-cache` and `--gpu-shader-cache` options to control whether or not to
+      save cache files for these features; explictly setting `--icc-cache-dir` and
+      `--gpu-shader-cache` is no longer required
+    - remove the `--tone-mapping-crosstalk` option
+    - add `--gamut-mapping-mode=perceptual|relative|saturation|absolute|linear`
+    - add `--corner-rounding` option
+    - change `--subs-with-matching-audio` default from `yes` to `no`
+    - change `--slang` default from blank to `auto`
+    - add `--input-cursor-passthrough` option to allow pointer events to completely
+      passthrough the mpv window
+    - icc and gpu-shader cache are now saved by default (use --no-icc-shader-cache and
+      --no-gpu-shader-cache to disable)
+    - add `--directory-mode=recursive|lazy|ignore`
+    - `--hwdec=yes` is now mapped to `auto-safe` rather than `auto` (also used
+      by ctrl+h keybind)
+    - add `--hdr-contrast-recovery` and `--hdr-contrast-smoothness`
+    - include `--hdr-contrast-recovery` in the `gpu-hq` profile
  --- mpv 0.35.0 ---
     - add the `--vo=gpu-next` video output driver, as well as the options
       `--allow-delayed-peak-detect`, `--builtin-scalers`,

DOCS/man/ao.rst

@@ -128,7 +128,7 @@ Available audio output drivers are:
         Set the audio buffer size in milliseconds. A higher value buffers
         more data, and has a lower probability of buffer underruns. A smaller
         value makes the audio stream react faster, e.g. to playback speed
-        changes.
+        changes. "native" lets the sound server determine buffers.
 
     ``--pulse-latency-hacks=<yes|no>``
         Enable hacks to workaround PulseAudio timing bugs (default: no). If
@@ -154,7 +154,7 @@ Available audio output drivers are:
         Set the audio buffer size in milliseconds. A higher value buffers
         more data, and has a lower probability of buffer underruns. A smaller
         value makes the audio stream react faster, e.g. to playback speed
-        changes.
+        changes. "native" lets the sound server determine buffers.
 
     ``--pipewire-remote=<remote>``
         Specify the PipeWire remote daemon name to connect to via local UNIX

DOCS/man/console.rst

@@ -144,6 +144,11 @@ Configurable Options
     Set the font size used for the REPL and the console. This will be
     multiplied by "scale".
 
+``border_size``
+    Default: 1
+
+    Set the font border size used for the REPL and the console.
+
 ``history_dedup``
     Default: true