summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin10000 -> 10005 bytes
-rw-r--r--dev-qt/qtcharts/Manifest2
-rw-r--r--dev-qt/qtcharts/qtcharts-5.14.1.ebuild2
-rw-r--r--dev-qt/qtdeclarative/Manifest5
-rw-r--r--dev-qt/qtdeclarative/metadata.xml1
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild53
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-5.14.1.ebuild)4
-rw-r--r--dev-qt/qtgui/Manifest4
-rw-r--r--dev-qt/qtgui/metadata.xml1
-rw-r--r--dev-qt/qtgui/qtgui-5.14.1-r3.ebuild (renamed from dev-qt/qtgui/qtgui-5.14.1-r2.ebuild)7
-rw-r--r--dev-qt/qtmultimedia/Manifest1
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.13.2.ebuild68
-rw-r--r--dev-qt/qtwayland/Manifest4
-rw-r--r--dev-qt/qtwayland/metadata.xml1
-rw-r--r--dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild (renamed from dev-qt/qtwayland/qtwayland-5.14.1.ebuild)11
15 files changed, 26 insertions, 138 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 3f5e26624365..abfd93079da0 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index c8eeb22ee588..0351a3005089 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -3,5 +3,5 @@ DIST qtcharts-everywhere-src-5.13.2.tar.xz 4244092 BLAKE2B 460716cfb39dfd248c16c
DIST qtcharts-everywhere-src-5.14.1.tar.xz 4250588 BLAKE2B cc3c01385c09a04c8999d2a658ca8b13231fb0f99867afb8ea343e8ff66815c6980751ec076468ca394faedfc5f8f05e0c99739b19ac6a7c9cf5b01d0fb8b8c8 SHA512 5cf2739a5bc67ed25cb6f39bd795447c1e37963d1f3726d37ad9a2894080db3329fd2c6b17937ad831db78f5099e7c3b4ecd02991a7a69eb482ab61877d54d0f
EBUILD qtcharts-5.12.3.ebuild 511 BLAKE2B 23f16cf8850b9da38e724fbe7ea9b3a78037ee78f8a5139bde50f466ccae8dcd77c0c57250ed7bd0dcefbf0b157568fbd7cf6e39bdb5e6157f171cc730e53cc7 SHA512 450ca202b25ade28dc68e54983b991e1ba17dd9d836d7fe51def3d71983e571fcdbf74fe95c7a31c3c4e2b5922d7ab8d28ab8972e7a1cf19e239ee2888c3d32b
EBUILD qtcharts-5.13.2.ebuild 518 BLAKE2B 8462a3cd9a1c975a6a88a88b4a1b1e5c332b74a2a77e128398db0bc72116ca4a32725882c925c56fac84ec24d31b1f64439ad1393e01fcf747fa603fe4c94475 SHA512 bd7c9285f16a481f9c4c14e20cdac392a36e37a92629f98f556fa2b3fa1918b8b8096b9c16838d7ad7aa35ceb77db925d2a6a2b45378345631889822f18b2fcd
-EBUILD qtcharts-5.14.1.ebuild 525 BLAKE2B a2b598a9361e3a2ecc6f4619352aa1c93019419b6de961e5176a3604ed41f46291f019925465f070e1c20792a59ce44d6a3fe3d32289f6b41eecc6a3abfab6d6 SHA512 8d93e3dcb14b7f67b8c5800ff47edf8fcb13fa075fbbfa71453f8b8f2b9e58298bb25d70ff7aba69bb3fe6d31a81d02e85c331015c3a88cd86b1d82e2f00f0b7
+EBUILD qtcharts-5.14.1.ebuild 537 BLAKE2B 596fe8baa9684481dfb85e8d8981fd5d2c87a84629dbc20ca1aea3b646acc4dd0dca87a174f8077001c2b4dfaab8f364053a825cda36d303c9e828e57453e0bf SHA512 ed7901d6735b6099714c199fb7f9aeedef012a4511e0b23abb0be6b457b6af8dd4d8d647945df45f2c2a0e6547f53492283ddb642034998683c1fdfcc6ef5ea3
MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.14.1.ebuild b/dev-qt/qtcharts/qtcharts-5.14.1.ebuild
index c2fe1de176fb..f21ce2b9ce05 100644
--- a/dev-qt/qtcharts/qtcharts-5.14.1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.14.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
LICENSE="GPL-3"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 59371178e3b1..0ce3d6993784 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,6 +6,5 @@ DIST qtdeclarative-everywhere-src-5.13.2.tar.xz 20940748 BLAKE2B acc688691a86318
DIST qtdeclarative-everywhere-src-5.14.1.tar.xz 21299728 BLAKE2B dfa0dfc95956f9c9eeb6b790e0221cf745b0cefd89fc070caa741b9cdc644acd990128affbcef6ac585758a02f94b1693ccca77d9de080f04f4d1b6d2304537f SHA512 70094d24a977a5ae4a3a11ee31e49234592faca1ec8195560977e7834778d1b1fdc2a30e555dc6c43c98cef2a39d5c1bf6351093c0f46b9b22b4127f3bebef58
EBUILD qtdeclarative-5.12.3.ebuild 1140 BLAKE2B 729d0c1acb73839bacbbfc7363f29cd0e01ff004a0f182c1a6cbe7f33c23f17be81478939eccd2ac828e727451910ed77901b73795ffe1a20a9f471c06b89dc0 SHA512 f8d5c239ce8a653c77fafccfa4d5df25a46ac7811dd359ae0399c7eab9087cf5b0793061dfb7291a7d84a36668571883ec4920ac2f0e1cc676a9e9f84cc56cdd
EBUILD qtdeclarative-5.13.2-r1.ebuild 1286 BLAKE2B c681165cf03ee0358cb27492cf830cd2736ac74537294c7de2eea8fb6ef112bc644edfe61b53700ae8e5b9b66776d557b5244c2be61685282792c23b086d2579 SHA512 fd3137e47eeeb06994a9f4ce3a3b7086a4c6fe6fbc69c521bd325b7ff2123a7de50116f1fab74cdd0a8ccfe454555588eace3dfd185c1950a886bc1398fafb0f
-EBUILD qtdeclarative-5.13.2.ebuild 1146 BLAKE2B ddb8a3302fe9d9d427dbb9b8caaaa2c3e718e031a1b4937dee5b7c9a8a12718ef8e78fa355736c7620945c549b3f6f3b85ba501d2fd8c98c08b09cb1f568d37e SHA512 dc4e937e2c6f3717173ccf91bcde93a558f34791d929c25aa1cd073bca96d55419e8326118d5dcd1a37181bfce6e06aa2b4d91c324c6c191d0338a84d74b4679
-EBUILD qtdeclarative-5.14.1.ebuild 1148 BLAKE2B 87599e7f32ce5ec3026227ffb4c707ff0ebf0f5bfab374c19276c1d14d1f393268ec2fb940350ddde023b662cf765c8b1bd96da6fd56e7a52808681b542b2883 SHA512 bf7cffb9ff0e81f113e888f59f1f23802818d81a06946a233e68f63dd33464437994ef1f239b248f24f615e6d56ef00bb7f0d6fa9c6eb88eb803a00f408ed7fb
-MISC metadata.xml 718 BLAKE2B 8726e8349c867c54347bb2fae219fb858a2f31058d7fa83fb7aa5691b3dbff327a9b2ef4cdbfdfc087fe30847d037f55ed92a2797ad961764676c10d348148a5 SHA512 827be20878184958800c2b31b4fcff95e67bfff208d4669c4b0b1f190bbc8ebeb46795e62c06f46dd8ef54c072e82fe9f1b32bef14072e81c8f1dc7428e386c3
+EBUILD qtdeclarative-5.14.1-r1.ebuild 1163 BLAKE2B e4fa4b0e173b1ffbb3fb30df8072332c39d3ed5c098226daed90190ea5f49f4f3879f1f917eb4059dcd68c24aa307ac11386e48037bada54cae8720ee02d43ab SHA512 3692ba99a65363b8d9d5f49c806b9c6bcbc5b10a8c8e7d4ce97f85fa3e6339f41ffb1024a12f695991eb1d9a5df9b4b3fb35a2031c22c50fcde2e5ec23d1f1ab
+MISC metadata.xml 773 BLAKE2B d538bb46ae3554f3a18d426ea967606df009a2f55a9b02a7275d7cae32adc71e017e96d6c48db946d636dfcd33cfa1846209e87c9da99b90625ad4cae2595df8 SHA512 54f305948407d29a2506505f15b79cf912aace3ace002b92f085d82275ff2426293b8f94b8666b7a5c2f360aa39749e6924b8e0ec121dd268fe88e711dbeb20f
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index cffb0c60697c..9fc8265089ec 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
+ <flag name="vulkan">Enable support for Vulkan</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
deleted file mode 100644
index 50821d0e0011..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="gles2 +jit localstorage +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2=] is needed because of bug 504322
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qttest-${PV}
- localstorage? ( ~dev-qt/qtsql-${PV} )
- widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}
- !<dev-qt/qtquickcontrols-5.7:5
-"
-
-src_prepare() {
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
- qt_use_disable_mod localstorage sql \
- src/imports/imports.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/qmltest/qmltest.pro \
- tests/auto/auto.pro \
- tools/tools.pro \
- tools/qmlscene/qmlscene.pro \
- tools/qml/qml.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myqmakeargs=(
- --
- -qml-debug
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
index a70c3d60ba41..74bb692c392a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
@@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="gles2 +jit localstorage +widgets"
+IUSE="gles2 +jit localstorage vulkan +widgets"
BDEPEND="${PYTHON_DEPS}"
# qtgui[gles2=] is needed because of bug 504322
DEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtgui-${PV}[gles2=,vulkan=]
~dev-qt/qtnetwork-${PV}
~dev-qt/qttest-${PV}
localstorage? ( ~dev-qt/qtsql-${PV} )
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 3bfd93cbcd76..fc5fbd4fde84 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -6,5 +6,5 @@ DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce
DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
EBUILD qtgui-5.12.3-r1.ebuild 3668 BLAKE2B 6620cd32938c814cc597051ce5b3d6f4c0f4f5bf16459d0cd421ef3cb595b360d989b5cc56094ac2d2bee1c38b1f3b2bed9d86ee8b306d90a3fdea0cdd894765 SHA512 3e6443bcd235dfe04df30938fb5350eb4b234a0967914ae6209a8b0251ecae86950f0eb8a69b034cf3d4dd9c174e9ae9ab51a889ac2face27d83b8f6f93e1fae
EBUILD qtgui-5.13.2.ebuild 3850 BLAKE2B 68a765fa93aafb2db53761863001b0033698b9cb2aab6a8a2b558aa2900460f877629c9a737d886ade16d7b24a170f9b6304c9c441f3e4d85abc03c278b15342 SHA512 4ac90834407dde1d9b95893b8cfec007a876945cf9dc195400fae14dbf7a6d499480857b1705c2a2f71c8f2603454e017ce897ca45b8c94ab1b8d63de57fe0cf
-EBUILD qtgui-5.14.1-r2.ebuild 4112 BLAKE2B 0f5e00cb56afd17f86992e9230b3b81a69deb00a94c3565e0584f9693d3a2e0ed11559bd31af08a53c511d4d4aefa9b7a866a92af7a8d151a9046dd55659f932 SHA512 9c2684a9f9611552bb315e079fec9bb2ac772d941dd2c7d8019fa8a40886fd98654a9e32da6e68e8667bf25c32e4aceed37d69408b1980db271aa1b75aed2036
-MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a
+EBUILD qtgui-5.14.1-r3.ebuild 4191 BLAKE2B 8ee7e6141b86699c9f6cee4c1d5af30ec37314e31a489bddcb0180e0be900e0e296ad91301e2817b96d6733639c20f434dd69c2365bd81fe14d4ff193af61c61 SHA512 44f558779f93d1ec0cf13b0f57088a28c3d00a609400bc1062c562bd9b4ce0be9fc584f828aec38b284645d465c96daf12fbba4ecfcfd406b88f2e0d4e53c212
+MISC metadata.xml 1377 BLAKE2B 132087874ca283b494027301d33206155c3dc496f095de1ab2d740142ff1ab725e7e8fd99e533d813e71782cb4b25452987624139e269a066df5a93f3a176ee1 SHA512 9e7227bb9097e0110dd2780112e6be863c288f88a4884e269100274327b0c7ddbb238f0fb36b4c37779b8b0483718d5921f05668a1962c0b0ee6e431ac96beaf
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 74256c169f9b..0ff1bae4e4d8 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -14,6 +14,7 @@
<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
+ <flag name="vulkan">Enable support for Vulkan</flag>
<flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag>
<flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
</use>
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
index e077dd59d735..187c3e0c5035 100644
--- a/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
@@ -15,8 +15,8 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +X"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+ +libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
accessibility? ( dbus X )
@@ -53,6 +53,7 @@ COMMON_DEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
+ vulkan? ( dev-util/vulkan-headers )
X? (
x11-libs/libICE
x11-libs/libSM
@@ -120,6 +121,7 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
+ vulkan:vulkan:
X:xcb:
X:xcb-glx:
X:xcb-plugin:
@@ -177,6 +179,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
+ $(qt_use vulkan)
$(qt_use udev libudev)
$(qt_use X xcb system)
$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index c9405405f4a1..1a72a8b4e527 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -4,6 +4,5 @@ DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38
DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
EBUILD qtmultimedia-5.12.3.ebuild 1403 BLAKE2B e0c523a1309e99930dfaa92740f65ce87aa67595e6cb52bd3cb97606691b2a6eac8171a2f53c7190718b318d9654062d249f2c4ce53c742e5fc9b11348739185 SHA512 288e02cfb16953ba278f50e45ccaaad060d59c52722669743e11b0452b41177a3aeee6fd237baf24dd6131f4fdc8ae8e739c632089dad3f48669194d2cc4938b
EBUILD qtmultimedia-5.13.2-r1.ebuild 1511 BLAKE2B 452e376cd721c3ca625e282ee509bf85a86e6b5effb1775b028086fdc633bfd7c4f7fbbfef2a4eb773a9e0cd2dc6284137c599a30fc9294f4fa1c0196ce6d8d5 SHA512 b6ccc65bbf87ab6a5d28f44044bbefaafb9fdc35e73176241cfbcb180aeab61c0dae8f186d582fa07a9285f258fe387d9a33e72ce33f55fb70c7d74b0a55a0ae
-EBUILD qtmultimedia-5.13.2.ebuild 1448 BLAKE2B a932815ba950f6ca4a92467f5b7fee3b768b485b4f5a29ee604cf1ec234444d0fa3c3002eabe7990aa70e4f2be8eb6b5327498ac09279991d8ea5c71a1f8f8c5 SHA512 ab5a885ebedfd17b62ce5762197bc9b689cae6c3a46ffc16d0d37b7f4b43561fcfae6dc3949cab01bf119d492a2a9dbd096dc6a081592391f61a4010692acfb5
EBUILD qtmultimedia-5.14.1.ebuild 1448 BLAKE2B 6e2efd504b680ea14faf8dd98705c726b9277e80db016e211f5e28eeaa4fb74057b7fb5056b388c6212a006c4c1a76c8faec54cebfd9fe07971ccc90f7b56fa7 SHA512 5349717406ba215a2532b57efc1aaf3464c973402f495308f6318cf48876840df2580e548fccc72370ba8a5e8be633bd86717229f2aa27020468a1e423f0acdf
MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2.ebuild
deleted file mode 100644
index 349dd584a74c..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtnetwork-${PV}
- alsa? ( media-libs/alsa-lib )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- )
- pulseaudio? ( media-sound/pulseaudio[glib] )
- qml? (
- ~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl] )
- openal? ( media-libs/openal )
- )
- widgets? (
- ~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}[gles2=]
- )
-"
-DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
- sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
- src/multimedia/multimedia.pro || die
-
- qt_use_disable_config openal openal \
- src/imports/imports.pro
-
- qt_use_disable_mod qml quick \
- src/src.pro \
- src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/gsttools/gsttools.pro \
- src/plugins/gstreamer/common.pri
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myqmakeargs=(
- --
- $(qt_use alsa)
- $(qt_use gstreamer)
- $(qt_use pulseaudio)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 7b53afbd0fe0..40960afc58b6 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -6,5 +6,5 @@ DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217
DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795169a91f18ed2535684bf604d12ab900a0fb2502d30c1fa4fbdc5899c4a32505e8f4b2be142d3b16540b6797c1624deac097d45ea41d SHA512 6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc
EBUILD qtwayland-5.12.3.ebuild 1104 BLAKE2B bb4b521407462f24a4e438a3d91682b8b976422ae2c661905414a7d156dbe6a409c97297c61e247dd3c208e98826f1db3acbf45ca99f4879aca7f4449c5ac10f SHA512 e8dbf7139d9059fe0970ad660d329b35191542a541e3f2ddfbe5ec3d14fb9261713d0dd6c131adf4909d8b1d109aede77254156c7c5ef7054903522bcd26f2e1
EBUILD qtwayland-5.13.2-r1.ebuild 1353 BLAKE2B 23009b3f906ac833d9774623878c57793dfbaea37cefee47e8d984482c6ed2ea3dbbaca170a8ca310545b0de4832545dbf94fd77ab2ccbc1a5c0a1e251fc689b SHA512 8cc4e5014c294c609e1a4ec8d149e700d3cba63a438daa5fc719ca9357ace304d03084ff7e841773e7cbfd8908316eaa39e0c436a3dfcb805de002325af08d2b
-EBUILD qtwayland-5.14.1.ebuild 1142 BLAKE2B 630eab64e768484e49385d15c88b860837400f75e603fdb8f2bb2f3231ac5b9342f578a745f33464bbbbb2c94901a8ea8a3195c25f2327a2d40badb109eaaa11 SHA512 8c9b581722932a5946776e2ef7f78989037f33d6d50b070767a33f67a7de75b495deb317bcc34cea0ea52b9cd105f50f5f2ff101208347374a52ff3970a63b6f
-MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
+EBUILD qtwayland-5.14.1-r1.ebuild 1364 BLAKE2B 48aa884d5d77c18c7134ddcfda733ebbc2c4c23da5598faa89c6263b785756d4a7d42b6e37cd79228ae8812df9003c48c7bea7f747f8637b87982c5ea3a16cbc SHA512 e97c4eec05b4fb4cab85f28d4eb7ab0e8cf3944aba02ef490536e2dbf0dd5814c92c82f0dc17cb6390906e30adde0f50e5541357bce0c25cb33dc12b40f34826
+MISC metadata.xml 680 BLAKE2B 4ec031890956f3b2cfcb6c53678ce58580ad11416f1a4b3c20c5fe07d5e8bfa4c06999bce68491487a3d3fd98bc5994472138cd2bb10d012657d852d74c01eec SHA512 b76508be78d0b3976fe4d3e7af103dd0b0749fbcd84a63ffa7d97e527fbadbd06973ab4af18a37eba4e6d256512a1e2453b90c990f288b994cc6997cdabdefd6
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 4fb03e679017..db7a41ae479b 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+ <flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtwayland/qtwayland-5.14.1.ebuild b/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
index 8464c35ff42b..5fa75b673a70 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
@@ -10,15 +10,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="+libinput xcomposite"
+IUSE="+libinput vulkan xcomposite"
DEPEND="
>=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput=]
+ ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
+ vulkan? ( dev-util/vulkan-headers )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -27,7 +28,7 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- qt_use_disable_config libinput xkbcommon-evdev \
+ qt_use_disable_config libinput xkbcommon \
src/client/client.pro \
src/compositor/wayland_wrapper/wayland_wrapper.pri \
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
@@ -37,6 +38,10 @@ src_prepare() {
src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
tests/auto/compositor/compositor/compositor.pro
+ qt_use_disable_config vulkan wayland-vulkan-server-buffer \
+ src/plugins/hardwareintegration/client/client.pro \
+ src/plugins/hardwareintegration/compositor/compositor.pro
+
use xcomposite || rm -r config.tests/xcomposite || die
qt5-build_src_prepare