summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-11-28 00:08:10 +0100
committerDavide Pesavento <pesa@gentoo.org>2015-11-28 00:18:32 +0100
commit05d5b6242244efacef4fc316eb8e8f9fd8957eaa (patch)
tree843d1a672f5ad252e912be1e5703cef4f09ebc2e /dev-qt
parentmedia-sound/xmms2: fix build failure against stable libmodplug, bug #536046 (diff)
downloadgentoo-05d5b6242244efacef4fc316eb8e8f9fd8957eaa.tar.gz
gentoo-05d5b6242244efacef4fc316eb8e8f9fd8957eaa.tar.bz2
gentoo-05d5b6242244efacef4fc316eb8e8f9fd8957eaa.zip
dev-qt/qtwidgets: backport patch to fix vlc video output
Gentoo-Bug: 563458 Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch39
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild47
2 files changed, 86 insertions, 0 deletions
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch b/dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch
new file mode 100644
index 00000000000..a340c130c9d
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch
@@ -0,0 +1,39 @@
+From 0f68f8920573cdce1729a285a92ac8582df32841 Mon Sep 17 00:00:00 2001
+From: Ulf Hermann <ulf.hermann@theqtcompany.com>
+Date: Tue, 27 Oct 2015 15:25:42 +0100
+Subject: QtWidgets: Do hide/show via WA_OutsideWSRange for native widgets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a native widget has a width or height of 0 we don't have to
+invalidate its backing store as that is done by the window
+system. Certain applications rely on ... interesting ... behavior
+of certain window systems in this case.
+
+Task-number: QTBUG-48321
+Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
+Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
+Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
+Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
+---
+ src/widgets/kernel/qwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 7734715..4286130 100644
+--- a/src/widgets/kernel/qwidget.cpp
++++ b/src/widgets/kernel/qwidget.cpp
+@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+
+ bool needsShow = false;
+
+- if (q->isWindow()) {
++ if (q->isWindow() || q->windowHandle()) {
+ if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
+ q->setAttribute(Qt::WA_OutsideWSRange, true);
+ if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+--
+2.6.3
+
diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild
new file mode 100644
index 00000000000..84895e4c876
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtkstyle +png +xcb"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-vlc-video-output.patch" # bug 563458
+)
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/uic
+ src/widgets
+)
+
+QT5_GENTOO_CONFIG=(
+ !:no-widgets:
+)
+
+src_configure() {
+ local myconf=(
+ $(qt_use gtkstyle)
+ -opengl $(usex gles2 es2 desktop)
+ $(qt_use png libpng system)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+ )
+ qt5-build_src_configure
+}