From c831feaa7abf10f5dfb50d9e9a4b334192f8a4e2 Mon Sep 17 00:00:00 2001 From: Tomasz Olszak Date: Thu, 16 Jan 2014 17:01:04 +0100 Subject: Fixes build on mobile:arm/atom ivi and generic The issue was with pkgconfig(egl) and (glesv2). The pkgconfig(gles20) will be substituted to correct packages in each profile. Bug-Tizen:TIVI-2416 Change-Id: I6680f309392f2d750a2bd9949edb4200ab8b09ac Signed-off-by: Tomasz Olszak --- packaging/qt5.spec | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/packaging/qt5.spec b/packaging/qt5.spec index c96a15b142..702570037b 100644 --- a/packaging/qt5.spec +++ b/packaging/qt5.spec @@ -69,13 +69,11 @@ BuildRequires: readline-devel BuildRequires: python BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(xkbcommon) -%if %{with wayland} +BuildRequires: pkgconfig(gles20) +%if "%{profile}" != "mobile" BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(glesv2) %endif %if %{with x} -BuildRequires: pkgconfig(gles20) -BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xcomposite) @@ -210,7 +208,6 @@ Requires: %{name}-qtcore = %{version}-%{release} %description plugin-platform-offscreen This package contains the offscreen platform plugin -%ifnarch %arm armv7l %package plugin-platform-eglfs Summary: Eglfs platform plugin Group: Base/Libraries @@ -226,7 +223,6 @@ Requires: %{name}-qtcore = %{version}-%{release} %description plugin-platform-minimalegl This package contains the minimalegl platform plugin -%endif %package plugin-platform-linuxfb Summary: Linux framebuffer platform plugin @@ -372,11 +368,9 @@ This package contains the QtOpenGL library Summary: Development files for QtOpenGL Group: Base/Libraries Requires: %{name}-qtopengl = %{version}-%{release} -Requires: pkgconfig(glesv2) -%if %{with wayland} +Requires: pkgconfig(gles20) +%if "%{profile}" != "mobile" Requires: pkgconfig(egl) -%else -Requires: pkgconfig(gl) %endif @@ -555,6 +549,7 @@ MAKEFLAGS=%{?_smp_mflags} \ -device-option QT_QPA_DEFAULT_PLATFORM=xcb \ %endif %endif + -opengl es2 \ -prefix "%{_prefix}" \ -bindir "%{_libdir}/qt5/bin" \ -libdir "%{_libdir}" \ @@ -979,7 +974,6 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %defattr(-,root,root,-) %{_libdir}/qt5/plugins/platforms/libqoffscreen.so -%ifnarch %arm armv7l %files plugin-platform-eglfs %defattr(-,root,root,-) %{_libdir}/qt5/plugins/platforms/libqeglfs.so @@ -987,7 +981,6 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %files plugin-platform-minimalegl %defattr(-,root,root,-) %{_libdir}/qt5/plugins/platforms/libqminimalegl.so -%endif %files plugin-platform-linuxfb %defattr(-,root,root,-) -- cgit v1.2.3