From 7e742c778d740f935375e669decb94d07889f592 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 12 Nov 2022 16:06:05 -0600 Subject: [PATCH] mpv: update to 0.35.0. --- common/shlibs | 2 +- srcpkgs/mpv/template | 57 ++++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/common/shlibs b/common/shlibs index 37895879b1b..d9fc6ca0850 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2214,7 +2214,7 @@ librrd.so.8 rrdtool-1.6.0_1 librrd_th.so.4 rrdtool-1.4.9_1 libmosquitto.so.1 libmosquitto-1.6.3_5 libmosquittopp.so.1 libmosquittopp-1.6.3_5 -libmpv.so.1 mpv-0.8.0_2 +libmpv.so.2 mpv-0.35.0_1 libmbedtls.so.12 mbedtls-2.13.1_1 libmbedcrypto.so.3 mbedtls-2.9.0_1 libmbedx509.so.0 mbedtls-2.9.0_1 diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index ded8c1bbe98..0e3c3ed8f81 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,15 +1,26 @@ # Template file for 'mpv' pkgname=mpv -version=0.34.1 -revision=2 -build_style=waf3 -configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv - --enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive - --enable-libmpv-shared --enable-cplugins $(vopt_enable alsa) $(vopt_enable caca) - $(vopt_enable jack) $(vopt_enable lcms lcms2) $(vopt_enable lua) - $(vopt_enable openal) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) - $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable vulkan) - $(vopt_enable vulkan shaderc) $(vopt_enable wayland) $(vopt_enable x11)" +version=0.35.0 +revision=1 +build_style=meson +configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled + -Dlibmpv=true -Dcplugins=enabled + -Dalsa=$(vopt_if alsa enabled disabled) + -Dcaca=$(vopt_if caca enabled disabled) + -Djack=$(vopt_if jack enabled disabled) + -Dlcms2=$(vopt_if lcms enabled disabled) + -Dlua=$(vopt_if lua enabled disabled) + -Dopenal=$(vopt_if openal enabled disabled) + -Dpulse=$(vopt_if pulseaudio enabled disabled) + -Dsdl2=$(vopt_if sdl2 enabled disabled) + -Dvapoursynth=$(vopt_if vapoursynth enabled disabled) + -Dvdpau=$(vopt_if vdpau enabled disabled) + -Dvulkan=$(vopt_if vulkan enabled disabled) + -Dshaderc=$(vopt_if vulkan enabled disabled) + -Dwayland=$(vopt_if wayland enabled disabled) + -Dx11=$(vopt_if x11 enabled disabled) + -Dpipewire=$(vopt_if pipewire enabled disabled) + -Dsndio=$(vopt_if sndio enabled disabled)" hostmakedepends="pkg-config python3-docutils $(vopt_if wayland wayland-devel)" makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel @@ -17,11 +28,12 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel) $(vopt_if jack jack-devel) $(vopt_if lcms lcms2-devel) $(vopt_if lua lua52-devel) $(vopt_if openal libopenal-devel) - $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) - $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) + $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if pipewire pipewire-devel) + $(vopt_if sdl2 SDL2-devel) $(vopt_if vapoursynth vapoursynth-devel) + $(vopt_if vdpau libvdpau-devel) $(vopt_if sndio sndio-devel) $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel") $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") - $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")" + $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel libXpresent-devel")" depends="desktop-file-utils hicolor-icon-theme" short_desc="Video player based on MPlayer/mplayer2" maintainer="travankor " @@ -29,30 +41,23 @@ license="GPL-2.0-or-later" homepage="https://mpv.io" changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" -checksum=32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746 +checksum=dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -build_options="alsa caca jack lcms lua openal pulseaudio sdl2 vapoursynth vdpau - vulkan wayland x11" -build_options_default="alsa jack lcms lua pulseaudio vdpau vulkan wayland x11" +build_options="alsa caca jack lcms lua openal pulseaudio pipewire sdl2 + sndio vapoursynth vdpau vulkan wayland x11" +build_options_default="alsa jack lcms lua pulseaudio pipewire vdpau vulkan + sndio wayland x11" desc_option_caca="Enable support for libcaca video output" desc_option_lcms="Enable support for LittleCMS 2 engine" desc_option_openal="Enable support for OpenAL audio output" vopt_conflict sdl2 wayland -if [ -z "$CROSS_BUILD" ]; then - configure_args+=" --zshdir=/usr/share/zsh/site-functions" -fi - -pre_configure() { - python3 bootstrap.py -} - mpv-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" pkg_install() { vmove usr/include