Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Nov 2019 14:03:37 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517970 - head/x11-toolkits/qt5-gui
Message-ID:  <201911191403.xAJE3bf5043955@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Tue Nov 19 14:03:37 2019
New Revision: 517970
URL: https://svnweb.freebsd.org/changeset/ports/517970

Log:
  Add vulkan dependency to x11-toolkits/qt5-gui
  
  If the Vulkan headers are installed, builds would fail with extra
  artifacts produced. Since those headers are small, header-only, and
  only drag in cmake which is probably needed by dependencies anyway,
  push Vulkan forward.
  
  PR:		242017
  Submitted by:	jbeich

Modified:
  head/x11-toolkits/qt5-gui/Makefile
  head/x11-toolkits/qt5-gui/pkg-plist

Modified: head/x11-toolkits/qt5-gui/Makefile
==============================================================================
--- head/x11-toolkits/qt5-gui/Makefile	Tue Nov 19 13:38:41 2019	(r517969)
+++ head/x11-toolkits/qt5-gui/Makefile	Tue Nov 19 14:03:37 2019	(r517970)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gui
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 PKGNAMEPREFIX=	qt5-
 
@@ -9,7 +10,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical user interface module
 
 BUILD_DEPENDS=	at-spi2-core>=0:accessibility/at-spi2-core \
-		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
+		${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
+		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libevdev.so:devel/libevdev \
 		libfontconfig.so:x11-fonts/fontconfig \

Modified: head/x11-toolkits/qt5-gui/pkg-plist
==============================================================================
--- head/x11-toolkits/qt5-gui/pkg-plist	Tue Nov 19 13:38:41 2019	(r517969)
+++ head/x11-toolkits/qt5-gui/pkg-plist	Tue Nov 19 14:03:37 2019	(r517970)
@@ -749,6 +749,12 @@
 %%QT_INCDIR%%/QtThemeSupport/QtThemeSupportDepends
 %%QT_INCDIR%%/QtThemeSupport/QtThemeSupportVersion
 %%QT_INCDIR%%/QtThemeSupport/qtthemesupportversion.h
+%%QT_INCDIR%%/QtVulkanSupport/%%FULLVER%%/QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h
+%%QT_INCDIR%%/QtVulkanSupport/%%FULLVER%%/QtVulkanSupport/private/qvkconvenience_p.h
+%%QT_INCDIR%%/QtVulkanSupport/QtVulkanSupport
+%%QT_INCDIR%%/QtVulkanSupport/QtVulkanSupportDepends
+%%QT_INCDIR%%/QtVulkanSupport/QtVulkanSupportVersion
+%%QT_INCDIR%%/QtVulkanSupport/qtvulkansupportversion.h
 %%QT_INCDIR%%/QtXkbCommonSupport/%%FULLVER%%/QtXkbCommonSupport/private/qxkbcommon_p.h
 %%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupport
 %%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupportDepends
@@ -806,6 +812,8 @@
 %%QT_CMAKEDIR%%/Qt5ServiceSupport/Qt5ServiceSupportConfigVersion.cmake
 %%QT_CMAKEDIR%%/Qt5ThemeSupport/Qt5ThemeSupportConfig.cmake
 %%QT_CMAKEDIR%%/Qt5ThemeSupport/Qt5ThemeSupportConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5VulkanSupport/Qt5VulkanSupportConfig.cmake
+%%QT_CMAKEDIR%%/Qt5VulkanSupport/Qt5VulkanSupportConfigVersion.cmake
 %%QT_CMAKEDIR%%/Qt5XcbQpa/Qt5XcbQpaConfig.cmake
 %%QT_CMAKEDIR%%/Qt5XcbQpa/Qt5XcbQpaConfigVersion.cmake
 %%QT_CMAKEDIR%%/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
@@ -849,6 +857,8 @@
 %%QT_LIBDIR%%/libQt5ServiceSupport.prl
 %%QT_LIBDIR%%/libQt5ThemeSupport.a
 %%QT_LIBDIR%%/libQt5ThemeSupport.prl
+%%QT_LIBDIR%%/libQt5VulkanSupport.a
+%%QT_LIBDIR%%/libQt5VulkanSupport.prl
 %%QT_LIBDIR%%/libQt5XcbQpa.prl
 %%QT_LIBDIR%%/libQt5XcbQpa.so
 %%QT_LIBDIR%%/libQt5XcbQpa.so.5
@@ -873,6 +883,7 @@
 %%QT_MKSPECDIR%%/modules/qt_lib_platformcompositor_support_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_service_support_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_theme_support_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_vulkan_support_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_xkbcommon_support_private.pri
 %%QT_PLUGINDIR%%/generic/libqbsdkeyboardplugin.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911191403.xAJE3bf5043955>