Merge branch 'mpv-player:master' into plex-htpc-patches

.github/workflows/build.yml

@@ -501,7 +501,6 @@ jobs:
       fail-fast: false
       matrix:
         sys:
-          - clang32
           - clang64
           - mingw32
           - mingw64
@@ -528,6 +527,7 @@ jobs:
             lcms2:p
             libarchive:p
             libass:p
+            libcdio-paranoia:p
             libdvdnav:p
             libjpeg-turbo:p
             libplacebo:p
@@ -538,13 +538,14 @@ jobs:
             python:p
             shaderc:p
             spirv-cross:p
+            uchardet:p
+            vapoursynth:p
             vulkan-devel:p
 
       - name: Install dependencies
-        if: ${{ matrix.sys != 'clang32' && matrix.sys != 'mingw32' }}
+        if: ${{ matrix.sys != 'mingw32' }}
         run: |
-          pacboy --noconfirm -S angleproject cppwinrt libcdio-paranoia rst2pdf \
-                                rubberband uchardet vapoursynth
+          pacboy --noconfirm -S {angleproject,cppwinrt,rst2pdf,rubberband}:p
 
       - name: Build with meson
         id: build

.github/workflows/lint.yml

@@ -33,3 +33,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: lunarmodules/luacheck@v1
+
+  python-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1

DOCS/client-api-changes.rst

@@ -286,4 +286,3 @@ API changes
         - macOS: the "coreaudio" AO spdif code is split into a separate AO
  --- mpv 0.4.0 ---
  1.0    - the API is declared stable
-

DOCS/compile-windows.md

@@ -76,7 +76,7 @@ which bootstraps a MinGW-w64 toolchain and builds mpv along with its dependencie
    cat <<EOF > subprojects/ffmpeg.wrap
    [wrap-git]
    url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
-   revision = meson-6.1
+   revision = meson-7.1
    depth = 1
    [provide]
    libavcodec = libavcodec_dep

DOCS/interface-changes/display-page-toggle.txt

@@ -0,0 +1 @@
+add `display-page-n-toggle` script bindings to stats.lua, where n is a page number

DOCS/interface-changes/geometry-behavior.txt

@@ -0,0 +1 @@
+change `--geometry` so that it no longer unconditionally moves the window on platforms where that is possible. Use `--force-window-position` or add `+50%+50%` to your geometry command to get the old behavior back.

DOCS/man/input.rst

@@ -2778,7 +2778,7 @@ Property list
     in the list will be the one that Windows considers associated with the
     window (as determined by the MonitorFromWindow API.) On macOS these are the
     Display Product Names as used in the System Information with a serial number
-    in brackets and only one display name is returned since a window can only be
+    in parentheses and only one display name is returned since a window can only be
     on one screen. On Wayland, these are the wl_output names if protocol
     version >= 4 is used (LVDS-1, HDMI-A-1, X11-1, etc.), or the wl_output model
     reported by the geometry event if protocol version < 4 is used.

DOCS/man/stats.rst

@@ -233,7 +233,7 @@ Additional keys can be configured in ``input.conf`` to display the stats::
 And to display a certain page directly::
 
     i script-binding stats/display-page-1
-    e script-binding stats/display-page-2
+    h script-binding stats/display-page-4-toggle
 
 Active key bindings page
 ~~~~~~~~~~~~~~~~~~~~~~~~

DOCS/man/vf.rst

@@ -840,4 +840,3 @@ Available mpv-only filters are:
         Do not use this with ``--vo=gpu``. It will apply filtering twice, since
         most ``--vo=gpu`` options are unconditionally applied to the ``gpu``
         filter. There is no mechanism in mpv to prevent this.
-

README.md

@@ -120,15 +120,15 @@ Essential dependencies (incomplete list):
 
 Libass dependencies (when building libass):
 
-- gcc or clang, yasm on x86 and x86_64
+- gcc or clang, nasm on x86 and x86_64
 - fribidi, freetype, fontconfig development headers (for libass)
 - harfbuzz (required for correct rendering of combining characters, particularly
   for correct rendering of non-English text on macOS, and Arabic/Indic scripts on
   any platform)
 
 FFmpeg dependencies (when building FFmpeg):
 
-- gcc or clang, yasm on x86 and x86_64
+- gcc or clang, nasm on x86 and x86_64
 - OpenSSL or GnuTLS (have to be explicitly enabled when compiling FFmpeg)
 - libx264/libmp3lame/libfdk-aac if you want to use encoding (have to be
   explicitly enabled when compiling FFmpeg)

TOOLS/docutils-wrapper.py

@@ -27,17 +27,17 @@
 
 
 def convert_depfile(output, depfile):
-    with open(depfile, 'r') as f:
+    with open(depfile) as f:
         deps = f.readlines()
 
-    with open(depfile, 'w') as f:
+    with open(depfile, "w") as f:
         f.write(os.path.abspath(output))
-        f.write(': \\\n')
+        f.write(": \\\n")
         for dep in deps:
             dep = dep[:-1]
-            f.write('\t')
+            f.write("\t")
             f.write(os.path.abspath(dep))
-            f.write(' \\\n')
+            f.write(" \\\n")
 
 def remove(path):
     try:
@@ -51,14 +51,14 @@ def remove(path):
 output = argv[-1]
 
 for opt, optarg in zip(argv, argv[1:]):
-    if opt == '--record-dependencies':
+    if opt == "--record-dependencies":
         depfile = optarg
 
 try:
     proc = subprocess.run(argv, check=True)
     if depfile is not None:
         convert_depfile(output, depfile)
-except:
+except Exception:
     remove(output)
     if depfile is not None:
         remove(depfile)