Date: Sat, 15 Nov 2025 11:11:55 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d51f8b406b44 - main - multimedia/mlt7: Disable clang-scan-deps Message-ID: <202511151111.5AFBBtif088056@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=d51f8b406b44e1efae0ee96901b024885138e0dc commit d51f8b406b44e1efae0ee96901b024885138e0dc Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-11-15 10:53:55 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-11-15 11:11:47 +0000 multimedia/mlt7: Disable clang-scan-deps This fixes build on 14.3, since clang-scan-deps is not in base. We don't really need it here, so remove the complicated logic. multimedia/mlt7-glaxnimate: Fix qt5 flavor It was trying to build MOD_QT6 which wasn't explicitly disabled. Remove unneeded deps from qt6 flavor. Fixes: 4488884ee060 - multimedia/mlt7: Update to 7.34.1 --- multimedia/mlt7-glaxnimate/Makefile | 8 ++++---- multimedia/mlt7/Makefile | 15 +++------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/multimedia/mlt7-glaxnimate/Makefile b/multimedia/mlt7-glaxnimate/Makefile index 7a5841a7e8c9..33127a56014e 100644 --- a/multimedia/mlt7-glaxnimate/Makefile +++ b/multimedia/mlt7-glaxnimate/Makefile @@ -22,7 +22,7 @@ USE_XORG= x11 _USE_GL_qt6= opengl _USE_QT_qt5= core gui network widgets xml \ buildtools:build qmake:build -_USE_QT_qt6= 5compat base svg +_USE_QT_qt6= base _CMAKE_ON_qt5= MOD_GLAXNIMATE _CMAKE_ON_qt6= MOD_GLAXNIMATE_QT6 _CMAKE_OFF_qt5= MOD_GLAXNIMATE_QT6 @@ -34,9 +34,9 @@ _PLIST_SUB_qt6= QT_VERSION_SUFFIX="-qt6" CMAKE_ON= ${_CMAKE_ON_${FLAVOR}} CMAKE_OFF= MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \ MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \ - MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_QT MOD_RESAMPLE \ - MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \ - MOD_VORBIS MOD_XINE MOD_XML \ + MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_QT \ + MOD_QT6 MOD_RESAMPLE MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX \ + MOD_VIDSTAB MOD_VMFX MOD_VORBIS MOD_XINE MOD_XML \ SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \ ${_CMAKE_OFF_${FLAVOR}} diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile index ae1d0675cf89..545940818381 100644 --- a/multimedia/mlt7/Makefile +++ b/multimedia/mlt7/Makefile @@ -31,7 +31,8 @@ CMAKE_ON= MOD_XML # Explicitly disabled modules that are ouddated, unnecessary, or have # their own port. -CMAKE_OFF= MOD_GLAXNIMATE MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT \ +CMAKE_OFF= CLANG_FORMAT CMAKE_CXX_SCAN_FOR_MODULES \ + MOD_GLAXNIMATE MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT \ MOD_QT6 MOD_NDI \ SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL @@ -135,13 +136,6 @@ VORBIS_CMAKE_BOOL= MOD_VORBIS XINE_DESC= Enable xine module XINE_CMAKE_BOOL= MOD_XINE -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000 -# FreeBSD 13 does not ship clang-scan-deps -BUILD_DEPENDS+= clang-scan-deps${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -.endif - pre-configure: ${RM} ${STAGEDIR}${PREFIX}/man/man1/melt.1 @@ -168,13 +162,10 @@ USES+= mlt:7 PLIST?= ${.CURDIR}/pkg-plist INSTALL_WRKSRC?= ${BUILD_WRKSRC} - -.include <bsd.port.pre.mk> - .endif post-install: common-post-install ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/* 2>/dev/null || ${TRUE} @${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/${PORTNAME} 2>/dev/null || ${TRUE} -.include <bsd.port.post.mk> +.include <bsd.port.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511151111.5AFBBtif088056>