jgrulich pushed to qt5-qtwayland (epel7). "A more recent snapshot (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Jun 3 15:06:07 UTC 2015
From b8861a3f933c12677d1f7eb11f9953fde6f2ab1b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 14 Feb 2014 21:05:48 +0100
Subject: A more recent snapshot
- Disable xcomposite compositor until it builds
diff --git a/0001-Disable-stuff-that-does-not-build-with-desktop-gl.patch b/0001-Disable-stuff-that-does-not-build-with-desktop-gl.patch
new file mode 100644
index 0000000..c78e44a
--- /dev/null
+++ b/0001-Disable-stuff-that-does-not-build-with-desktop-gl.patch
@@ -0,0 +1,55 @@
+From ec24a608177ceed554cca66dec04a786c6701731 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at 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
+
diff --git a/qt5-qtwayland.spec b/qt5-qtwayland.spec
index 7614373..dae8adf 100644
--- a/qt5-qtwayland.spec
+++ b/qt5-qtwayland.spec
@@ -3,14 +3,15 @@
Summary: Qt5 - Wayland platform support and QtCompositor module
Name: qt5-%{qt_module}
-Version: 5.1.0
-Release: 0.6.20131203git6b20dfe%{?dist}
+Version: 5.2.1
+Release: 0.6.20140202git6d038fb%{?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 6b20dfe --prefix=qtwayland/ |gzip >qtwayland.tar.gz
+# git archive 6d038fb --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
@@ -27,6 +28,7 @@ BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(libudev)
+BuildRequires: git
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -43,12 +45,23 @@ Requires: qt5-qtbase-devel%{?_isa}
%{summary}.
+%package examples
+Summary: Examples for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description examples
+%{summary}.
+
+
%prep
%setup -q -n %{qt_module}
+%patch0 -p1
%build
-(cd src/compositor; syncqt.pl -check-includes -module QtCompositor -version %{version} -outdir %{_builddir}/%{?buildsubdir})
+# Presence of repository tricks qmake into invoking syncqt for us with
+# correct arguments at make time.
+git init
%{_qt5_qmake} -o gl/Makefile CONFIG+=wayland-compositor
%{_qt5_qmake} -o nogl/Makefile QT_WAYLAND_GL_CONFIG=nogl
@@ -59,7 +72,7 @@ make -C gl %{?_smp_mflags}
%install
make -C nogl install INSTALL_ROOT=%{buildroot}
make -C gl install INSTALL_ROOT=%{buildroot}
-install -pm644 gl/src/compositor/{wayland-wayland-server-protocol.h,qwayland-server-wayland.h} \
+install -pm644 gl/include/QtCompositor/%{version}/QtCompositor/private/{wayland-wayland-server-protocol.h,qwayland-server-wayland.h} \
%{buildroot}%{_qt5_headerdir}/QtCompositor/%{version}/QtCompositor/private
@@ -69,8 +82,8 @@ install -pm644 gl/src/compositor/{wayland-wayland-server-protocol.h,qwayland-ser
%files
%{_qt5_plugindir}/platforms
-%{_qt5_plugindir}/waylandcompositors
-%{_qt5_libdir}/libQt5Compositor.so.5*
+%{_qt5_plugindir}/wayland-graphics-integration
+%{_qt5_libdir}/libQt5*.so.5*
%doc README
%doc LICENSE.FDL LICENSE.LGPL LICENSE.GPL
%doc LGPL_EXCEPTION.txt
@@ -84,10 +97,18 @@ install -pm644 gl/src/compositor/{wayland-wayland-server-protocol.h,qwayland-ser
%{_qt5_libdir}/cmake/Qt5*/
%{_qt5_libdir}/pkgconfig/Qt5*.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri
-%exclude %{_qt5_libdir}/libQt5Compositor.la
+%exclude %{_qt5_libdir}/libQt5*.la
+
+
+%files examples
+%{_qt5_examplesdir}
%changelog
+* Fri Feb 14 2014 Lubomir Rintel <lkundrak at v3.sk> - 5.1.0-0.6.20140202git6d038fb
+- A more recent snapshot
+- Disable xcomposite compositor until it builds
+
* Sat Jan 04 2014 Lubomir Rintel <lkundrak at v3.sk> - 5.1.0-0.6.20131203git6b20dfe
- Enable QtQuick compositor
diff --git a/sources b/sources
index e9c7538..398e3e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a32d8943c6784f3806c9c215a7193e4f qtwayland.tar.gz
+4c62ad6ce231474ed4d61dd3bd1c8985 qtwayland.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtwayland.git/commit/?h=epel7&id=b8861a3f933c12677d1f7eb11f9953fde6f2ab1b
More information about the scm-commits
mailing list