From 6b28e878189d513d64cc6889e18a26df3f8e92ab Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 21:58:56 -0500 Subject: [PATCH 1/5] mpv: update to 0.33.0 --- srcpkgs/mpv/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index c45a163d0b3..c5277776ee5 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv -version=0.32.0 -revision=4 +version=0.33.0 +revision=1 build_style=waf3 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-dvdnav --enable-cdda --enable-libmpv-shared @@ -31,7 +31,7 @@ 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=9163f64832226d22e24bbc4874ebd6ac02372cd717bef15c28a0aa858c5fe592 +checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 build_options="alsa caca jack lua oss pulseaudio sdl2 smb sndio vapoursynth vdpau wayland x11 vulkan" From 8807824bfaeda20e8acb34317e8166139c273dda Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 22:02:00 -0500 Subject: [PATCH 2/5] mpv: oss support was removed by mpv#bca917f --- srcpkgs/mpv/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index c5277776ee5..49e185c8bcb 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -6,9 +6,8 @@ build_style=waf3 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-dvdnav --enable-cdda --enable-libmpv-shared --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca) - $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable oss oss-audio) - $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) - $(vopt_enable smb libsmbclient) $(vopt_enable sndio) + $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable pulseaudio pulse) + $(vopt_enable sdl2) $(vopt_enable smb libsmbclient) $(vopt_enable sndio) $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable wayland) $(vopt_enable x11) $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)" hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)" @@ -33,11 +32,10 @@ changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 -build_options="alsa caca jack lua oss pulseaudio sdl2 smb sndio vapoursynth +build_options="alsa caca jack lua pulseaudio sdl2 smb sndio vapoursynth vdpau wayland x11 vulkan" build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 vulkan" desc_option_caca="Enable support for libcaca video output" -desc_option_oss="Enable support for OSS audio output" vopt_conflict sdl2 wayland if [ -z "$CROSS_BUILD" ]; then From c35ada157d8b8b451cede1ffd6f92ab504d3ec9a Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 22:12:53 -0500 Subject: [PATCH 3/5] mpv: libsmbclient support was removed by mpv#3b8b7cb --- srcpkgs/mpv/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 49e185c8bcb..4cde1ebed2c 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -7,9 +7,9 @@ configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-dvdnav --enable-cdda --enable-libmpv-shared --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca) $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable pulseaudio pulse) - $(vopt_enable sdl2) $(vopt_enable smb libsmbclient) $(vopt_enable sndio) - $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable wayland) - $(vopt_enable x11) $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)" + $(vopt_enable sdl2) $(vopt_enable sndio) $(vopt_enable vapoursynth) + $(vopt_enable vdpau) $(vopt_enable wayland) $(vopt_enable x11) + $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)" hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)" makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel @@ -17,8 +17,7 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel) $(vopt_if jack jack-devel) $(vopt_if lua lua52-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) - $(vopt_if smb samba-devel) $(vopt_if sndio sndio-devel) - $(vopt_if vapoursynth vapoursynth-devel) + $(vopt_if sndio sndio-devel) $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel") @@ -32,7 +31,7 @@ changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 -build_options="alsa caca jack lua pulseaudio sdl2 smb sndio vapoursynth +build_options="alsa caca jack lua pulseaudio sdl2 sndio vapoursynth vdpau wayland x11 vulkan" build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 vulkan" desc_option_caca="Enable support for libcaca video output" From f37559ee8c4b7e5e08e11de05207852f1868856e Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 22:18:42 -0500 Subject: [PATCH 4/5] mpv: sndio support was removed by mpv#71d218e --- srcpkgs/mpv/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 4cde1ebed2c..268d36ba047 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -7,9 +7,9 @@ configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-dvdnav --enable-cdda --enable-libmpv-shared --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca) $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable pulseaudio pulse) - $(vopt_enable sdl2) $(vopt_enable sndio) $(vopt_enable vapoursynth) - $(vopt_enable vdpau) $(vopt_enable wayland) $(vopt_enable x11) - $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)" + $(vopt_enable sdl2) $(vopt_enable vapoursynth) $(vopt_enable vdpau) + $(vopt_enable wayland) $(vopt_enable x11) $(vopt_enable vulkan) + $(vopt_enable vulkan shaderc)" hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)" makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel @@ -17,9 +17,8 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel) $(vopt_if jack jack-devel) $(vopt_if lua lua52-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) - $(vopt_if sndio sndio-devel) $(vopt_if vapoursynth vapoursynth-devel) - $(vopt_if vdpau libvdpau-devel) $(vopt_if wayland "wayland-devel - wayland-protocols libxkbcommon-devel") + $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) + $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel") $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel")" depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" @@ -31,9 +30,9 @@ changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 -build_options="alsa caca jack lua pulseaudio sdl2 sndio vapoursynth +build_options="alsa caca jack lua pulseaudio sdl2 vapoursynth vdpau wayland x11 vulkan" -build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 vulkan" +build_options_default="alsa jack lua pulseaudio vdpau wayland x11 vulkan" desc_option_caca="Enable support for libcaca video output" vopt_conflict sdl2 wayland From 8edf830b8ccbf13d4815963bdf12ff1c653cfe32 Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Mon, 23 Nov 2020 22:32:23 -0500 Subject: [PATCH 5/5] mpv: sort build options --- srcpkgs/mpv/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 268d36ba047..3548871c121 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -8,8 +8,8 @@ configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca) $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vapoursynth) $(vopt_enable vdpau) - $(vopt_enable wayland) $(vopt_enable x11) $(vopt_enable vulkan) - $(vopt_enable vulkan shaderc)" + $(vopt_enable vulkan) $(vopt_enable vulkan shaderc) $(vopt_enable wayland) + $(vopt_enable x11)" hostmakedepends="pkg-config python3-docutils perl $(vopt_if wayland wayland-devel)" makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel @@ -18,9 +18,9 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel $(vopt_if jack jack-devel) $(vopt_if lua lua52-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-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 vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel")" + $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")" depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" short_desc="Video player based on MPlayer/mplayer2" maintainer="travankor " @@ -30,9 +30,9 @@ changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 -build_options="alsa caca jack lua pulseaudio sdl2 vapoursynth - vdpau wayland x11 vulkan" -build_options_default="alsa jack lua pulseaudio vdpau wayland x11 vulkan" +build_options="alsa caca jack lua pulseaudio sdl2 vapoursynth vdpau vulkan + wayland x11" +build_options_default="alsa jack lua pulseaudio vdpau vulkan wayland x11" desc_option_caca="Enable support for libcaca video output" vopt_conflict sdl2 wayland