From f20027317e7a522e6a85bb328af595856df5899206d69f02bfba101b30da0b73 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 20 Jan 2022 09:53:07 +0000 Subject: [PATCH] Accepting request 947372 from home:iDesmI - Update to version 0.34.1+git.20220117T134844.22b0bac28e: * native pipewire AO * Dolby Vision support * player: fix autofit/geometry related segfault * ao_oss: add missing PATH_DEV_MIXER define * egl_helpers: fix context creation if GLES 3 is not available * audio: stop corrupting audio on underreads * wayland: fix a potential segfault on surface enter * vo_gpu: opengl: fix wrong glMemoryBarrier call * vo_gpu: opengl: create context at version 4.4 again * af_lavcac3enc: fix memory leak on no-op * subprocess: unblock/reset signals before running child process * wayland: avoid doing unneccesary window resizes * See https://github.com/mpv-player/mpv/compare/9ca9066d05..22b0bac28e or https://git.srsfckn.biz/mpv/log/?qt=range&q=9ca9066d05..22b0bac28e for the complete changelog. OBS-URL: https://build.opensuse.org/request/show/947372 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=273 --- .gitattributes | 2 +- _service | 4 +-- _servicedata | 2 +- ...4.0+git.20211101T154439.9ca9066d05.obscpio | 3 -- ...4.1+git.20220117T134844.22b0bac28e.obscpio | 3 ++ mpv.changes | 21 +++++++++++ mpv.obsinfo | 7 ++-- mpv.spec | 36 +++++++------------ waf-2.0.20 | 3 -- waf-2.0.23 | 3 ++ 10 files changed, 46 insertions(+), 38 deletions(-) delete mode 100644 mpv-0.34.0+git.20211101T154439.9ca9066d05.obscpio create mode 100644 mpv-0.34.1+git.20220117T134844.22b0bac28e.obscpio delete mode 100644 waf-2.0.20 create mode 100644 waf-2.0.23 diff --git a/.gitattributes b/.gitattributes index 24b2ab6..a8fed13 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,4 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -waf-2.0.20 filter=lfs diff=lfs merge=lfs -text +waf-2.0.23 filter=lfs diff=lfs merge=lfs -text diff --git a/_service b/_service index d613b08..8e34055 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/mpv-player/mpv.git git mpv - v0.34.0 - 0.34.0+git + 22b0bac28e6c51651dedc7c270fc009309f2cb6b + 0.34.1+git %ci.%h enable diff --git a/_servicedata b/_servicedata index f0739da..0a2aad1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/mpv-player/mpv.git - 9ca9066d052acecb5b05369141a76993a753ee1e \ No newline at end of file + 22b0bac28e6c51651dedc7c270fc009309f2cb6b \ No newline at end of file diff --git a/mpv-0.34.0+git.20211101T154439.9ca9066d05.obscpio b/mpv-0.34.0+git.20211101T154439.9ca9066d05.obscpio deleted file mode 100644 index d1f34f4..0000000 --- a/mpv-0.34.0+git.20211101T154439.9ca9066d05.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d92aa5fb8f50086a5e394e3bd83083496ca835f1c8bcfdf2e31735586264bfa6 -size 9462797 diff --git a/mpv-0.34.1+git.20220117T134844.22b0bac28e.obscpio b/mpv-0.34.1+git.20220117T134844.22b0bac28e.obscpio new file mode 100644 index 0000000..6790e25 --- /dev/null +++ b/mpv-0.34.1+git.20220117T134844.22b0bac28e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a635c92dd21543f215b1d5f8f0772efeea6ad7e5a9e0033f66fdc93e18fcb97a +size 9630733 diff --git a/mpv.changes b/mpv.changes index 5695106..f0720f5 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Jan 19 08:38:14 UTC 2022 - Enrico Belleri + +- Update to version 0.34.1+git.20220117T134844.22b0bac28e: + * native pipewire AO + * Dolby Vision support + * player: fix autofit/geometry related segfault + * ao_oss: add missing PATH_DEV_MIXER define + * egl_helpers: fix context creation if GLES 3 is not available + * audio: stop corrupting audio on underreads + * wayland: fix a potential segfault on surface enter + * vo_gpu: opengl: fix wrong glMemoryBarrier call + * vo_gpu: opengl: create context at version 4.4 again + * af_lavcac3enc: fix memory leak on no-op + * subprocess: unblock/reset signals before running child process + * wayland: avoid doing unneccesary window resizes + + * See https://github.com/mpv-player/mpv/compare/9ca9066d05..22b0bac28e + or https://git.srsfckn.biz/mpv/log/?qt=range&q=9ca9066d05..22b0bac28e + for the complete changelog. + ------------------------------------------------------------------- Sun Nov 21 09:41:06 UTC 2021 - Enrico Belleri diff --git a/mpv.obsinfo b/mpv.obsinfo index 010333c..2a856b7 100644 --- a/mpv.obsinfo +++ b/mpv.obsinfo @@ -1,5 +1,4 @@ name: mpv -version: 0.34.0+git.20211101T154439.9ca9066d05 -mtime: 1635777879 -commit: 9ca9066d052acecb5b05369141a76993a753ee1e - +version: 0.34.1+git.20220117T134844.22b0bac28e +mtime: 1642456124 +commit: 22b0bac28e6c51651dedc7c270fc009309f2cb6b diff --git a/mpv.spec b/mpv.spec index aa0cbcd..3477d87 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,7 +1,7 @@ # # spec file for package mpv # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2015 Packman Team # Copyright (c) 2012 Jiri Slaby # Copyright (c) 2011-2012 Pascal Bleser @@ -19,15 +19,15 @@ # -%define _waf_ver 2.0.20 -%define lname libmpv1 +%define _waf_ver 2.0.23 +%define lname libmpv2 Name: mpv -Version: 0.34.0+git.20211101T154439.9ca9066d05 +Version: 0.34.1+git.20220117T134844.22b0bac28e Release: 0 Summary: Advanced general-purpose multimedia player License: GPL-2.0-or-later Group: Productivity/Multimedia/Video/Players -URL: http://mpv.io/ +URL: http://mpv.io Source: %{name}-%{version}.tar.xz Source1: https://waf.io/waf-%{_waf_ver} Source2: %{name}.changes @@ -75,6 +75,7 @@ BuildRequires: pkgconfig(libudf) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) >= 1.1.0 BuildRequires: pkgconfig(libva-x11) >= 1.1.0 +BuildRequires: pkgconfig(lua5.1) # Testing framework: disabled for now as it runs just 1 test # BuildRequires: pkgconfig(cmocka) >= 0.4.1 BuildRequires: pkgconfig(python3) @@ -106,11 +107,6 @@ Obsoletes: mplayer2 < 20140101 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 BuildRequires: pkgconfig(mujs) %endif -%if 0%{?suse_version} >= 1500 -BuildRequires: pkgconfig(lua5.1) -%else -BuildRequires: pkgconfig(lua) -%endif %if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(libva-wayland) >= 1.1.0 BuildRequires: pkgconfig(vulkan) >= 1.0.61 @@ -121,16 +117,15 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.14 BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) %endif +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 +BuildRequires: pkgconfig(libpipewire-0.3) +%endif # JIT for lua. -%if 0%{?suse_version} >= 1500 %ifarch aarch64 %{ix86} x86_64 BuildRequires: pkgconfig(luajit) %else BuildRequires: pkgconfig(lua5.1) %endif -%else -BuildRequires: pkgconfig(lua) -%endif %description mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety @@ -220,6 +215,9 @@ python3 ./waf configure \ --enable-wayland \ --enable-gl-wayland \ --enable-vulkan \ +%endif +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 + --enable-pipewire \ %endif --enable-gl-x11 \ --enable-egl-x11 \ @@ -237,16 +235,6 @@ install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf # remove shebang sed -i -e '1d' %{buildroot}%{_datadir}/bash-completion/completions/mpv -%if 0%{?suse_version} < 1330 -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif - %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig diff --git a/waf-2.0.20 b/waf-2.0.20 deleted file mode 100644 index aa94b93..0000000 --- a/waf-2.0.20 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f -size 104725 diff --git a/waf-2.0.23 b/waf-2.0.23 new file mode 100644 index 0000000..72e05c0 --- /dev/null +++ b/waf-2.0.23 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 +size 105122