rpms/qt5-qtwayland
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update

Browse Source
This commit is contained in:
Lubomir Rintel 2014-07-24 17:50:25 +02:00
parent 9bb2ebaf87
commit f5acbb1597
3 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0001-Disable-stuff-that-does-not-build-with-desktop-gl.patch
View File

@ -1,55 +0,0 @@
From ec24a608177ceed554cca66dec04a786c6701731 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 14 Feb 2014 18:48:04 +0100
Subject: [PATCH] Disable stuff that does not build with desktop gl
Change-Id: I71f1436414e02247b12f5fb0b58a40068a70c202
---
examples/server-buffer/server-buffer.pro | 3 ++-
src/plugins/hardwareintegration/compositor/compositor.pro | 4 ++--
src/plugins/platforms/platforms.pro | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/examples/server-buffer/server-buffer.pro b/examples/server-buffer/server-buffer.pro
index 16c5562..470c6a4 100644
--- a/examples/server-buffer/server-buffer.pro
+++ b/examples/server-buffer/server-buffer.pro
@@ -1,3 +1,4 @@
TEMPLATE=subdirs
-SUBDIRS += client compositor
+#SUBDIRS += client compositor
+SUBDIRS += compositor
diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro
index 3c1ff5d..0221c04 100644
--- a/src/plugins/hardwareintegration/compositor/compositor.pro
+++ b/src/plugins/hardwareintegration/compositor/compositor.pro
@@ -9,8 +9,8 @@ config_xcomposite {
config_egl: \
SUBDIRS += xcomposite-egl
- !contains(QT_CONFIG, opengles2):config_glx: \
- SUBDIRS += xcomposite-glx
+# !contains(QT_CONFIG, opengles2):config_glx: \
+# SUBDIRS += xcomposite-glx
}
config_drm_egl_server: \
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 0665511..7b10fad 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -15,8 +15,8 @@ contains(CONFIG, wayland-compositor) {
config_xcomposite {
config_egl: \
SUBDIRS += qwayland-xcomposite-egl
- !contains(QT_CONFIG, opengles2):config_glx: \
- SUBDIRS += qwayland-xcomposite-glx
+# !contains(QT_CONFIG, opengles2):config_glx: \
+# SUBDIRS += qwayland-xcomposite-glx
}
}
--
1.8.5.3

9
qt5-qtwayland.spec
View File

@ -4,14 +4,13 @@
Summary: Qt5 - Wayland platform support and QtCompositor module
Name: qt5-%{qt_module}
Version: 5.3.0
Release: 0.2.20140529git98dca3b%{?dist}
Release: 0.2.20140723git02c499c%{?dist}
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/wiki/QtWayland
# git clone --no-checkout git://gitorious.org/qt/qtwayland.git
# cd qtwayland/
# git archive 98dca3b --prefix=qtwayland/ |gzip >qtwayland.tar.gz
# git archive 02c499c --prefix=qtwayland/ |gzip >qtwayland.tar.gz
Source0: qtwayland.tar.gz
Patch0: 0001-Disable-stuff-that-does-not-build-with-desktop-gl.patch
BuildRequires: qt5-qtbase-devel >= 5.2
BuildRequires: qt5-qtbase-static >= 5.2
@ -55,7 +54,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}
%patch0 -p1
%build
@ -106,6 +104,9 @@ install -pm644 gl/include/QtCompositor/%{version}/QtCompositor/private/{wayland-
%changelog
* Thu Jul 24 2014 Lubomir Rintel <lkundrak@v3.sk> - 5.3.0-0.2.20140723git02c499c
- Update
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-0.2.20140529git98dca3b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
031e72a240920d95ad484156650d26e0 qtwayland.tar.gz
912f5acf1b099c018b3b56e67fba49e2 qtwayland.tar.gz