Accepting request 1194026 from home:llyyr:branches:multimedia:apps

- Remove fix-docs-path.patch: move files after install instead. - Move 'Copyright' file to licenses. - Stop installing example mpv.conf and input.conf provided by upstream to /etc/mpv. These are purely examples and don't actually set any options. The user can already see them for reference in %{_defaultdocdir}/mpv. - Run tests OBS-URL: https://build.opensuse.org/request/show/1194026 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=310
2024-08-15 00:09:49 +00:00 · 2024-08-15 00:09:49 +00:00 · 75dfe650bf
commit 75dfe650bf
11 changed files with 6938 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.osc
--- a/30
+++ b/30
@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+# vim: set syntax=xml
+-->
+<services>
+
+  <service name="obs_scm" mode="manual">
+    <param name="url">https://github.com/mpv-player/mpv.git</param>
+    <param name="scm">git</param>
+    <param name="filename">mpv</param>
+    <param name="revision">master</param>
+    <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="changesgenerate">enable</param>
+    <param name="exclude">*.swift</param>
+    <param name="exclude">osdep/android/*</param>
+    <param name="exclude">osdep/macos/*</param>
+    <param name="exclude">osdep/win32/*</param>
+    <param name="exclude">TOOLS/osxbundle/*</param>
+    <param name="exclude">ci/*</param>
+  </service>
+
+  <service name="set_version" mode="manual"/>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+
+</services>
--- a/4
+++ b/4
@ -0,0 +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>
--- a/fix-docs-path.patch
+++ b/fix-docs-path.patch
@ -0,0 +1,35 @@
+---
+ 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')
--- a/mpv-0.38.0+git20240418.2f8038c59885.obscpio
+++ b/mpv-0.38.0+git20240418.2f8038c59885.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a63dbe5e97072aca80964248a3cca60b771a286fcbd2c52245c613aa3f3b941
+size 10144781
--- a/mpv-0.38.0+git20240706.00f43e0916fa.obscpio
+++ b/mpv-0.38.0+git20240706.00f43e0916fa.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3e59badac58587370a84cffccb2dcb2595b300ce67341a1c50e976756c02164
+size 10387469
--- a/mpv-make-ffmpeg-version-check-non-fatal.patch
+++ b/mpv-make-ffmpeg-version-check-non-fatal.patch
@ -0,0 +1,24 @@
+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
+--- a/common/av_log.c
+++ b/common/av_log.c
+@@ -207,7 +207,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();
+         }
+     }
+ }
+-- 
+2.40.0
+
--- a/mpv.changes
+++ b/mpv.changes
--- a/mpv.obsinfo
+++ b/mpv.obsinfo
@ -0,0 +1,4 @@
+name: mpv
+version: 0.38.0+git20240706.00f43e0916fa
+mtime: 1720274620
+commit: 00f43e0916faa4f60837d638349e2a66592a9a2b
--- a/mpv.spec
+++ b/mpv.spec
@ -0,0 +1,231 @@
+#
+# spec file for package mpv
+#
+# Copyright (c) 2024 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>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define lname   libmpv2
+Name:           mpv
+Version:        0.38.0+git20240706.00f43e0916fa
+Release:        0
+Summary:        Advanced general-purpose multimedia player
+License:        GPL-2.0-or-later
+Group:          Productivity/Multimedia/Video/Players
+URL:            http://mpv.io
+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
+BuildRequires:  bash
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  linux-kernel-headers
+BuildRequires:  meson >= 0.60.3
+# Needed any lua to convert the bash-completion
+BuildRequires:  lua
+BuildRequires:  perl
+BuildRequires:  pkgconfig
+BuildRequires:  python3-docutils
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(alsa) >= 1.0.18
+BuildRequires:  pkgconfig(caca) >= 0.99.beta18
+BuildRequires:  pkgconfig(dri)
+BuildRequires:  pkgconfig(dvdnav) >= 4.2.0
+BuildRequires:  pkgconfig(dvdread) >= 4.1.0
+BuildRequires:  pkgconfig(egl) >= 1.4
+BuildRequires:  pkgconfig(ffnvcodec) >= 11.1.5.1
+BuildRequires:  pkgconfig(gbm) >= 17.1.0
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(lcms2) >= 2.6
+BuildRequires:  pkgconfig(libarchive) >= 3.4.0
+BuildRequires:  pkgconfig(libass) >= 0.12.2
+BuildRequires:  pkgconfig(libavcodec) >= 60.31.102
+BuildRequires:  pkgconfig(libavdevice) >= 60.3.100
+BuildRequires:  pkgconfig(libavfilter) >= 9.12.100
+BuildRequires:  pkgconfig(libavformat) >= 60.16.100
+BuildRequires:  pkgconfig(libavif) >= 0.11.1
+BuildRequires:  pkgconfig(libavutil) >= 58.29.100
+BuildRequires:  pkgconfig(libbluray) >= 0.3.0
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_cdda)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdrm) >= 2.4.105
+BuildRequires:  pkgconfig(libiso9660)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libjxl)
+BuildRequires:  pkgconfig(libjxl_threads)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(libsixel) >= 1.5
+BuildRequires:  pkgconfig(libswresample) >= 4.12.100
+BuildRequires:  pkgconfig(libswscale) >= 7.5.100
+BuildRequires:  pkgconfig(libva) >= 1.1.0
+BuildRequires:  pkgconfig(lua5.1)
+BuildRequires:  pkgconfig(openal) >= 1.13
+BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkgconfig(rubberband) >= 3.0.0
+BuildRequires:  pkgconfig(uchardet)
+BuildRequires:  pkgconfig(vapoursynth) >= 56
+BuildRequires:  pkgconfig(vapoursynth-script) >= 56
+BuildRequires:  pkgconfig(vdpau) >= 0.2
+BuildRequires:  pkgconfig(x11) >= 1.0.0
+BuildRequires:  pkgconfig(xext) >= 1.0.0
+BuildRequires:  pkgconfig(xkbcommon) >= 0.3.0
+BuildRequires:  pkgconfig(xpresent) >= 1.0.0
+BuildRequires:  pkgconfig(xrandr) >= 1.4.0
+BuildRequires:  pkgconfig(xscrnsaver) >= 1.0.0
+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
+# Obsoletion of mplayer2 that is dead for 2 years now
+Provides:       mplayer2 = 20140101
+Obsoletes:      mplayer2 < 20140101
+BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.48
+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(wayland-client) >= 1.20.0
+BuildRequires:  pkgconfig(wayland-cursor) >= 1.20.0
+BuildRequires:  pkgconfig(wayland-egl) >= 9.0.0
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.25
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-server)
+# JIT for lua.
+%ifarch aarch64 %{ix86} x86_64
+BuildRequires:  pkgconfig(luajit)
+%else
+BuildRequires:  pkgconfig(lua5.1)
+%endif
+
+%description
+mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
+of video file formats, audio and video codecs, and subtitle types.
+
+%package bash-completion
+Summary:        Bash Completion for %{name}
+Group:          Productivity/Multimedia/Video/Players
+Requires:       %{name} = %{version}
+Requires:       bash-completion
+Recommends:     xrandr
+Supplements:    (mpv and bash)
+BuildArch:      noarch
+
+%description bash-completion
+Bash command line completion support for %{name}.
+
+%package zsh-completion
+Summary:        ZSH Completion for %{name}
+Group:          Productivity/Multimedia/Video/Players
+Requires:       %{name} = %{version}
+Supplements:    (mpv and zsh)
+BuildArch:      noarch
+
+%description zsh-completion
+ZSH command line completion support for %{name}.
+
+%package devel
+Summary:        A library to link together with mpv player
+Group:          Development/Libraries/C and C++
+Requires:       %{lname} = %{version}
+
+%description devel
+mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
+of video file formats, audio and video codecs, and subtitle types.
+
+This package contains all the development files.
+
+%package -n %{lname}
+Summary:        A library to link together with mpv player
+Group:          System/Libraries
+
+%description -n %{lname}
+mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
+of video file formats, audio and video codecs, and subtitle types.
+
+This package contains a library that can other apps use to utilize the mpv
+features.
+
+%prep
+%autosetup -p1
+
+# I hate UNKNOWN so lets put decent info there.
+MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")"
+DATE="$(date -d "$MODIFIED" "+%%b %%e %%Y")"
+sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{version}\"|g" common/version.c
+
+%build
+# We don't want to rebuild all the time.
+myopts=" -Dbuild-date=false"
+%meson \
+  --auto-features=auto       \
+  -Dcdda=enabled             \
+  -Dlibmpv=true              \
+  -Ddvbin=enabled            \
+  -Ddvdnav=enabled           \
+  -Dopenal=enabled           \
+  ${myopts}                  \
+  %{?nil}
+%meson_build
+
+%install
+%meson_install
+mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
+mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_defaultdocdir}/%{name}/
+
+%check
+%meson_test
+
+%post -n %{lname} -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
+
+%files
+%license LICENSE.GPL Copyright
+%doc README.md RELEASE_NOTES
+%doc %{_defaultdocdir}/%{name}/*
+%dir %{_sysconfdir}/%{name}/
+%config %{_sysconfdir}/%{name}/encoding-profiles.conf
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor
+%{_datadir}/metainfo/mpv.metainfo.xml
+%{_mandir}/man?/%{name}.?%{?ext_man}
+
+%files zsh-completion
+%{_datadir}/zsh/site-functions/_mpv
+
+%files bash-completion
+%{_datadir}/bash-completion/completions/mpv
+
+%files -n %{lname}
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/%{name}/
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+%changelog