Merge branch 'master' into feat/new-subtitle-option

Author: TeshanK

.github/workflows/build.yml

@@ -228,16 +228,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: "macos-13"
-            arch: "intel"
-            xcode: "Xcode_14.1"
-            homebrew: "2e821e2d8ae38540311cd6ec60f6e1b23d61d167"
           - os: "macos-14"
             arch: "arm"
-            xcode: "Xcode_15.2"
+            xcode: "Xcode_15.0"
           - os: "macos-15"
             arch: "arm"
-          - os: "macos-15"
+          - os: "macos-15-intel"
+          - os: "macos-26"
+            arch: "arm"
+          - os: "macos-26"
             arch: "test"
             swift: "-target arm64-apple-macosx10.15"
             target: "10.15"
@@ -303,7 +302,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: ${{ matrix.arch != 'test' }}
         with:
-          name: mpv-${{ matrix.os }}-${{ matrix.arch }}
+          name: mpv-${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }}
           path: mpv.tar.gz
 
   linux:
@@ -341,7 +340,6 @@ jobs:
       - name: Run meson tests
         id: tests
         run: |
-          export LSAN_OPTIONS="suppressions=${GITHUB_WORKSPACE}/.lsan_suppressions"
           meson test -C build
 
       - name: Print meson test log
@@ -364,7 +362,6 @@ jobs:
         run: |
           meson setup build \
             --werror        \
-            -Dc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \
             -Dfuzzers=true -Dlibmpv=true -Dcplayer=false
           meson compile -C build fuzzers
 

.lsan_suppressions

@@ -7395,7 +7395,7 @@ them.
     to ensure a consistent appearance. Depending on the platform, the sRGB EOTF
     used by the system compositor may differ.
 
-    The default is ``input``. (Only for ``--vo=gpu-next``)
+    The default is ``auto``. (Only for ``--vo=gpu-next``)
 
 ``--tone-mapping=<value>``
     Specifies the algorithm used for tone-mapping images onto the target

DOCS/man/options.rst

@@ -372,6 +372,9 @@ local function find_and_add_entries()
         added_entries[entry.filename] = true
     end
 
+    -- stop initial file from being added twice
+    added_entries[path] = true
+
     local append = {[-1] = {}, [1] = {}}
     for direction = -1, 1, 2 do -- 2 iterations, with direction = -1 and +1
         for i = 1, MAX_ENTRIES do

TOOLS/lua/autoload.lua

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import fileinput
 import os
+import re
 import shutil
 import subprocess
 from optparse import OptionParser
@@ -34,9 +35,10 @@ def copy_bundle(binary_name, src_path):
 def copy_binary(binary_name):
     shutil.copy(binary_name, target_binary(binary_name))
 
-def apply_plist_template(plist_file, version):
+def apply_plist_template(plist_file, version, category):
+    print(">> setting bundle category to " + category)
     for line in fileinput.input(plist_file, inplace=True):
-        print(line.rstrip().replace("${VERSION}", version))
+        print(line.rstrip().replace("${VERSION}", version).replace("${CATEGORY}", category))
 
 def sign_bundle(binary_name):
     sign_directories = ["Contents/Frameworks", "Contents/MacOS"]
@@ -48,12 +50,12 @@ def sign_bundle(binary_name):
                 subprocess.run(["codesign", "--force", "-s", "-", path])
     subprocess.run(["codesign", "--force", "-s", "-", bundle_path(binary_name)])
 
-def bundle_version(src_path):
+def bundle_version(build_path):
     version = "UNKNOWN"
-    version_path = os.path.join(src_path, "MPV_VERSION")
-    if os.path.exists(version_path):
-        x = open(version_path)
-        version = x.read()
+    version_h_path = os.path.join(build_path, "common", "version.h")
+    if os.path.exists(version_h_path):
+        x = open(version_h_path)
+        version = re.findall(r"#define\s+VERSION\s+\"v(.+)\"", x.read())[0]
         x.close()
     return version
 
@@ -63,24 +65,28 @@ def main():
     parser.add_option("-s", "--skip-deps", action="store_false", dest="deps",
                       default=True,
                       help="don't bundle the dependencies")
+    parser.add_option("-c", "--category", action="store", dest="category",
+                      type="choice", choices=["video", "games"], default="video",
+                      help="sets bundle category")
 
     (options, args) = parser.parse_args()
 
     if len(args) < 1 or len(args) > 2:
         parser.error("incorrect number of arguments")
     else:
         binary_name = args[0]
+        build_path = os.path.dirname(binary_name)
         src_path = args[1] if len(args) > 1 else "."
 
