On Sun May 01, 2022 at 07:56:05PM +0100, Stuart Henderson wrote:
> On 2022/05/01 20:36, Rafael Sadowski wrote:
> > OK?
> >
> > Information for inst:qt6-qtmultimedia-6.3.0
> >
> > Comment:
> > Qt6 multimedia components
> >
> > Description:
> > Qt Multimedia is an add-on module that provides a rich set of QML types and
> > C++
> > classes to handle multimedia content. It contains an easy to use API for
> > playing back audio and video files and rendering those on screen, as well
> > as a
> > comprehensive API for recording audio and video from the systems cameras and
> > microphones.
> >
> > Maintainer: The OpenBSD ports mailing-list <ports@openbsd.org>
> >
> > WWW: https://www.qt.io/
> >
> >
>
> ok.
Thanks
>
> : BUILD_DEPENDS = audio/pulseaudio \
> : x11/qt6/qtsvg>=${VERSION},<${NEXT_VERSION}
> :
> : LIB_DEPENDS = devel/glib2 \
> : multimedia/gstreamer1/core \
> : multimedia/gstreamer1/plugins-base \
> : multimedia/gstreamer1/plugins-bad \
> : x11/qt6/qtdeclarative>=${VERSION},<${NEXT_VERSION}
>
> have you considered setting PKGSPEC in x11/qt6/qtdeclarative and
> x11/qt6/qtsvg (and the others with this construct) instead?
> it sets the default automatically for any ports depending on it.
>
Thanks for the advice, like this? OK?
Index: qt5compat/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- qt5compat/Makefile 6 May 2022 18:59:59 -0000 1.3
+++ qt5compat/Makefile 6 May 2022 19:12:15 -0000
@@ -1,13 +1,15 @@
QT6NAME = Qt5Compat
COMMENT = Qt6 module contains unsupported Qt 5 APIs
+PKGSPEC = qt6-qt5compat-${QT6_PKGSPEC}
+
SHARED_LIBS += Qt6Core5Compat 0.1 # 6.3
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL
WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick c icudata icui18n icuuc
WANTLIB += m xkbcommon
-LIB_DEPENDS = x11/qt6/qtdeclarative>=${VERSION},<${NEXT_VERSION} \
+LIB_DEPENDS = x11/qt6/qtdeclarative \
x11/xkbcommon
.include <bsd.port.mk>
Index: qtbase/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- qtbase/Makefile 6 May 2022 18:59:59 -0000 1.11
+++ qtbase/Makefile 6 May 2022 19:12:15 -0000
@@ -5,6 +5,8 @@ COMMENT-global = global Qt6 documentatio
COMMENT-mysql = MySQL plugin for Qt6
COMMENT-psql = PostgresSQL plugin for Qt6
+PKGSPEC-main = qt6-qtbase-${QT6_PKGSPEC}
+
PKGNAME-mysql = qt6-mysql-${VERSION}
PKGNAME-global = qt6-global-${VERSION}
PKGNAME-psql = qt6-postgresql-${VERSION}
@@ -72,11 +74,11 @@ LIB_DEPENDS-global =
LIB_DEPENDS-main += devel/gettext,-runtime
-LIB_DEPENDS-mysql = ${BASE_PKGPATH},-main>=${VERSION:R},<${NEXT_VERSION} \
+LIB_DEPENDS-mysql = ${BASE_PKGPATH},-main \
${MODGCC4_CPPLIBDEP} \
databases/mariadb
-LIB_DEPENDS-psql = ${BASE_PKGPATH},-main>=${VERSION:R},<${NEXT_VERSION} \
+LIB_DEPENDS-psql = ${BASE_PKGPATH},-main \
${MODGCC4_CPPLIBDEP} \
databases/postgresql
Index: qtdeclarative/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- qtdeclarative/Makefile 6 May 2022 18:59:59 -0000 1.6
+++ qtdeclarative/Makefile 6 May 2022 19:12:15 -0000
@@ -3,6 +3,7 @@ USE_WXNEEDED = Yes
QT6NAME = QtDeclarative
COMMENT = Qt6 Quick and QML components
+PKGSPEC = qt6-qtdeclarative-${QT6_PKGSPEC}
SHARED_LIBS = Qt6Qml 0.1 # 6.3
SHARED_LIBS += Qt6Quick 0.1 # 6.3
@@ -35,8 +36,8 @@ WANTLIB += Qt6Sql Qt6Test Qt6Widgets c m
MODULES = lang/python
CONFIGURE_STYLE = cmake
-BUILD_DEPENDS =
x11/qt6/qtshadertools>=${VERSION},<${NEXT_VERSION} \
- x11/qt6/qtlanguageserver>=${VERSION},<${NEXT_VERSION} \
+BUILD_DEPENDS = x11/qt6/qtshadertools \
+ x11/qt6/qtlanguageserver \
graphics/vulkan-loader
pre-configure:
Index: qtlanguageserver/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtlanguageserver/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- qtlanguageserver/Makefile 6 May 2022 18:55:07 -0000 1.1.1.1
+++ qtlanguageserver/Makefile 6 May 2022 19:12:15 -0000
@@ -1,5 +1,6 @@
QT6NAME = QtLanguageServer
COMMENT = Language server implementation for Qt6
+PKGSPEC = qt6-qtlanguageserver-${QT6_PKGSPEC}
SHARED_LIBS += Qt6JsonRpc 0.0 # 6.3
SHARED_LIBS += Qt6LanguageServer 0.0 # 6.3
Index: qtquicktimeline/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtquicktimeline/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- qtquicktimeline/Makefile 6 May 2022 18:59:59 -0000 1.3
+++ qtquicktimeline/Makefile 6 May 2022 19:12:15 -0000
@@ -1,12 +1,13 @@
QT6NAME = QtQuickTimeline
COMMENT = Qt6 module for keyframe-based timeline construction.
+PKGSPEC = qt6-qtquicktimeline-${QT6_PKGSPEC}
SHARED_LIBS += Qt6QuickTimeline 0.0 # 6.3
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL
WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick c m xkbcommon
-LIB_DEPENDS = x11/qt6/qtdeclarative>=${VERSION},<${NEXT_VERSION} \
+LIB_DEPENDS = x11/qt6/qtdeclarative \
x11/xkbcommon
.include <bsd.port.mk>
Index: qtshadertools/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtshadertools/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- qtshadertools/Makefile 6 May 2022 18:59:59 -0000 1.3
+++ qtshadertools/Makefile 6 May 2022 19:12:15 -0000
@@ -2,6 +2,8 @@ QT6NAME = QtShaderTools
COMMENT = Qt6 shader tools module
+PKGSPEC = qt6-qtshadertools-${QT6_PKGSPEC}
+
SHARED_LIBS = Qt6ShaderTools 0.0 # 6.0
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui c m xkbcommon
Index: qtsvg/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtsvg/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- qtsvg/Makefile 6 May 2022 18:59:59 -0000 1.3
+++ qtsvg/Makefile 6 May 2022 19:12:15 -0000
@@ -1,5 +1,6 @@
QT6NAME = QtSVG
COMMENT = SVG support for Qt6
+PKGSPEC = qt6-qtsvg-${QT6_PKGSPEC}
SHARED_LIBS += Qt6Svg 0.1 # 6.3
SHARED_LIBS += Qt6SvgWidgets 0.1 # 6.3
Index: qttools/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qttools/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- qttools/Makefile 6 May 2022 18:59:59 -0000 1.6
+++ qttools/Makefile 6 May 2022 19:12:15 -0000
@@ -1,6 +1,7 @@
QT6NAME = QtTools
COMMENT = Qt6 development tools
+PKGSPEC = qt6-qttools-${QT6_PKGSPEC}
SHARED_LIBS += Qt6Designer 0.0 # 6.0
SHARED_LIBS += Qt6DesignerComponents 0.0 # 6.0
@@ -12,7 +13,7 @@ WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt
WANTLIB += Qt6Quick Qt6QuickWidgets Qt6Sql Qt6Widgets Qt6Xml c
WANTLIB += clang clang-cpp m xkbcommon
-LIB_DEPENDS = x11/qt6/qtdeclarative>=${VERSION},<${NEXT_VERSION} \
+LIB_DEPENDS = x11/qt6/qtdeclarative \
x11/xkbcommon \
devel/llvm
