diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile index 1c98c1d2bc84..eeee7de45fb2 100644 --- a/multimedia/vapoursynth/Makefile +++ b/multimedia/vapoursynth/Makefile @@ -1,65 +1,32 @@ PORTNAME= vapoursynth -DISTVERSION= R66 +DISTVERSION= R73 CATEGORIES= multimedia -PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= multimedia@FreeBSD.org COMMENT= Video processing framework with simplicity in mind WWW= https://www.vapoursynth.com/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} -BUILD_DEPENDS_amd64= nasm:devel/nasm LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg -USES= autoreconf compiler:c++17-lang gmake libtool localbase pathfix python pkgconfig +USES= compiler:c++17-lang meson pkgconfig python USE_PYTHON= cython -USE_GITHUB= yes USE_LDCONFIG= yes -BINARY_ALIAS= cython=cython-${PYTHON_VER} -INSTALL_TARGET= install-strip - -GNU_CONFIGURE= yes - -DATADIR= ${PREFIX}/lib/vapoursynth - -CONFIGURE_ARGS= --disable-static - -OPTIONS_DEFINE= DEBUG DOCS FRAME_GUARD -OPTIONS_SUB= yes - -DEBUG_CONFIGURE_ENABLE= debug +USE_GITHUB= yes -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} -DOCS_PORTDOCS= * +WITH_LTO= yes +LDFLAGS+= -lpthread -FRAME_GUARD_DESC= Check integrity after each filter -FRAME_GUARD_CONFIGURE_ENABLE= guard-pattern +MESON_ARGS= -Dpython3_bin=${PYTHON_CMD} -.include +.include -.if ${ARCH} == amd64 && defined(MACHINE_CPU) && ${MACHINE_CPU:Mavx2} -CONFIGURE_ARGS+= --enable-x86-asm -.else -CONFIGURE_ARGS+= --disable-x86-asm +.if !defined(CPUTYPE) && ${ARCH} == amd64 +COMMENT+= (compatibility mode) +MESON_ARGS+= -Denable_x86_asm=false .endif -post-patch: - @${REINPLACE_CMD} -e 's/x86_64/&|amd64/' \ - -e '/AC_SEARCH.*libiconv/d' \ - -e '/test/s/[^ ]*libiconv.*-a //' \ - ${WRKSRC}/configure.ac - -post-build-DOCS-on: - @${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} -d ${WRKDIR} ${WRKSRC}/doc ${WRKSRC}/doc/_build/html - -post-install-DOCS-on: - (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ - "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) - -.include +.include diff --git a/multimedia/vapoursynth/distinfo b/multimedia/vapoursynth/distinfo index 73efb1dfa599..7bc03914d8e1 100644 --- a/multimedia/vapoursynth/distinfo +++ b/multimedia/vapoursynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710077749 -SHA256 (vapoursynth-vapoursynth-R66_GH0.tar.gz) = e2c82b1f583adbc33dabbe59c0dc65e6aede70dedebe79be94155cb38d418b2c -SIZE (vapoursynth-vapoursynth-R66_GH0.tar.gz) = 1878159 +TIMESTAMP = 1781871204 +SHA256 (vapoursynth-vapoursynth-R73_GH0.tar.gz) = 1bb8ffe31348eaf46d8f541b138f0136d10edaef0c130c1e5a13aa4a4b057280 +SIZE (vapoursynth-vapoursynth-R73_GH0.tar.gz) = 1877539 diff --git a/multimedia/vapoursynth/files/patch-Makefile.am b/multimedia/vapoursynth/files/patch-Makefile.am deleted file mode 100644 index aa7a5ce75ba1..000000000000 --- a/multimedia/vapoursynth/files/patch-Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ ---- Makefile.am.orig 2023-07-30 11:59:40 UTC -+++ Makefile.am -@@ -1,5 +1,5 @@ - warningflags = -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ignored-attributes --commoncflags = -O3 -fvisibility=hidden $(warningflags) -I$(srcdir)/include $(DEBUGCFLAGS) $(MFLAGS) $(UNICODECFLAGS) $(STACKREALIGN) -+commoncflags = -fvisibility=hidden $(warningflags) -I$(srcdir)/include $(DEBUGCFLAGS) $(MFLAGS) $(UNICODECFLAGS) $(STACKREALIGN) - AM_CXXFLAGS = -std=c++17 $(commoncflags) - AM_CFLAGS = -std=c99 $(commoncflags) - ACLOCAL_AMFLAGS = -I m4 diff --git a/multimedia/vapoursynth/files/patch-configure.ac b/multimedia/vapoursynth/files/patch-configure.ac deleted file mode 100644 index 195bf51545e5..000000000000 --- a/multimedia/vapoursynth/files/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac.orig 2023-07-30 14:56:15 UTC -+++ configure.ac -@@ -109,8 +109,8 @@ AS_IF( - ] - ) - -- AC_SUBST([MFLAGS], ["-mfpmath=sse -msse2"]) -- AC_SUBST([AVX2FLAGS], ["-mavx2 -mfma -mtune=haswell"]) -+ AC_SUBST([MFLAGS], [""]) -+ AC_SUBST([AVX2FLAGS], [""]) - ] - ) - diff --git a/multimedia/vapoursynth/files/patch-meson.build b/multimedia/vapoursynth/files/patch-meson.build new file mode 100644 index 000000000000..10c9269d6558 --- /dev/null +++ b/multimedia/vapoursynth/files/patch-meson.build @@ -0,0 +1,27 @@ +--- meson.build.orig 2026-06-19 11:14:53 UTC ++++ meson.build +@@ -1,5 +1,5 @@ project('VapourSynth', ['c', 'cpp', 'cython'], + project('VapourSynth', ['c', 'cpp', 'cython'], +- default_options: ['buildtype=release', 'b_lto=true', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++17'], ++ default_options: ['buildtype=release', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++17'], + license: 'LGPL-2.1-or-later', + meson_version: '>=0.63.0', + version: run_command('cat', 'VAPOURSYNTH_VERSION', check: true).stdout().strip().split()[2].split('-')[0], +@@ -124,8 +124,6 @@ if enable_x86_asm + 'src/core/kernel/x86/planestats_sse2.c', + 'src/core/kernel/x86/transpose_sse2.c', + ), +- c_args: '-march=x86-64-v2', +- cpp_args: '-march=x86-64-v2', + gnu_symbol_visibility: 'hidden', + include_directories: incdir, + ) +@@ -137,8 +135,6 @@ if enable_x86_asm + 'src/core/kernel/x86/merge_avx2.c', + 'src/core/kernel/x86/planestats_avx2.c', + ), +- c_args: '-march=x86-64-v3', +- cpp_args: '-march=x86-64-v3', + gnu_symbol_visibility: 'hidden', + include_directories: incdir, + ) diff --git a/multimedia/vapoursynth/pkg-message b/multimedia/vapoursynth/pkg-message new file mode 100644 index 000000000000..6eef2a1dc870 --- /dev/null +++ b/multimedia/vapoursynth/pkg-message @@ -0,0 +1,12 @@ +[ +{ type: install + message: <