Changes - SailfishOS Open Build Service

Changes of Revision 14

[-] [+]	Changed	_service:tar_git:qtbase.spec
@@ -8,6 +8,17 @@ # This flag tells rpmbuild to behave. %define keepstatic 1 +# Pick which OpenGL implementation we need, on ARM it should alwas be +# GLES2 and desktop GL on x86 PCs but the latter breaks qtwayland so we +# temporarily pick GLES2 for x86 too. +#%ifarch %{ix86} x86_64 +#%define opengl desktop +#%endif +#%ifarch %{arm} +#%define opengl es2 +#%endif +%define opengl es2 + # Version is the date of latest commit in qtbase, followed by 'g' + few # characters of the last git commit ID. # NOTE: tarball's prefix is 'qt5-base' until version number starts to @@ -16,8 +27,8 @@ Name: qt5 Summary: Cross-platform application and UI framework -Version: 5.3.1 -Release: 2 +Version: 5.3.1+master.12.2.g8d709e6 +Release: 1%{?dist} Group: Qt/Qt License: LGPLv2.1 with exception or GPLv3 URL: http://qt.nokia.com @@ -30,10 +41,12 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(freetype2) +%if "%{opengl}" == "desktop" +BuildRequires: pkgconfig(gl) +%endif +%if "%{opengl}" == "es2" BuildRequires: pkgconfig(glesv2) -##%ifarch %{ix86} x86_64 -##BuildRequires: pkgconfig(gl) -##%endif +%endif BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libpng) @@ -616,12 +629,7 @@ %endif -verbose \ -no-gtkstyle \ -##%ifarch %{arm} - -opengl es2 \ -##%endif -##%ifarch %{ix86} x86_64 -## -opengl desktop \ -##%endif + -opengl %{opengl} \ -no-openvg \ -openssl-linked \ -lfontconfig \
	Added	_service:tar_git:qt5-5.3.1+master.12.2.g8d709e6.tar.bz2 ^
	Deleted	_service:tar_git:qt5-5.3.1.tar.bz2 ^