Date: Tue, 28 Apr 2026 18:26:24 +0000 From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bf193dc1da28 - main - */*: Replace CONFIGURE_ARGS with MESON_ARGS Message-ID: <69f0fbd0.235cc.10d261c5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf193dc1da282c769d3291817a8378adbd762ac7 commit bf193dc1da282c769d3291817a8378adbd762ac7 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2026-04-28 18:16:07 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2026-04-28 18:22:54 +0000 */*: Replace CONFIGURE_ARGS with MESON_ARGS Meson based ports that uses CONFIGURE_ARGS "works" as MESON_ARGS is appended however framework and documentation expects that MESON_ARGS is used for Meson based ports PR: 294808 Approved by: blanket --- audio/jack-example-tools/Makefile | 2 +- benchmarks/glmark2/Makefile | 2 +- deskutils/virt-manager/Makefile | 2 +- graphics/gexiv2/Makefile | 2 +- graphics/gexiv2_016/Makefile | 2 +- graphics/libchamplain/Makefile | 2 +- graphics/libdrm/Makefile | 2 +- graphics/shotwell/Makefile | 4 ++-- misc/shared-mime-info/Makefile | 2 +- multimedia/gstreamer1-plugins/Makefile.common | 19 +++++++++---------- net-im/libaccounts-glib/Makefile | 2 +- net-im/libsignon-glib/Makefile | 2 +- 12 files changed, 21 insertions(+), 22 deletions(-) diff --git a/audio/jack-example-tools/Makefile b/audio/jack-example-tools/Makefile index 2362d442ec14..1bfae4d855a5 100644 --- a/audio/jack-example-tools/Makefile +++ b/audio/jack-example-tools/Makefile @@ -20,7 +20,7 @@ USES= compiler:c11 localbase:ldflags meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= jackaudio -CONFIGURE_ARGS= -Djack_net=enabled \ +MESON_ARGS= -Djack_net=enabled \ -Djack_netsource=enabled \ -Djack_rec=enabled CFLAGS+= -fPIC diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile index 35e3525734f8..6814f313a4bf 100644 --- a/benchmarks/glmark2/Makefile +++ b/benchmarks/glmark2/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c++14-lang jpeg meson pkgconfig USE_GITHUB= yes -CONFIGURE_ARGS= -Dflavors=${PLATFORMS:ts,} +MESON_ARGS= -Dflavors=${PLATFORMS:ts,} PORTDOCS= NEWS diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile index a6a164f6abdc..b77d51604ec5 100644 --- a/deskutils/virt-manager/Makefile +++ b/deskutils/virt-manager/Makefile @@ -26,7 +26,7 @@ USES= desktop-file-utils gettext gnome meson tar:xz python USE_GNOME= gtksourceview4 introspection:run intltool librsvg2 pygobject3 GLIB_SCHEMAS= org.virt-manager.virt-manager.gschema.xml -CONFIGURE_ARGS= -Dtests=disabled +MESON_ARGS= -Dtests=disabled NO_ARCH= yes diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile index 0875132f4852..8bb986289312 100644 --- a/graphics/gexiv2/Makefile +++ b/graphics/gexiv2/Makefile @@ -26,7 +26,7 @@ PLIST_SUB= SOVERSION=${PORTVERSION:C/^0./2./} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc -DOCS_CONFIGURE_ON= -Dgtk_doc=true +DOCS_MESON_ON= -Dgtk_doc=true PORTSCOUT= limitw:1,even diff --git a/graphics/gexiv2_016/Makefile b/graphics/gexiv2_016/Makefile index f5cc5e4b22b3..d0796f7b8b5f 100644 --- a/graphics/gexiv2_016/Makefile +++ b/graphics/gexiv2_016/Makefile @@ -28,7 +28,7 @@ PLIST_SUB= SOVERSION=${PORTVERSION:C/^0./4./} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc -DOCS_CONFIGURE_ON= -Dgtk_doc=true +DOCS_MESON_ON= -Dgtk_doc=true PORTSCOUT= limitw:1,even diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile index fd79b98e5464..5a94ee9def67 100644 --- a/graphics/libchamplain/Makefile +++ b/graphics/libchamplain/Makefile @@ -23,7 +23,7 @@ USE_GL= egl USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr USE_LDCONFIG= yes INSTALL_TARGET= install-strip -CONFIGURE_ARGS= -Dlibsoup3=true +MESON_ARGS= -Dlibsoup3=true PLIST_SUB= VERSION=0.12 diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 14099f57b2f3..262cbaec93ce 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -25,7 +25,7 @@ TESTS_DESC= Build and install test programs TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) -CONFIGURE_ARGS+= -Dcairo-tests=disabled +MESON_ARGS+= -Dcairo-tests=disabled # Disable some targets known to not work on FreeBSD MESON_ARGS+= -Domap=disabled \ diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index a34f725fa4bb..93be98e2313f 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -43,8 +43,8 @@ OPTIONS_SUB= yes FACED_DESC= Face Detection -FACED_CONFIGURE_ON= -Dface_detection=true -FACED_CONFIGURE_OFF= -Dface_detection=false -Dface_detection_helper=true +FACED_MESON_ON= -Dface_detection=true +FACED_MESON_OFF= -Dface_detection=false -Dface_detection_helper=true FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv PLIST_SUB= DISTVERSION=${DISTVERSION} diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index b0f9447961aa..4d7b7b73ea0a 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gettext gnome localbase meson pathfix pkgconfig python:build shebangfix \ tar:xz trigger -CONFIGURE_ARGS= -Dupdate-mimedb=false \ +MESON_ARGS= -Dupdate-mimedb=false \ -Dxdgmime-path=${WRKSRC}/src/xdgmime USE_GNOME= glib20 libxml2 USE_GITLAB= YES diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index cc445ce786a5..3a2c3dfeeedd 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -378,44 +378,44 @@ BINARY_ALIAS= python3=${PYTHON_VERSION} # Disable all plugins by default .if ${DIST}=="base" .for d in ${BASE_GST_ALL_PLUGINS} -CONFIGURE_ARGS+= -D${d}=disabled +MESON_ARGS+= -D${d}=disabled .endfor .for d in ${BASE_GST_ENABLED_PLUGINS} -CONFIGURE_ARGS+= -D${d}=enabled +MESON_ARGS+= -D${d}=enabled .endfor .endif .if ${DIST}=="bad" .for d in ${BAD_GST_ALL_PLUGINS} -CONFIGURE_ARGS+= -D${d}=disabled +MESON_ARGS+= -D${d}=disabled .endfor .for d in ${BAD_GST_ENABLED_PLUGINS} -CONFIGURE_ARGS+= -D${d}=enabled +MESON_ARGS+= -D${d}=enabled .endfor .endif .if ${DIST}=="good" .for d in ${GOOD_GST_ALL_PLUGINS} -CONFIGURE_ARGS+= -D${d}=disabled +MESON_ARGS+= -D${d}=disabled .endfor .for d in ${GOOD_GST_ENABLED_PLUGINS} -CONFIGURE_ARGS+= -D${d}=enabled +MESON_ARGS+= -D${d}=enabled .endfor .endif .if ${DIST}=="ugly" .for d in ${UGLY_GST_ALL_PLUGINS} -CONFIGURE_ARGS+= -D${d}=disabled +MESON_ARGS+= -D${d}=disabled .endfor .for d in ${UGLY_GST_ENABLED_PLUGINS} -CONFIGURE_ARGS+= -D${d}=enabled +MESON_ARGS+= -D${d}=enabled .endfor .endif .if ${GST_PLUGIN}!="base" && ${GST_PLUGIN}!="bad" && \ ${GST_PLUGIN}!="good" && ${GST_PLUGIN}!="ugly" && \ ${GST_PLUGIN}!="x" -CONFIGURE_ARGS+= -D${GST_PLUGIN}=enabled +MESON_ARGS+= -D${GST_PLUGIN}=enabled .endif .if !defined(NO_GSTREAMER_COMMON) @@ -424,4 +424,3 @@ GST_PLUGIN_SUFFIX?= -${GST_PLUGIN} USE_GSTREAMER+= ${DIST:base=} .endif # NO_GSTREAMER_COMMON - diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile index 7e8885c076fe..49e1ffa4eee7 100644 --- a/net-im/libaccounts-glib/Makefile +++ b/net-im/libaccounts-glib/Makefile @@ -20,7 +20,7 @@ GL_TAGNAME= 26c54322304e9df598b2ba67427433a2e68b823e USE_GNOME= introspection libxml2 USE_LDCONFIG= yes -CONFIGURE_ARGS= -Dtests=false +MESON_ARGS= -Dtests=false INSTALL_TARGET= install-strip diff --git a/net-im/libsignon-glib/Makefile b/net-im/libsignon-glib/Makefile index 47bc2d8274da..bdd2daefe8bb 100644 --- a/net-im/libsignon-glib/Makefile +++ b/net-im/libsignon-glib/Makefile @@ -24,7 +24,7 @@ GL_ACCOUNT= accounts-sso GL_TAGNAME= 7f9f10a2e7533b74eaf027b26de48818326a1dcf CFLAGS+= -Wno-error -CONFIGURE_ARGS= -Dtests=false +MESON_ARGS= -Dtests=false OPTIONS_DEFINE= DOCS OPTIONS_SUB= yeshome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f0fbd0.235cc.10d261c5>