From 2325d7c7996ebbc581997b0b9599a100fa5703fd3fb1f814b1983d994278777e Mon Sep 17 00:00:00 2001 From: llyyr Date: Sun, 27 Aug 2023 10:16:52 +0000 Subject: [PATCH] Accepting request 1106085 from home:iDesmI:branches:multimedia:apps - Add fix-docs-path.patch to install docs in our default docdir - Enable jxl - Use meson auto-features instead of disabling everything manually - Small corrections to specfile - Update to version v0.36.0+git20230826.83c0e980 OBS-URL: https://build.opensuse.org/request/show/1106085 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=299 --- _service | 19 ++- _servicedata | 2 +- fix-docs-path.patch | 35 ++++++ mpv-0.36.0+git.20230730.1bbc7a2c.tar.xz | 3 - mpv-0.36.0+git20230826.83c0e980.obscpio | 3 + mpv.changes | 147 ++++++++++++++++++++++++ mpv.obsinfo | 4 + mpv.spec | 89 +++++--------- 8 files changed, 232 insertions(+), 70 deletions(-) create mode 100644 fix-docs-path.patch delete mode 100644 mpv-0.36.0+git.20230730.1bbc7a2c.tar.xz create mode 100644 mpv-0.36.0+git20230826.83c0e980.obscpio create mode 100644 mpv.obsinfo diff --git a/_service b/_service index 6c3407d..a717241 100644 --- a/_service +++ b/_service @@ -1,21 +1,28 @@ + - - + https://github.com/mpv-player/mpv.git git mpv master - 0.36.0+git - %cd.%h + @PARENT_TAG@+git%cd.%h + v(.*) enable + *.swift + osdep/android/* + osdep/macos/* + osdep/win32/* + TOOLS/osxbundle/* + ci/* - - + + + *.tar xz diff --git a/_servicedata b/_servicedata index a4f6ec6..e763d86 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/mpv-player/mpv.git - 1bbc7a2cd086e025d66d8f70e2399c58d26e9972 \ No newline at end of file + 83c0e9804741cc17a9ef5c404dfdadc7506e7def \ No newline at end of file diff --git a/fix-docs-path.patch b/fix-docs-path.patch new file mode 100644 index 0000000..d4e32c8 --- /dev/null +++ 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') diff --git a/mpv-0.36.0+git.20230730.1bbc7a2c.tar.xz b/mpv-0.36.0+git.20230730.1bbc7a2c.tar.xz deleted file mode 100644 index 1932554..0000000 --- a/mpv-0.36.0+git.20230730.1bbc7a2c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1a4e24a8ccd239c167ff6ca7da6f27f2c3335ae73b80fa0e5f740af73216d8c -size 2337960 diff --git a/mpv-0.36.0+git20230826.83c0e980.obscpio b/mpv-0.36.0+git20230826.83c0e980.obscpio new file mode 100644 index 0000000..4d3dba4 --- /dev/null +++ b/mpv-0.36.0+git20230826.83c0e980.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad2d18424bc4992a9cbb37aac8895c3c0ce586db1228fa71ae5c430710cb9730 +size 9855501 diff --git a/mpv.changes b/mpv.changes index 2c468d9..4317b2f 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,150 @@ +------------------------------------------------------------------- +Sat Aug 26 21:47:33 UTC 2023 - Enrico Belleri + +- Add fix-docs-path.patch to install docs in our default docdir +- Enable jxl +- Use meson auto-features instead of disabling everything manually +- Small corrections to specfile +- Update to version v0.36.0+git20230826.83c0e980: + * hwtransfer: check if the source format is accepted directly by the VO + * hwtransfer: use the right hardware config to find conversion targets + * autoconvert: destroy sub filter immediately if reconfiguration is needed + * output_chain: don't reset autoconvert on changes to unrelated filters + * hwtransfer: implement support for hw->hw format conversion + * player: make all autoload extensions configurable + * player: use audio pts corresponding to playing audio on EOF + * input: add missing keypad key defines + * sub/osd: signal osd_changed on resize + * win32: don't ignore --screen and --fs-screen + * DOCS/mpv: document ZOOMIN & ZOOMOUT multimedia keys + * input: add new keys: Back, Tools, ZoomIn, ZoomOut + * vo_gpu_next: move line to correct location (cosmetic) + * vo_gpu_next: correctly handle GAMUT_AUTO + * ci/mingw: disable vulkan for 32-bit build + * ci/mingw: don't include useless DLLs in artifact + * ci/mingw: refactor build script into functions + * ci/mingw: enable more ffmpeg features + * ci/mingw: add necessary deps and enable vulkan + * ci/mingw: move functional test to workflow + * ci/mingw: update dependency versions + * vo_gpu_next: reword error message on empty screenshot + * DOCS/options: clarify the video-pan-x/y example + * aspect: change --video-pan-x/y to be relative to the destination rect + * aspect: don't allow scaled_src_size be 0 + * DOCS/options: fix typo in video-pan-x example + * meson: rename all features with underscores + * context_drm_egl: remove references to VAAPI in error messages + * context_drm_egl: more correctness fixes for uninit procedure + * Revert "ao/pulse: implement period_size" + * w32_common: try to get the monitor from the window bounds + * w32_common: don't fit to screen when VO_WIN_FORCE_POS is set + * ao/pulse: implement period_size + * ao/jack: set device_buffer to JACK buffer size + * demux_mf: utilize stdbool bool for if a format specifier was bad + * demux_mf: early exit with the '%%' case + * win32_common: fixes minimized window being focused on launch + * ao_oss: add "spdif" passthrough support for high bitrate codecs (e.g. Dolby Atmos, DTS-HD, etc.) over HDMI + * drm_common: skip cards that don't have connected outputs + * meson: remove redundant libplacebo version check for Vulkan interop + * x11: set sizehint for fs-screen and fs-screen-name + * x11: remove xinerama and refactor window geometry + * x11: require randr 1.4 + * context_drm_egl: don't free egl properties if they are null + * vo_gpu_next: correctly clear removed hooks + * sd_lavc: use SUB_GAP_THRESHOLD for overlaps/gaps + * Revert "sub/sd_lavc: don't check endpts when getting subs" + * vo_gpu_next: fix typo in video_screenshot() + * vo_gpu_next: add --libplacebo-opts + * vo_gpu_next: don't re-set frame_mixer + * vo_gpu_next: move allow_delayed to move appropriate place + * vo_gpu_next: switch to new pl_options system + * TOOLS/lua/autoload: Enable run-time updates of options + * TOOLS/lua/autoload: may specify loading only one type of files + * vo_gpu_next: fix leak of --icc-profile-auto on uninit + * vo_gpu_next: drop redundant PL_HAVE_LCMS check + * ci: update freebsd to latest release channel + * ci: disable libplacebo in msys2 build + * vo_gpu_next: use pl_dispatch_info_move to avoid useless data copy + * libplacebo: drop PL_API_VER compatibility paths + * ra_pl: drop PL_API_VER compatibility paths + * vo_gpu_next: drop PL_API_VER compatibility paths + * meson: remove redundant libplacebo-next check + * hwdec_cuda: drop old PL_API_VER compatibility path + * meson: bump minimum libplacebo dependency to v6.292 + * stats.lua: display output resolution if it differs to native one + * stats.lua: hide window scale in fullscreen + * vo_gpu: allow --hdr-peak-decay-rate=0.0 + * loadfile: avoid infinite playlist loading loops + * build: check for SNDCTL_DSP_HALT for oss-audio + * vo: clear vsync_offset if drawing while paused + * win32: fix display resolution calculation on mulitple monitors + * demux_playlist: remove len restriction on headerless m3u + * wayland: clear all keys on keyboard_handle_leave + * wayland: clear saved mpkey more aggressively + * wayland: use fallback for display-fps/width/height + * x11: add --x11-wid-title option + * player: add playlist-path properties + * vf_vapoursynth: save display resolution as a variable + * player: add --term-remaining-playtime option + * player: make sub-pos a float value + * x11_common: drop unnecessary NULL check + * x11_common: avoid unnecessary XUnmapWindow() call + * stats.lua: use video-params/aspect-name + * player/command: add video-params/aspect-name + * ytdl_hook: improve Windows exe search with suffix + * command: don't print "unknown" on video tracks + * player/video: avoid spamming logs with EOF + * audio: drain ao before setting pause + * command: show "no" for hwdec-current if hwdec failed + * command: fix some fringe play-dir behavior + * sub/sd_lavc: don't check endpts when getting subs + * sub: fix switching tracks while paused + * path-unix: abort on path truncation + * osc: support speed-independent time-remaiing display + * command: fix stack smashing when displaying aspect-ratio + * external_files: add sbv to the sub whitelist + * external_files: alphabetize file extensions + * DOCS: update LGPL building instructions + * m_option: change m_option_type_aspect to double + * vo_gpu_next: actually fix screenshots with PAR + * ao_audiotrack: enable pcm-float by default + * ao_audiotrack: support more channel layouts + * ao_audiotrack: support media role + * ao_audiotrack: don't ignore ao_read_data return value + * ao_audiotrack: allow byte buffer data transfer for float samples + * ao_audiotrack: align buffer size to sample size + * ao_audiotrack: do not needlessly resample + * ao_audiotrack: fix broken exception checks + * ao_audiotrack: remove unused writeV23 + * vo_gpu_next: take into account PAR when taking screenshots + * ad_spdif: fix this not working at all + * vo_gpu_next: add ability to use named hook params + * mp_image: properly infer color levels for some pixfmts + * vo_gpu_next: increase non-interpolation queue size + * vo_gpu_next: update for new pl_filter configuration API + * win32: signal VO_EVENT_DPI on dpi changes + * test/meson: add missing avutil dependency to chmap test + * test: indicate test function ran in log + * test: enable log messages for libmpv test + * test: refactor helper methods to be universally usable + * options: fix relative time parsing + * options: rename variables in parse_timestring + * vd_lavc: repeatedly attempt to fallback if hwdec fails in reinit + * DOCS/options: fix typo in hdr-peak-percentile + * vo_gpu/vo_gpu_next: fix setting an empty dscale + * builtin.conf: add --hdr-peak-percentile=99.995 to gpu-hq + * vo_gpu_next: add --hdr-peak-percentile + * player/main: do not print build time, if it is unknown + * version: move NO_BUILD_TIMESTAMPS check to version.h.in + * build: remove version.py + * vo_vdpau: set hwdec image format + * test: bump libmpv test timeout + * drm: bump minimum version to 2.4.105 + * ci: update the mpv.com path + * build: remove outdated generated directory + * ao_pipewire: set media role during init() + * audio: add AO_INIT_MEDIA_ROLE_MUSIC + ------------------------------------------------------------------- Mon Jul 31 10:14:57 UTC 2023 - llyyr.public@gmail.com diff --git a/mpv.obsinfo b/mpv.obsinfo new file mode 100644 index 0000000..8e0d35c --- /dev/null +++ b/mpv.obsinfo @@ -0,0 +1,4 @@ +name: mpv +version: 0.36.0+git20230826.83c0e980 +mtime: 1693069675 +commit: 83c0e9804741cc17a9ef5c404dfdadc7506e7def diff --git a/mpv.spec b/mpv.spec index 1659183..24f99e9 100644 --- a/mpv.spec +++ b/mpv.spec @@ -19,9 +19,14 @@ # +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150400 +%bcond_without jxl +%else +%bcond_with jxl +%endif %define lname libmpv2 Name: mpv -Version: 0.36.0+git.20230730.1bbc7a2c +Version: 0.36.0+git20230826.83c0e980 Release: 0 Summary: Advanced general-purpose multimedia player License: GPL-2.0-or-later @@ -32,9 +37,10 @@ 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 Patch1: 0001-Revert-meson-bump-required-version-to-0.62.patch +# Install docs in proper directory +Patch2: fix-docs-path.patch BuildRequires: bash BuildRequires: hicolor-icon-theme -BuildRequires: libjpeg-devel BuildRequires: linux-kernel-headers BuildRequires: meson >= 0.60.3 # Needed any lua to convert the bash-completion @@ -47,6 +53,7 @@ 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) >= 8.2.15.7 BuildRequires: pkgconfig(gbm) >= 17.1.0 @@ -55,7 +62,7 @@ BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(lcms2) >= 2.6 BuildRequires: pkgconfig(libarchive) >= 3.4.0 BuildRequires: pkgconfig(libass) >= 0.12.2 -BuildRequires: pkgconfig(libavcodec) >= 58.12.100 +BuildRequires: pkgconfig(libavcodec) >= 59.18.100 BuildRequires: pkgconfig(libavdevice) >= 57.0.0 BuildRequires: pkgconfig(libavfilter) >= 7.14.100 %if 0%{?suse_version} > 1500 @@ -72,17 +79,13 @@ BuildRequires: pkgconfig(libcdio_cdda) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdrm) >= 2.4.75 BuildRequires: pkgconfig(libiso9660) +BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) >= 1.0 BuildRequires: pkgconfig(libswresample) >= 3.0.100 BuildRequires: pkgconfig(libswscale) >= 5.0.101 -BuildRequires: pkgconfig(libudf) -BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) >= 1.1.0 -BuildRequires: pkgconfig(libva-x11) >= 1.1.0 BuildRequires: pkgconfig(lua5.1) BuildRequires: pkgconfig(openal) >= 1.13 -# Testing framework: disabled for now as it runs just 1 test -# BuildRequires: pkgconfig(cmocka) >= 0.4.1 BuildRequires: pkgconfig(python3) %if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150400 BuildRequires: pkgconfig(libsixel) >= 1.5 @@ -92,16 +95,19 @@ BuildRequires: pkgconfig(uchardet) BuildRequires: pkgconfig(vapoursynth) >= 24 BuildRequires: pkgconfig(vapoursynth-script) >= 23 BuildRequires: pkgconfig(vdpau) >= 0.2 +BuildRequires: pkgconfig(x11) >= 1.0.0 BuildRequires: pkgconfig(xext) >= 1.0.0 -BuildRequires: pkgconfig(xinerama) >= 1.0.0 BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 BuildRequires: pkgconfig(xpresent) >= 1.0.0 -BuildRequires: pkgconfig(xrandr) >= 1.2.0 -BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xrandr) >= 1.4.0 +BuildRequires: pkgconfig(xscrnsaver) >= 1.0.0 BuildRequires: pkgconfig(xv) -BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zimg) >= 2.9 BuildRequires: pkgconfig(zlib) +%if %{with jxl} +BuildRequires: pkgconfig(libjxl) +BuildRequires: pkgconfig(libjxl_threads) +%endif Requires: hicolor-icon-theme Requires(post): hicolor-icon-theme Requires(post): update-desktop-files @@ -120,6 +126,7 @@ BuildRequires: (pkgconfig(libplacebo) >= 5 with pkgconfig(libplacebo) < 6.292.0 # Use libplacebo v6.292 for Tumbleweed %if 0%{?suse_version} >= 1550 BuildRequires: pkgconfig(libplacebo) >= 6.292.0 +BuildRequires: pkgconfig(shaderc) %endif %if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(mujs) @@ -191,9 +198,7 @@ This package contains a library that can other apps use to utilize the mpv features. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 # I hate UNKNOWN so lets put decent info there. MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")" @@ -204,60 +209,24 @@ sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{version}\"|g" common/version.c # We don't want to rebuild all the time. myopts=" -Dbuild-date=false" # Disable pipwire for Leap because of build error -%if 0%{?suse_version} <= 1500 +%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150500 myopts+=" -Dpipewire=disabled" %endif # Needs libavutil >= 58.11.100 (unreleased as of 2023-07-14) myopts+=" -Dvulkan-interop=disabled" %meson \ - -Dlibmpv=true \ - -Dmanpage-build=enabled \ - -Dcdda=enabled \ - -Ddvbin=enabled \ - -Ddvdnav=enabled \ - -Dopenal=enabled \ - -Dandroid-media-ndk=disabled \ - -Daudiounit=disabled \ - -Dcocoa=disabled \ - -Dcoreaudio=disabled \ - -Dd3d-hwaccel=disabled \ - -Dd3d11=disabled \ - -Dd3d9-hwaccel=disabled \ - -Ddirect3d=disabled \ - -Degl-android=disabled \ - -Degl-angle-lib=disabled \ - -Degl-angle-win32=disabled \ - -Degl-angle=disabled \ - -Dgl-cocoa=disabled \ - -Dgl-dxinterop-d3d9=disabled \ - -Dgl-dxinterop=disabled \ - -Dgl-win32=disabled \ - -Dios-gl=disabled \ - -Dmacos-10-11-features=disabled \ - -Dmacos-10-12-2-features=disabled \ - -Dmacos-10-14-features=disabled \ - -Dmacos-cocoa-cb=disabled \ - -Dmacos-media-player=disabled \ - -Dmacos-touchbar=disabled \ - -Dopensles=disabled \ - -Doss-audio=disabled \ - -Drpi-mmal=disabled \ - -Dsdl2-audio=disabled \ - -Dsdl2-gamepad=disabled \ - -Dsdl2-video=disabled \ - -Dsndio=disabled \ - -Dspirv-cross=disabled \ - -Dswift-build=disabled \ - -Dvideotoolbox-gl=disabled \ - -Dwasapi=disabled \ - -Dwin32-internal-pthreads=disabled \ - ${myopts} + --auto-features=auto \ + -Dcdda=enabled \ + -Dlibmpv=true \ + -Ddvbin=enabled \ + -Ddvdnav=enabled \ + -Dopenal=enabled \ + ${myopts} \ + %{?nil} %meson_build %install %meson_install -install -dm755 %{buildroot}%{_defaultdocdir} -mv %{buildroot}%{_datadir}/doc/mpv %{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