diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 5d016e225da..ded8c1bbe98 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -22,7 +22,7 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-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")" -depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Video player based on MPlayer/mplayer2" maintainer="travankor " license="GPL-2.0-or-later" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 78628056a56..b5f2ec5bd36 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -430,6 +430,7 @@ replaces=" urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 + vapoursynth-mvtools<=23_2 vkd3d<=1.3_1 volnoti<=0.1_1 volume_key-python<=0.3.12_5 diff --git a/srcpkgs/vapoursynth-mvtools/files/example.py b/srcpkgs/vapoursynth-mvtools/files/example.py deleted file mode 100644 index e23620456ca..00000000000 --- a/srcpkgs/vapoursynth-mvtools/files/example.py +++ /dev/null @@ -1,89 +0,0 @@ -import vapoursynth as vs - -# see http://avisynth.org.ru/mvtools/mvtools2.html -# these configs will have around 75% usage with an FX-8350 - -def main(): - # don't interpolate if input is close to 60fps anyway - if container_fps > 59: - video_in.set_output() - return - - # basic config - config = { - 'blksize': 16, - 'chroma': True, - 'search': 4, - 'searchparam': 4, - } - recalcconfig = { - 'blksize': 8, - 'chroma': True, - 'search': 5, - 'searchparam': 2, - } - - # use higher quality on 720p or lower - if video_in.width * video_in.height <= 1280*720: - config.update({ - 'search': 5, - 'searchparam': 16, - 'blksize': 32, - 'badsad': 1000, - 'badrange': 32, - 'divide': 2, - 'overlap': 8, - }) - recalcconfig.update({ - 'search': 3, - 'blksize': 16, - 'overlap': 8, - 'dct': 8, - }) - - interpolate(config, recalcconfig) - -# first pass -def analyse(sup, config): - core = vs.get_core() - bvec = core.mv.Analyse(sup, isb=True, **config) - fvec = core.mv.Analyse(sup, isb=False, **config) - return bvec, fvec - -# optional second pass -def recalculate(sup, bvec, fvec, config): - core = vs.get_core() - bvec = core.mv.Recalculate(sup, bvec, **config) - fvec = core.mv.Recalculate(sup, fvec, **config) - return bvec, fvec - -def interpolate(config, recalcconfig=None): - core = vs.get_core() - clip = video_in - - # Interpolating to fps higher than 60 is too CPU-expensive - # Use interpolation from opengl video output - dst_fps = display_fps - while (dst_fps > 60): - dst_fps /= 2 - - src_fps_num = int(container_fps * 1e8) - src_fps_den = int(1e8) - dst_fps_num = int(dst_fps * 1e4) - dst_fps_den = int(1e4) - - # Needed because clip FPS is missing - clip = core.std.AssumeFPS(clip, fpsnum = src_fps_num, fpsden = src_fps_den) - print("Reflowing from ",src_fps_num/src_fps_den," fps to ",dst_fps_num/dst_fps_den," fps.") - - pad = config.get('blksize', 8) - sup = core.mv.Super(clip, pel=1, hpad=pad, vpad=pad) - bvec, fvec = analyse(sup, config) - if recalcconfig: - bvec, fvec = recalculate(sup, bvec, fvec, recalcconfig) - clip = core.mv.FlowFPS(clip, sup, bvec, fvec, num=dst_fps_num, den=dst_fps_den, thscd2=90) - - clip.set_output() - -if __name__ == '__vapoursynth__': - main() diff --git a/srcpkgs/vapoursynth-mvtools/template b/srcpkgs/vapoursynth-mvtools/template deleted file mode 100644 index f6cd5e1cd9e..00000000000 --- a/srcpkgs/vapoursynth-mvtools/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'vapoursynth-mvtools' -pkgname=vapoursynth-mvtools -version=23 -revision=2 -archs="x86_64* i686*" -build_style=meson -hostmakedepends="pkg-config libtool nasm" -makedepends="fftw-devel vapoursynth-devel" -short_desc="Set of filters for motion estimation and compensation" -maintainer="lemmi " -license="GPL-2.0-or-later" -homepage="http://avisynth.org.ru/mvtools/mvtools2.html" -distfiles="https://github.com/dubhater/vapoursynth-mvtools/archive/v${version}.tar.gz" -checksum=3b5fdad2b52a2525764510a04af01eab3bc5e8fe6a02aba44b78955887a47d44 - -post_install() { - vdoc readme.rst - vsconf ${FILESDIR}/example.py - vmkdir /usr/lib/vapoursynth - mv ${DESTDIR}/usr/lib/{,vapoursynth/}libmvtools.so -}