llyyr
9bf157cc30
- Remove waf build: removed upstream - Make meson a hard requirement now - Bump libplacebo requirement to 6.292.0 for Tumbleweed - Add patch 0001-Revert-meson-bump-required-version-to-0.62.patch to lower meson requirement for Leap - Update to version 0.36.0+git.20230730.1bbc7a2c: * ao_sndio: use sio_flush() to improve controls responsiveness * draw_bmp: fix overflowing coordinates in mark_rcs * Revert "audio: add AOCONTROL_UPDATE_MEDIA_ROLE" * Revert "ao_pipewire: handle AOCONTROL_UPDATE_MEDIA_ROLE" * meson: look for linux/input-event-codes.h with libwayland flags * version.py: fix build date * options: restore old default sub selection behavior * vo_gpu_next: fix assertion on wayland * vo_gpu_next: delay swapchain submit until flip_frame() * path-win: move state directory to %LOCALAPPDATA% * path-win: add subdirectory for cache * Revert "ci/msys2: double down on running meson through python3.11" * ad_spdif: fix segfault due to early deallocation * test: enhance libmpv test * player/video: check for track and decoder existence * video_writer: fix gamma for YUV screenshots * image_writer: log pixfmt conversion * encode_lavc: fix leak of codecpar * zimg: fix abort on subsampled input with odd heights * demux_mkv: add missing space to log msg * build: remove unneeded libdl requirement for vaapi * build: refactor vaapi handling * ci/mingw: reduce git clone depth to 1 * ci/mingw: use ccache * ci/mingw: disable fail-fast * ci/mingw: check if binary is runnable before packaging * language-posix: as a fallback, treat "C" as "en" * msg: print MSGL_WARN and higher error messages to stderr * build: vaapi-x-egl is not used anywhere, remove it * build: vaapi-egl should explicitly depend on egl * build: vaapi-drm and vaapi-wayland do not depend on egl * ci/mingw: update luajit to fix i686 crashes * wayland: restore xkb_keysym_to_utf8 handling * build: internally rename gl-wayland to egl-wayland * waf: remove waf as a build system OBS-URL: https://build.opensuse.org/request/show/1101508 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=297
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From b79288e109c7d792ff4b37dabf679afa81dbab9d Mon Sep 17 00:00:00 2001
|
|
From: llyyr <llyyr.public@gmail.com>
|
|
Date: Mon, 31 Jul 2023 16:14:43 +0530
|
|
Subject: [PATCH] Revert "meson: bump required version to 0.62"
|
|
|
|
This reverts commit a3eb16330361396311f09c952095ea6280835399.
|
|
---
|
|
meson.build | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 5a82220b38..1ef3a824cb 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -2,7 +2,7 @@ project('mpv',
|
|
'c',
|
|
license: ['GPL2+', 'LGPL2.1+'],
|
|
version: files('./VERSION'),
|
|
- meson_version: '>=0.62.0',
|
|
+ meson_version: '>=0.60.3',
|
|
default_options: [
|
|
'buildtype=debugoptimized',
|
|
'b_lundef=false',
|
|
@@ -331,10 +331,10 @@ endif
|
|
|
|
features += {'ta-leak-report': get_option('ta-leak-report')}
|
|
|
|
-libdl = dependency('dl', required: false)
|
|
-features += {'libdl': libdl.found()}
|
|
+libdl_dep = cc.find_library('dl', required: false)
|
|
+features += {'libdl': cc.has_function('dlopen', dependencies: libdl_dep, prefix: '#include <dlfcn.h>')}
|
|
if features['libdl']
|
|
- dependencies += libdl
|
|
+ dependencies += libdl_dep
|
|
endif
|
|
|
|
cplugins = get_option('cplugins').require(
|
|
@@ -1621,7 +1621,10 @@ endif
|
|
rst2pdf = find_program('rst2pdf', required: get_option('pdf-build'))
|
|
features += {'pdf-build': rst2pdf.found()}
|
|
if features['pdf-build']
|
|
- dependency_file = rst2pdf.version().version_compare('>=0.100')
|
|
+ rst2pdf_help = run_command(
|
|
+ rst2pdf, '--help',
|
|
+ check: true, capture: true
|
|
+ ).stdout()
|
|
datadir = get_option('datadir')
|
|
custom_target('pdf-manpages',
|
|
input: manpage,
|
|
@@ -1629,7 +1632,8 @@ if features['pdf-build']
|
|
command: [
|
|
docutils_wrapper, rst2pdf,
|
|
'-c', '-b', '1', '--repeat-table-rows',
|
|
- dependency_file ? ['--record-dependencies', '@DEPFILE@'] : [],
|
|
+ rst2pdf_help.contains('--record-dependencies') ?
|
|
+ ['--record-dependencies', '@DEPFILE@'] : [],
|
|
'@INPUT@', '-o', '@OUTPUT@'],
|
|
depfile: 'mpv.pdf.dep',
|
|
install: true,
|
|
--
|
|
2.41.0
|
|
|