-    version = bundle_version(src_path).rstrip()
+    version = bundle_version(build_path).rstrip()
 
     print(f"Creating macOS application bundle (version: {version})...")
     print("> copying bundle skeleton")
     copy_bundle(binary_name, src_path)
     print("> copying binary")
     copy_binary(binary_name)
     print("> generating Info.plist")
-    apply_plist_template(target_plist(binary_name), version)
+    apply_plist_template(target_plist(binary_name), version, options.category)
 
     if options.deps:
         print("> bundling dependencies")

TOOLS/osxbundle.py

@@ -133,7 +133,7 @@
     <key>NSHighResolutionCapable</key>
     <true/>
     <key>LSApplicationCategoryType</key>
-    <string>public.app-category.games</string>
+    <string>public.app-category.${CATEGORY}</string>
     <key>LSEnvironment</key>
     <dict>
       <key>MallocNanoZone</key>

TOOLS/osxbundle/mpv.app/Contents/Info.plist

@@ -3,4 +3,4 @@ common_args="--werror \
 -Dtests=true \
 "
 
-export CFLAGS="$CFLAGS -Wno-error=deprecated -Wno-error=deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"
+export CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"

ci/build-common.sh

@@ -12,6 +12,10 @@ args=(
   -Db_sanitize=address,undefined
 )
 
+[[ "$SYS" == "clangarm64" ]] && args+=(
+  -Dpdf-build=disabled
+)
+
 meson setup build $common_args "${args[@]}"
 meson compile -C build
 ./build/mpv.com -v --no-config

ci/build-msys2.sh

@@ -4,7 +4,7 @@ set -e
 . ./ci/build-common.sh
 
 meson setup build $common_args $@ \
-  -Db_sanitize=address,undefined \
+  -Db_sanitize=$([ "$CC" = "gcc" ] && echo none || echo address,undefined) \
   -Dcdda=enabled \
   -Ddvbin=enabled \
   -Ddvdnav=enabled \

ci/build-tumbleweed.sh

@@ -740,19 +740,16 @@ if features['rubberband']
     sources += files('audio/filter/af_rubberband.c')
 endif
 
-sdl2 = dependency('sdl2', required: get_option('sdl2'))
-features += {'sdl2': sdl2.found()}
-if features['sdl2']
-    dependencies += sdl2
-endif
+sdl2 = dependency('sdl2', required: false)
 
 sdl2_gamepad = get_option('sdl2-gamepad').require(
-    features['sdl2'],
+    sdl2.found(),
     error_message: 'sdl2 was not found!',
 )
 features += {'sdl2-gamepad': sdl2_gamepad.allowed()}
 if features['sdl2-gamepad']
     sources += files('input/sdl_gamepad.c')
+    dependencies += sdl2
 endif
 
 uchardet_opt = get_option('uchardet').require(
@@ -896,12 +893,13 @@ if features['pulse']
 endif
 
 sdl2_audio = get_option('sdl2-audio').require(
-    features['sdl2'],
+    sdl2.found(),
     error_message: 'sdl2 was not found!',
 )
 features += {'sdl2-audio': sdl2_audio.allowed()}
 if features['sdl2-audio']
     sources += files('audio/out/ao_sdl.c')
+    dependencies += sdl2
 endif
 
 sndio = dependency('sndio', required: get_option('sndio'))
@@ -976,12 +974,13 @@ if features['jpeg']
 endif
 
 sdl2_video = get_option('sdl2-video').require(
-    features['sdl2'],
+    sdl2.found(),
     error_message: 'sdl2 was not found!',
 )
 features += {'sdl2-video': sdl2_video.allowed()}
 if features['sdl2-video']
     sources += files('video/out/vo_sdl.c')
+    dependencies += sdl2
 endif
 
 shaderc = dependency('shaderc', required:
@@ -1845,7 +1844,8 @@ if get_option('cplayer')
         osxbundle = find_program(join_paths(tools_directory, 'osxbundle.py'), required: true)
         custom_target('macos-bundle',
             output: 'mpv.app',
-            command: [osxbundle, mpv.full_path(), '@SOURCE_ROOT@'],
+            depends: version_h,
+            command: [osxbundle, mpv, '@SOURCE_ROOT@', '-c', get_option('macos-bundle-category')],
         )
     endif
 
@@ -1878,6 +1878,10 @@ if get_option('fuzzers')
     subdir('fuzzers')
 endif
 
+if features['sdl2-audio'] or features['sdl2-gamepad'] or features['sdl2-video']
+    warning('You are building with optional SDL2 support. If you encounter build issues, try disabling it.')
+endif
+
 summary({'d3d11': features['d3d11'],
          'javascript': features['javascript'],
          'libmpv': get_option('libmpv'),