diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/display.mk | 29 | ||||
| -rw-r--r-- | Mk/Uses/gstreamer.mk | 7 | ||||
| -rw-r--r-- | Mk/Uses/pyqt.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/samba.mk | 12 |
5 files changed, 41 insertions, 13 deletions
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk index 886d65b01ad7..b5471b95a8ce 100644 --- a/Mk/Uses/display.mk +++ b/Mk/Uses/display.mk @@ -1,6 +1,6 @@ # Feature: display # Usage: USES=display or USES=display:ARGS -# Valid ARGS: install (default, implicit), any target +# Valid ARGS: install (default, implicit), configure, build # # Except the target where the DISPLAY is needed # @@ -14,18 +14,35 @@ display_ARGS= install . endif . if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:x11-servers/xorg-server@xvfb \ + +. if ${display_ARGS:Mconfigure} +DISPLAY_DEPENDS= BUILD_DEPENDS +CONFIGURE_ENV+= DISPLAY=":${XVFBPORT}" +. elif ${display_ARGS:Mbuild} +DISPLAY_DEPENDS= BUILD_DEPENDS +MAKE_ENV+= DISPLAY=":${XVFBPORT}" +. elif ${display_ARGS:Mtest} +DISPLAY_DEPENDS= TEST_DEPENDS +TEST_ENV+= DISPLAY=":${XVFBPORT}" +.else +IGNORE= USES=display: invalid arguments: ${display_ARGS} +.endif + +${DISPLAY_DEPENDS}+= \ + Xvfb:x11-servers/xorg-server@xvfb \ ${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \ ${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \ ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp -XVFBPORT!= port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port -XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}.pid -MAKE_ENV+= DISPLAY=":${XVFBPORT}" +XVFBPORT?= 0 +XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}-display-mk.pid -_USES_${display_ARGS}+= 290:start-display 860:stop-display +. for t in ${display_ARGS} +_USES_${t}+= 290:start-display 860:stop-display +. endfor start-display: + pkill -15 -F ${XVFBPIDFILE} || ${TRUE} daemon -p ${XVFBPIDFILE} Xvfb :${XVFBPORT} stop-display: diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index 192ca386d268..6f3489b79432 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -10,7 +10,8 @@ # version: 1 -- default (this may be omitted since there is # currently only one supported version) # _internal: Only intended for use by multimedia/gstreamer1 to -# define specific variables so as not depend on itself +# define specific variables like _GST1_VERSION so that +# it does not depend on itself # # MAINTAINER: multimedia@FreeBSD.org @@ -41,7 +42,7 @@ _GST_VER= ${_GST_VER_DEFAULT} # When modifying _GST1_VERSION, run `make -C ${PORTSDIR}/multimedia/gstreamer1 makesum-all` # to update the distinfo files for the entire suite. -_GST1_VERSION= 1.26.6 +_GST1_VERSION= 1.26.7 _GST1_LIB_VER= 1.0 _GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0 @@ -70,7 +71,7 @@ _GST1_PLUGINS_www= neon srt _GST1_PLUGINS_x11= x ximagesrc _GST1_PLUGINS_x11-toolkits= gtk pango qt5 qt6 -# == Unversioned information +#== Unversioned information # Gather all available plugins for the chosen version _GST_PLUGINS_BASE= bad core good ugly libgstreamer plugins diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index af659b76d8cc..54fff0299196 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -108,9 +108,9 @@ MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE} # below, should have a suitable epoch appended to the version. # Qt version-agnostic components -PYQTBUILDER_VERSION= 1.18.2 +PYQTBUILDER_VERSION= 1.19.0 QSCI2_VERSION= 2.14.1 -SIP_VERSION= 6.12.0 # ,1 +SIP_VERSION= 6.13.1 # ,1 # Qt 5 components PYQT5SIP_VERSION= 12.17.0 diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index c96b633f1254..3ceacc7c115d 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -870,7 +870,7 @@ PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV # Common Python modules that can be needed but only for some versions of Python. . if ${PYTHON_REL} < 31100 PY_EXCEPTIONGROUP= ${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR} -PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.2.1<3:textproc/py-tomli@${PY_FLAVOR} +PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.3<3:textproc/py-tomli@${PY_FLAVOR} PY_TYPING_EXTENSIONS= ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} . endif diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index fb949887c604..e40db0b0e5bd 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -18,7 +18,7 @@ samba_ARGS= build run IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} . endif -. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 +. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 && ${SAMBA_DEFAULT} != 4.22 IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} . endif @@ -39,11 +39,21 @@ SAMBA_LDB_PORT_420= databases/ldb29 SAMBA_TALLOC_PORT_420= devel/talloc242 SAMBA_TDB_PORT_420= databases/tdb1410 SAMBA_TEVENT_PORT_420= devel/tevent016 +SAMBA_PORT_422= net/samba422 +SAMBA_TALLOC_PORT_422= devel/talloc243 +SAMBA_TDB_PORT_422= databases/tdb1413 +SAMBA_TEVENT_PORT_422= devel/tevent017 SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}} SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4 SAMBA_LIBDIR= ${LOCALBASE}/lib/samba4 +# Only define SAMBA_LDB_PORT if SAMBA_LDB_PORT_${SAMBA_SUFFIX} is set. Samba +# requires ldb to be bundled since version 4.22, so it makes no sense to set +# SAMBA_LDB_PORT in that case. By not setting SAMBA_LDB_PORT, we allow ports to +# detect the lack of a separate ldb port more easily. +. if !empty(SAMBA_LDB_PORT_${SAMBA_SUFFIX}) SAMBA_LDB_PORT= ${SAMBA_LDB_PORT_${SAMBA_SUFFIX}} +. endif SAMBA_TALLOC_PORT= ${SAMBA_TALLOC_PORT_${SAMBA_SUFFIX}} SAMBA_TDB_PORT= ${SAMBA_TDB_PORT_${SAMBA_SUFFIX}} SAMBA_TEVENT_PORT= ${SAMBA_TEVENT_PORT_${SAMBA_SUFFIX}} |