Simple diff to enable vulkan support in Qt5. Since all arches has vulkan
support it would make sense to enable it now. This diff goes in a bulk.
If I you have no concerns and the bulk is happy, I'll commit it.
diff --git a/x11/qt5/qt5.port.mk b/x11/qt5/qt5.port.mk
index 217c5522380..49f57c5b242 100644
--- a/x11/qt5/qt5.port.mk
+++ b/x11/qt5/qt5.port.mk
@@ -131,6 +131,7 @@ _MODQT5_CMAKE_PKGS = \
Qt5UiPlugin \
Qt5UiTools \
Qt5VirtualKeyboard \
+ Qt5VulkanSupport \
Qt5WebChannel \
Qt5WebEngine \
Qt5WebEngineCore \
diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile
index 26aa6cd8efb..962b0cdca9f 100644
--- a/x11/qt5/qtbase/Makefile
+++ b/x11/qt5/qtbase/Makefile
@@ -9,7 +9,7 @@ COMMENT-mysql = MySQL plugin for Qt5
COMMENT-psql = PostgresSQL plugin for Qt5
COMMENT-tds = TDS plugin for Qt5
-REVISION-main = 4
+REVISION-main = 5
PKGNAME-mysql = qt5-mysql-${VERSION}
PKGNAME-global = qt5-global-${VERSION}
@@ -155,9 +155,8 @@ CONFIGURE_ARGS += -confirm-license \
-shared \
-verbose
-# We have to wait until arm64 is vulkan ready.
-#BUILD_DEPENDS = graphics/vulkan-loader
-CONFIGURE_ARGS += -no-vulkan
+# Vulkan support
+BUILD_DEPENDS = graphics/vulkan-loader
# disabled
CONFIGURE_ARGS += -no-ccache \
diff --git a/x11/qt5/qtbase/pkg/PLIST-examples
b/x11/qt5/qtbase/pkg/PLIST-examples
index c2e1bfad7fc..4500bdd592b 100644
--- a/x11/qt5/qtbase/pkg/PLIST-examples
+++ b/x11/qt5/qtbase/pkg/PLIST-examples
@@ -610,6 +610,52 @@ lib/qt5/examples/sql/sqlwidgetmapper/window.h
lib/qt5/examples/sql/tablemodel/
lib/qt5/examples/sql/tablemodel/tablemodel.cpp
lib/qt5/examples/sql/tablemodel/tablemodel.pro
+lib/qt5/examples/vulkan/
+lib/qt5/examples/vulkan/hellovulkancubes/
+lib/qt5/examples/vulkan/hellovulkancubes/camera.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/camera.h
+lib/qt5/examples/vulkan/hellovulkancubes/color_frag.spv
+lib/qt5/examples/vulkan/hellovulkancubes/color_phong_frag.spv
+lib/qt5/examples/vulkan/hellovulkancubes/color_phong_vert.spv
+lib/qt5/examples/vulkan/hellovulkancubes/color_vert.spv
+lib/qt5/examples/vulkan/hellovulkancubes/hellovulkancubes.pro
+lib/qt5/examples/vulkan/hellovulkancubes/hellovulkancubes.qrc
+lib/qt5/examples/vulkan/hellovulkancubes/main.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/mainwindow.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/mainwindow.h
+lib/qt5/examples/vulkan/hellovulkancubes/mesh.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/mesh.h
+lib/qt5/examples/vulkan/hellovulkancubes/renderer.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/renderer.h
+lib/qt5/examples/vulkan/hellovulkancubes/shader.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/shader.h
+lib/qt5/examples/vulkan/hellovulkancubes/vulkanwindow.cpp
+lib/qt5/examples/vulkan/hellovulkancubes/vulkanwindow.h
+lib/qt5/examples/vulkan/hellovulkantexture/
+lib/qt5/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp
+lib/qt5/examples/vulkan/hellovulkantexture/hellovulkantexture.h
+lib/qt5/examples/vulkan/hellovulkantexture/hellovulkantexture.pro
+lib/qt5/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc
+lib/qt5/examples/vulkan/hellovulkantexture/main.cpp
+lib/qt5/examples/vulkan/hellovulkantexture/qt256.png
+lib/qt5/examples/vulkan/hellovulkantexture/texture_frag.spv
+lib/qt5/examples/vulkan/hellovulkantexture/texture_vert.spv
+lib/qt5/examples/vulkan/hellovulkantriangle/
+lib/qt5/examples/vulkan/hellovulkantriangle/hellovulkantriangle.pro
+lib/qt5/examples/vulkan/hellovulkantriangle/hellovulkantriangle.qrc
+lib/qt5/examples/vulkan/hellovulkantriangle/main.cpp
+lib/qt5/examples/vulkan/hellovulkanwidget/
+lib/qt5/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp
+lib/qt5/examples/vulkan/hellovulkanwidget/hellovulkanwidget.h
+lib/qt5/examples/vulkan/hellovulkanwidget/hellovulkanwidget.pro
+lib/qt5/examples/vulkan/hellovulkanwidget/hellovulkanwidget.qrc
+lib/qt5/examples/vulkan/hellovulkanwidget/main.cpp
+lib/qt5/examples/vulkan/hellovulkanwindow/
+lib/qt5/examples/vulkan/hellovulkanwindow/hellovulkanwindow.cpp
+lib/qt5/examples/vulkan/hellovulkanwindow/hellovulkanwindow.h
+lib/qt5/examples/vulkan/hellovulkanwindow/hellovulkanwindow.pro
+lib/qt5/examples/vulkan/hellovulkanwindow/main.cpp
+lib/qt5/examples/vulkan/vulkan.pro
lib/qt5/examples/widgets/
lib/qt5/examples/widgets/animation/
lib/qt5/examples/widgets/animation/README
@@ -893,6 +939,11 @@ lib/qt5/examples/widgets/effects/fademessage/fademessage.h
lib/qt5/examples/widgets/effects/fademessage/fademessage.pro
lib/qt5/examples/widgets/effects/fademessage/fademessage.qrc
lib/qt5/examples/widgets/effects/fademessage/main.cpp
+lib/qt5/examples/widgets/gallery/
+lib/qt5/examples/widgets/gallery/gallery.pro
+lib/qt5/examples/widgets/gallery/main.cpp
+lib/qt5/examples/widgets/gallery/widgetgallery.cpp
+lib/qt5/examples/widgets/gallery/widgetgallery.h
lib/qt5/examples/widgets/gestures/
lib/qt5/examples/widgets/gestures/gestures.pro
lib/qt5/examples/widgets/gestures/imagegestures/
@@ -1531,6 +1582,8 @@ lib/qt5/examples/widgets/richtext/textedit/example.html
lib/qt5/examples/widgets/richtext/textedit/images/
lib/qt5/examples/widgets/richtext/textedit/images/logo32.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/
+lib/qt5/examples/widgets/richtext/textedit/images/mac/checkbox-checked.png
+lib/qt5/examples/widgets/richtext/textedit/images/mac/checkbox.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/editcopy.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/editcut.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/editpaste.png
@@ -1541,6 +1594,8 @@
lib/qt5/examples/widgets/richtext/textedit/images/mac/filenew.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/fileopen.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/fileprint.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/filesave.png
+lib/qt5/examples/widgets/richtext/textedit/images/mac/format-indent-less.png
+lib/qt5/examples/widgets/richtext/textedit/images/mac/format-indent-more.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/textbold.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/textcenter.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/textitalic.png
@@ -1551,6 +1606,8 @@
lib/qt5/examples/widgets/richtext/textedit/images/mac/textunder.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/zoomin.png
lib/qt5/examples/widgets/richtext/textedit/images/mac/zoomout.png
lib/qt5/examples/widgets/richtext/textedit/images/win/
+lib/qt5/examples/widgets/richtext/textedit/images/win/checkbox-checked.png
+lib/qt5/examples/widgets/richtext/textedit/images/win/checkbox.png
lib/qt5/examples/widgets/richtext/textedit/images/win/editcopy.png
lib/qt5/examples/widgets/richtext/textedit/images/win/editcut.png
lib/qt5/examples/widgets/richtext/textedit/images/win/editpaste.png
@@ -1561,6 +1618,8 @@
lib/qt5/examples/widgets/richtext/textedit/images/win/filenew.png
lib/qt5/examples/widgets/richtext/textedit/images/win/fileopen.png
lib/qt5/examples/widgets/richtext/textedit/images/win/fileprint.png
lib/qt5/examples/widgets/richtext/textedit/images/win/filesave.png
+lib/qt5/examples/widgets/richtext/textedit/images/win/format-indent-less.png
+lib/qt5/examples/widgets/richtext/textedit/images/win/format-indent-more.png
lib/qt5/examples/widgets/richtext/textedit/images/win/textbold.png
lib/qt5/examples/widgets/richtext/textedit/images/win/textcenter.png
lib/qt5/examples/widgets/richtext/textedit/images/win/textitalic.png
diff --git a/x11/qt5/qtbase/pkg/PLIST-main b/x11/qt5/qtbase/pkg/PLIST-main
index 243dc89e0ef..8722594bd0f 100644
--- a/x11/qt5/qtbase/pkg/PLIST-main
+++ b/x11/qt5/qtbase/pkg/PLIST-main
@@ -2127,6 +2127,16 @@ include/X11/qt5/QtThemeSupport/QtThemeSupport
include/X11/qt5/QtThemeSupport/QtThemeSupportDepends
include/X11/qt5/QtThemeSupport/QtThemeSupportVersion
include/X11/qt5/QtThemeSupport/qtthemesupportversion.h
+include/X11/qt5/QtVulkanSupport/
+include/X11/qt5/QtVulkanSupport/${VERSION}/
+include/X11/qt5/QtVulkanSupport/${VERSION}/QtVulkanSupport/
+include/X11/qt5/QtVulkanSupport/${VERSION}/QtVulkanSupport/private/
+include/X11/qt5/QtVulkanSupport/${VERSION}/QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h
+include/X11/qt5/QtVulkanSupport/${VERSION}/QtVulkanSupport/private/qvkconvenience_p.h
+include/X11/qt5/QtVulkanSupport/QtVulkanSupport
+include/X11/qt5/QtVulkanSupport/QtVulkanSupportDepends
+include/X11/qt5/QtVulkanSupport/QtVulkanSupportVersion
+include/X11/qt5/QtVulkanSupport/qtvulkansupportversion.h
include/X11/qt5/QtWidgets/
include/X11/qt5/QtWidgets/${VERSION}/
include/X11/qt5/QtWidgets/${VERSION}/QtWidgets/
@@ -2818,6 +2828,9 @@ lib/qt5/cmake/Qt5Test/Qt5TestConfigVersion.cmake
lib/qt5/cmake/Qt5ThemeSupport/
lib/qt5/cmake/Qt5ThemeSupport/Qt5ThemeSupportConfig.cmake
lib/qt5/cmake/Qt5ThemeSupport/Qt5ThemeSupportConfigVersion.cmake
+lib/qt5/cmake/Qt5VulkanSupport/
+lib/qt5/cmake/Qt5VulkanSupport/Qt5VulkanSupportConfig.cmake
+lib/qt5/cmake/Qt5VulkanSupport/Qt5VulkanSupportConfigVersion.cmake
lib/qt5/cmake/Qt5Widgets/
lib/qt5/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
lib/qt5/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
@@ -2832,19 +2845,6 @@
lib/qt5/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
lib/qt5/cmake/Qt5Xml/
lib/qt5/cmake/Qt5Xml/Qt5XmlConfig.cmake
lib/qt5/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake
-lib/qt5/examples/widgets/gallery/
-lib/qt5/examples/widgets/gallery/gallery.pro
-lib/qt5/examples/widgets/gallery/main.cpp
-lib/qt5/examples/widgets/gallery/widgetgallery.cpp
-lib/qt5/examples/widgets/gallery/widgetgallery.h
-lib/qt5/examples/widgets/richtext/textedit/images/mac/checkbox-checked.png
-lib/qt5/examples/widgets/richtext/textedit/images/mac/checkbox.png
-lib/qt5/examples/widgets/richtext/textedit/images/mac/format-indent-less.png
-lib/qt5/examples/widgets/richtext/textedit/images/mac/format-indent-more.png
-lib/qt5/examples/widgets/richtext/textedit/images/win/checkbox-checked.png
-lib/qt5/examples/widgets/richtext/textedit/images/win/checkbox.png
-lib/qt5/examples/widgets/richtext/textedit/images/win/format-indent-less.png
-lib/qt5/examples/widgets/richtext/textedit/images/win/format-indent-more.png
lib/qt5/include
@static-lib lib/qt5/libQt5AccessibilitySupport.a
lib/qt5/libQt5AccessibilitySupport.la
@@ -2927,6 +2927,9 @@ lib/qt5/libQt5Test.prl
@static-lib lib/qt5/libQt5ThemeSupport.a
lib/qt5/libQt5ThemeSupport.la
lib/qt5/libQt5ThemeSupport.prl
+@static-lib lib/qt5/libQt5VulkanSupport.a
+lib/qt5/libQt5VulkanSupport.la
+lib/qt5/libQt5VulkanSupport.prl
lib/qt5/libQt5Widgets.la
lib/qt5/libQt5Widgets.prl
@lib lib/qt5/libQt5Widgets.so.${LIBQt5Widgets_VERSION}
@@ -3521,6 +3524,7 @@ lib/qt5/mkspecs/modules/qt_lib_sql_private.pri
lib/qt5/mkspecs/modules/qt_lib_testlib.pri
lib/qt5/mkspecs/modules/qt_lib_testlib_private.pri
lib/qt5/mkspecs/modules/qt_lib_theme_support_private.pri
+lib/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri
lib/qt5/mkspecs/modules/qt_lib_widgets.pri
lib/qt5/mkspecs/modules/qt_lib_widgets_private.pri
lib/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
