Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: x11/qt6/qtbase: add run depends on graphics/vulkan-loader
To:
Rafael Sadowski <rafael@sizeofvoid.org>
Cc:
ports <ports@openbsd.org>
Date:
Mon, 11 Nov 2024 21:07:39 +0000

Download raw body.

Thread
That looks good from a quick check. (Having duplicate entries in 
BUILD_DEPENDS doesn't matter but the clean-up makes sense).

-- 
  Sent from a phone, apologies for poor formatting.

On 11 November 2024 18:41:27 Rafael Sadowski <rafael@sizeofvoid.org> wrote:

> On Mon Nov 11, 2024 at 05:05:36PM +0000, Stuart Henderson wrote:
>> On 2024/11/11 07:01, Rafael Sadowski wrote:
>> > I would like to add graphics/vulkan-loader as a run-dependency for
>> > qt6-qtbase.
>> >
>> > I get more and more messages that vulkan is missing:
>> >
>> > -- Could NOT find Vulkan (missing: Vulkan_LIBRARY Vulkan_INCLUDE_DIR) 
>> (found version "")
>> > -- Could NOT find WrapVulkanHeaders (missing: Vulkan_INCLUDE_DIR)
>>
>> Could do, but I wonder, would it perhaps make more sense to add it
>> to MODQT6_BUILD_DEPENDS instead?
>>
>
> I like the idea and that would mine and we would not a bump. On the
> other hand we have graphics/vulkan-loader in all qt-not-gui
> applications. That is perhaps a handful. New diff:
>
>
> diff --git a/x11/qt6/qt3d/Makefile b/x11/qt6/qt3d/Makefile
> index f27536e9666..cde9057c2af 100644
> --- a/x11/qt6/qt3d/Makefile
> +++ b/x11/qt6/qt3d/Makefile
> @@ -25,8 +25,7 @@ PKG_ARGS+=      -Dx86=1
> PKG_ARGS+=      -Dx86=0
> .endif
>
> -BUILD_DEPENDS =	x11/qt6/qtmultimedia \
> -		graphics/vulkan-loader
> +BUILD_DEPENDS =	x11/qt6/qtmultimedia
>
> LIB_DEPENDS =	multimedia/assimp \
> 		x11/qt6/qtshadertools \
> diff --git a/x11/qt6/qt6.port.mk b/x11/qt6/qt6.port.mk
> index 870d793a211..560b901c128 100644
> --- a/x11/qt6/qt6.port.mk
> +++ b/x11/qt6/qt6.port.mk
> @@ -35,7 +35,8 @@ MODQT6_LIB_DEPENDS =	x11/qt6/qtbase
> MODQT_LIB_DEPENDS ?=	${MODQT6_LIB_DEPENDS}
>
> # qdoc, etc.
> -MODQT6_BUILD_DEPENDS =	x11/qt6/qttools
> +MODQT6_BUILD_DEPENDS =	graphics/vulkan-loader \
> +			x11/qt6/qttools
>
> MODQT_DEPS ?=		Yes
> MODQT6_DEPS ?=		${MODQT_DEPS}
> diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile
> index f04e1747d0b..12cd0029b99 100644
> --- a/x11/qt6/qtbase/Makefile
> +++ b/x11/qt6/qtbase/Makefile
> @@ -93,8 +93,7 @@ LIB_DEPENDS-psql =	${BASE_PKGPATH},-main \
>
> LIB_DEPENDS-psql +=	${MODGCC4_CPPLIBDEP}
>
> -BUILD_DEPENDS =		graphics/vulkan-loader \
> -			wayland/wayland-protocols \
> +BUILD_DEPENDS =		wayland/wayland-protocols \
> 			x11/gnome/at-spi2-core
>
> RUN_DEPENDS-main =	${RUN_DEPENDS} \
> diff --git a/x11/qt6/qtcharts/Makefile b/x11/qt6/qtcharts/Makefile
> index 6c998369a1c..afbc8081255 100644
> --- a/x11/qt6/qtcharts/Makefile
> +++ b/x11/qt6/qtcharts/Makefile
> @@ -11,6 +11,4 @@ WANTLIB += c m
>
> LIB_DEPENDS =	x11/qt6/qtdeclarative
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtdatavis3d/Makefile b/x11/qt6/qtdatavis3d/Makefile
> index 37736242ba5..5991c4ccfd8 100644
> --- a/x11/qt6/qtdatavis3d/Makefile
> +++ b/x11/qt6/qtdatavis3d/Makefile
> @@ -10,6 +10,4 @@ WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick c m
>
> LIB_DEPENDS =	x11/qt6/qtdeclarative
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtdeclarative/Makefile b/x11/qt6/qtdeclarative/Makefile
> index 9df7e7b6cb7..8adfb3d41bb 100644
> --- a/x11/qt6/qtdeclarative/Makefile
> +++ b/x11/qt6/qtdeclarative/Makefile
> @@ -59,8 +59,7 @@ MODQT6_DEPS =	No
> #PKG_ARGS+=      -Dx86=0
> #.endif
>
> -BUILD_DEPENDS =	x11/qt6/qtshadertools \
> -		graphics/vulkan-loader
> +BUILD_DEPENDS =	x11/qt6/qtshadertools
>
> LIB_DEPENDS =	x11/qt6/qtlanguageserver \
> 		x11/qt6/qtbase \
> diff --git a/x11/qt6/qtlottie/Makefile b/x11/qt6/qtlottie/Makefile
> index 22adba1ccf8..d47a2eb0469 100644
> --- a/x11/qt6/qtlottie/Makefile
> +++ b/x11/qt6/qtlottie/Makefile
> @@ -10,6 +10,4 @@ WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick c m xkbcommon
> LIB_DEPENDS =	x11/qt6/qtdeclarative \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtmultimedia/Makefile b/x11/qt6/qtmultimedia/Makefile
> index 68ba2c5678c..e76596ec7ce 100644
> --- a/x11/qt6/qtmultimedia/Makefile
> +++ b/x11/qt6/qtmultimedia/Makefile
> @@ -21,8 +21,7 @@ WANTLIB += swscale theoradec theoraenc va va-drm va-x11 
> vorbis
> WANTLIB += vorbisenc vpx wayland-client wayland-egl x264 x265
> WANTLIB += xcb xkbcommon xml2 xvidcore z
>
> -BUILD_DEPENDS =	graphics/vulkan-loader \
> -		x11/qt6/qtshadertools \
> +BUILD_DEPENDS =	x11/qt6/qtshadertools \
> 		x11/qt6/qtsvg
>
> LIB_DEPENDS =	archivers/bzip2 \
> diff --git a/x11/qt6/qtnetworkauth/Makefile b/x11/qt6/qtnetworkauth/Makefile
> index 421a02bbc1f..17a6cbb25b8 100644
> --- a/x11/qt6/qtnetworkauth/Makefile
> +++ b/x11/qt6/qtnetworkauth/Makefile
> @@ -6,6 +6,4 @@ SHARED_LIBS +=  Qt6NetworkAuth            1.1 # 6.6
>
> WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network c m
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtpositioning/Makefile b/x11/qt6/qtpositioning/Makefile
> index 7cd61e45f99..c95e412ad6d 100644
> --- a/x11/qt6/qtpositioning/Makefile
> +++ b/x11/qt6/qtpositioning/Makefile
> @@ -13,6 +13,4 @@ LIB_DEPENDS =	x11/qt6/qtdeclarative \
> 		x11/qt6/qtserialport \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtquick3d/Makefile b/x11/qt6/qtquick3d/Makefile
> index 58b0f94b5cd..ab263121f10 100644
> --- a/x11/qt6/qtquick3d/Makefile
> +++ b/x11/qt6/qtquick3d/Makefile
> @@ -27,6 +27,4 @@ LIB_DEPENDS =	multimedia/assimp \
> 		x11/qt6/qtshadertools \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtquick3dphysics/Makefile 
> b/x11/qt6/qtquick3dphysics/Makefile
> index 3e79f08039a..c165142e9da 100644
> --- a/x11/qt6/qtquick3dphysics/Makefile
> +++ b/x11/qt6/qtquick3dphysics/Makefile
> @@ -12,8 +12,6 @@ WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui 
> Qt6Network Qt6OpenGL
> WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6Quick3D Qt6Quick3DRuntimeRender
> WANTLIB += Qt6Quick3DUtils Qt6ShaderTools c m xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> LIB_DEPENDS =	x11/qt6/qtshadertools \
> 		x11/qt6/qtquick3d \
> 		x11/qt6/qtdeclarative \
> diff --git a/x11/qt6/qtremoteobjects/Makefile 
> b/x11/qt6/qtremoteobjects/Makefile
> index 8af006badf6..4025107fbab 100644
> --- a/x11/qt6/qtremoteobjects/Makefile
> +++ b/x11/qt6/qtremoteobjects/Makefile
> @@ -10,6 +10,4 @@ WANTLIB += c m
>
> LIB_DEPENDS =	x11/qt6/qtdeclarative
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtscxml/Makefile b/x11/qt6/qtscxml/Makefile
> index 2e13579fd7e..c77e2785f13 100644
> --- a/x11/qt6/qtscxml/Makefile
> +++ b/x11/qt6/qtscxml/Makefile
> @@ -13,6 +13,4 @@ WANTLIB += c m xkbcommon
> LIB_DEPENDS =	x11/qt6/qtdeclarative \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtsensors/Makefile b/x11/qt6/qtsensors/Makefile
> index 084b5855093..a8c547c546f 100644
> --- a/x11/qt6/qtsensors/Makefile
> +++ b/x11/qt6/qtsensors/Makefile
> @@ -9,6 +9,4 @@ WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Qml c m
>
> LIB_DEPENDS =	x11/qt6/qtdeclarative
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtserialbus/Makefile b/x11/qt6/qtserialbus/Makefile
> index 8effb0f5cc5..e4beaadeffa 100644
> --- a/x11/qt6/qtserialbus/Makefile
> +++ b/x11/qt6/qtserialbus/Makefile
> @@ -9,6 +9,4 @@ WANTLIB += c m
>
> LIB_DEPENDS =	x11/qt6/qtserialport
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtshadertools/Makefile b/x11/qt6/qtshadertools/Makefile
> index a6b4fc6a7a1..179c52698f9 100644
> --- a/x11/qt6/qtshadertools/Makefile
> +++ b/x11/qt6/qtshadertools/Makefile
> @@ -8,8 +8,6 @@ WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui c m xkbcommon
>
> MODQT6_DEPS =	No
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> LIB_DEPENDS =	x11/qt6/qtbase \
> 		x11/xkbcommon
>
> diff --git a/x11/qt6/qtsvg/Makefile b/x11/qt6/qtsvg/Makefile
> index f3ce7915d31..ccd2f55249f 100644
> --- a/x11/qt6/qtsvg/Makefile
> +++ b/x11/qt6/qtsvg/Makefile
> @@ -8,8 +8,6 @@ SHARED_LIBS +=  Qt6SvgWidgets       1.1 # 6.7
> WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Widgets c m
> WANTLIB += xkbcommon z
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> MODQT6_DEPS =	No
> LIB_DEPENDS =	x11/xkbcommon \
> 		${MODQT6_LIB_DEPENDS}
> diff --git a/x11/qt6/qttools/Makefile b/x11/qt6/qttools/Makefile
> index eaed552eca1..dc8469cd81c 100644
> --- a/x11/qt6/qttools/Makefile
> +++ b/x11/qt6/qttools/Makefile
> @@ -30,8 +30,6 @@ LIB_DEPENDS =	${MODCLANG_LIB_DEPENDS} \
> 		x11/qt6/qtdeclarative \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> CONFIGURE_ENV =	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}
> MODCMAKE_LDFLAGS = -L${LOCALBASE}/llvm${MODCLANG_VERSION}/lib 
> -Wl,-rpath=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
>
> diff --git a/x11/qt6/qtvirtualkeyboard/Makefile 
> b/x11/qt6/qtvirtualkeyboard/Makefile
> index ed02251fe79..799584684ac 100644
> --- a/x11/qt6/qtvirtualkeyboard/Makefile
> +++ b/x11/qt6/qtvirtualkeyboard/Makefile
> @@ -15,6 +15,4 @@ LIB_DEPENDS =	textproc/hunspell \
> 		x11/qt6/qtsvg \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-loader
> -
> .include <bsd.port.mk>
> diff --git a/x11/qt6/qtwayland/Makefile b/x11/qt6/qtwayland/Makefile
> index 931c8b2e8df..a84d0e91da1 100644
> --- a/x11/qt6/qtwayland/Makefile
> +++ b/x11/qt6/qtwayland/Makefile
> @@ -16,8 +16,7 @@ LIB_DEPENDS =	wayland/wayland \
> 		x11/qt6/qtdeclarative \
> 		x11/xkbcommon
>
> -BUILD_DEPENDS =	graphics/vulkan-headers \
> -		wayland/wayland-protocols \
> +BUILD_DEPENDS =	wayland/wayland-protocols \
> 		x11/qt6/qtshadertools
>
> .include <bsd.port.mk>