Compare commits
11 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
44897f9627 | ||
a2567ac353 | |||
3b0f2fe2c4 | |||
06e448c740 | |||
cd4a09d21c | |||
|
e834970aef | ||
4e95e14619 | |||
7978bdfc61 | |||
|
0035318e91 | ||
93bda8acd4 | |||
75dfe650bf |
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/mpv-player/mpv.git</param>
|
||||
<param name="changesrevision">00f43e0916faa4f60837d638349e2a66592a9a2b</param></service></servicedata>
|
||||
<param name="changesrevision">97cb16d68340ec06960c9f4c06a8092c51073723</param></service></servicedata>
|
@ -1,35 +0,0 @@
|
||||
---
|
||||
meson.build | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: mpv-0.36.0/meson.build
|
||||
===================================================================
|
||||
--- mpv-0.36.0.orig/meson.build
|
||||
+++ mpv-0.36.0/meson.build
|
||||
@@ -1610,7 +1610,7 @@ if features['html-build']
|
||||
'@INPUT@', '@OUTPUT@'],
|
||||
depfile: 'mpv.html.dep',
|
||||
install: true,
|
||||
- install_dir: join_paths(datadir, 'doc', 'mpv')
|
||||
+ install_dir: join_paths(datadir, 'doc', 'packages', 'mpv')
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -1629,7 +1629,7 @@ if features['pdf-build']
|
||||
'@INPUT@', '-o', '@OUTPUT@'],
|
||||
depfile: 'mpv.pdf.dep',
|
||||
install: true,
|
||||
- install_dir: join_paths(datadir, 'doc', 'mpv')
|
||||
+ install_dir: join_paths(datadir, 'doc', 'packages', 'mpv')
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -1734,7 +1734,7 @@ if get_option('cplayer')
|
||||
|
||||
conf_files = ['etc/mpv.conf', 'etc/input.conf',
|
||||
'etc/mplayer-input.conf', 'etc/restore-old-bindings.conf']
|
||||
- install_data(conf_files, install_dir: join_paths(datadir, 'doc', 'mpv'))
|
||||
+ install_data(conf_files, install_dir: join_paths(datadir, 'doc', 'packages', 'mpv'))
|
||||
|
||||
bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
|
||||
install_data('etc/mpv.bash-completion', install_dir: bash_install_dir, rename: 'mpv')
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b3e59badac58587370a84cffccb2dcb2595b300ce67341a1c50e976756c02164
|
||||
size 10387469
|
3
mpv-0.40.0+git20250325.97cb16d68340.obscpio
Normal file
3
mpv-0.40.0+git20250325.97cb16d68340.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1b363efc3b294450dc66103d416531983330824677c6c2777064f5f04287b249
|
||||
size 9457677
|
@ -1,24 +1,12 @@
|
||||
From 7feac1e3ab52002314a0a939313cdea93f5a0b3a Mon Sep 17 00:00:00 2001
|
||||
From: Mia Herkt <mia@0x0.st>
|
||||
Date: Sat, 18 Mar 2023 01:10:57 +0100
|
||||
Subject: [PATCH] av_log: make FFmpeg version check non-fatal
|
||||
|
||||
---
|
||||
common/av_log.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/common/av_log.c b/common/av_log.c
|
||||
index 15d17aff..ae173592 100644
|
||||
index 6785e8927861..e7bfd2e2a135 100644
|
||||
--- a/common/av_log.c
|
||||
+++ b/common/av_log.c
|
||||
@@ -207,7 +207,6 @@ void check_library_versions(struct mp_log *log, int v)
|
||||
@@ -224,7 +224,6 @@ void check_library_versions(struct mp_log *log, int v)
|
||||
{
|
||||
fprintf(stderr, "%s: %d.%d.%d -> %d.%d.%d\n",
|
||||
l->name, V(l->buildv), V(l->runv));
|
||||
- abort();
|
||||
mp_fatal(log, "%s: build version %d.%d.%d incompatible with runtime version %d.%d.%d\n",
|
||||
l->name, V(l->buildv), V(l->runv));
|
||||
- exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.40.0
|
||||
|
||||
|
1306
mpv.changes
1306
mpv.changes
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
name: mpv
|
||||
version: 0.38.0+git20240706.00f43e0916fa
|
||||
mtime: 1720274620
|
||||
commit: 00f43e0916faa4f60837d638349e2a66592a9a2b
|
||||
version: 0.40.0+git20250325.97cb16d68340
|
||||
mtime: 1742924340
|
||||
commit: 97cb16d68340ec06960c9f4c06a8092c51073723
|
||||
|
48
mpv.spec
48
mpv.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package mpv
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2015 Packman Team <packman@links2linux.de>
|
||||
# Copyright (c) 2012 Jiri Slaby <jslaby@suse.de>
|
||||
# Copyright (c) 2011-2012 Pascal Bleser <pascal.bleser@opensuse.org>
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
%define lname libmpv2
|
||||
Name: mpv
|
||||
Version: 0.38.0+git20240706.00f43e0916fa
|
||||
Version: 0.40.0+git20250325.97cb16d68340
|
||||
Release: 0
|
||||
Summary: Advanced general-purpose multimedia player
|
||||
License: GPL-2.0-or-later
|
||||
@ -31,8 +31,6 @@ Source: %{name}-%{version}.tar.xz
|
||||
Source2: %{name}.changes
|
||||
# PATCH-FIX-OPENSUSE do not require equal libav versions, obs rebuilds as needed
|
||||
Patch0: mpv-make-ffmpeg-version-check-non-fatal.patch
|
||||
# Install docs in proper directory
|
||||
Patch2: fix-docs-path.patch
|
||||
BuildRequires: bash
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: linux-kernel-headers
|
||||
@ -66,6 +64,7 @@ BuildRequires: pkgconfig(libbluray) >= 0.3.0
|
||||
BuildRequires: pkgconfig(libcdio)
|
||||
BuildRequires: pkgconfig(libcdio_cdda)
|
||||
BuildRequires: pkgconfig(libcdio_paranoia)
|
||||
BuildRequires: pkgconfig(libdisplay-info)
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.105
|
||||
BuildRequires: pkgconfig(libiso9660)
|
||||
BuildRequires: pkgconfig(libjpeg)
|
||||
@ -94,10 +93,6 @@ BuildRequires: pkgconfig(xv)
|
||||
BuildRequires: pkgconfig(zimg) >= 2.9
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
Requires: hicolor-icon-theme
|
||||
Requires(post): hicolor-icon-theme
|
||||
Requires(post): update-desktop-files
|
||||
Requires(postun): hicolor-icon-theme
|
||||
Requires(postun): update-desktop-files
|
||||
# Used via LUA scripts
|
||||
Recommends: yt-dlp
|
||||
Conflicts: mpv-plugin-mpris < 0.4
|
||||
@ -109,7 +104,7 @@ BuildRequires: pkgconfig(libplacebo) >= 6.338.2
|
||||
BuildRequires: pkgconfig(libva-wayland) >= 1.1.0
|
||||
BuildRequires: pkgconfig(mujs)
|
||||
BuildRequires: pkgconfig(shaderc)
|
||||
BuildRequires: pkgconfig(vulkan) >= 1.1.70
|
||||
BuildRequires: pkgconfig(vulkan) >= 1.3.238
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.20.0
|
||||
BuildRequires: pkgconfig(wayland-cursor) >= 1.20.0
|
||||
BuildRequires: pkgconfig(wayland-egl) >= 9.0.0
|
||||
@ -149,6 +144,16 @@ BuildArch: noarch
|
||||
%description zsh-completion
|
||||
ZSH command line completion support for %{name}.
|
||||
|
||||
%package fish-completion
|
||||
Summary: Fish Completion for %{name}
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
Requires: %{name} = %{version}
|
||||
Supplements: (mpv and fish)
|
||||
BuildArch: noarch
|
||||
|
||||
%description fish-completion
|
||||
Fish command line completion support for %{name}.
|
||||
|
||||
%package devel
|
||||
Summary: A library to link together with mpv player
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -195,33 +200,32 @@ myopts=" -Dbuild-date=false"
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
|
||||
mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_defaultdocdir}/%{name}/
|
||||
|
||||
install -D -m 0644 etc/input.conf %{buildroot}%{_sysconfdir}/%{name}/input.conf
|
||||
install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf
|
||||
# remove shebang
|
||||
sed -i -e '1d' %{buildroot}%{_datadir}/bash-completion/completions/mpv
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%post -n %{lname} -p /sbin/ldconfig
|
||||
%postun -n %{lname} -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license LICENSE.GPL
|
||||
%doc Copyright README.md RELEASE_NOTES
|
||||
%doc %{_defaultdocdir}/%{name}/input.conf
|
||||
%doc %{_defaultdocdir}/%{name}/mplayer-input.conf
|
||||
%doc %{_defaultdocdir}/%{name}/mpv.conf
|
||||
%doc %{_defaultdocdir}/%{name}/restore-old-bindings.conf
|
||||
%license LICENSE.GPL Copyright
|
||||
%doc README.md RELEASE_NOTES
|
||||
%doc %{_defaultdocdir}/%{name}/*
|
||||
%dir %{_sysconfdir}/%{name}/
|
||||
%ghost %dir %{_sysconfdir}/%{name}/scripts/
|
||||
%config %{_sysconfdir}/%{name}/encoding-profiles.conf
|
||||
%config %{_sysconfdir}/%{name}/input.conf
|
||||
%config %{_sysconfdir}/%{name}/mpv.conf
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor
|
||||
%{_datadir}/metainfo/mpv.metainfo.xml
|
||||
%{_mandir}/man?/%{name}.?%{?ext_man}
|
||||
|
||||
%files fish-completion
|
||||
%dir %{_datadir}/fish
|
||||
%dir %{_datadir}/fish/vendor_completions.d
|
||||
%{_datadir}/fish/vendor_completions.d/mpv.fish
|
||||
|
||||
%files zsh-completion
|
||||
%{_datadir}/zsh/site-functions/_mpv
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user