[Tizen-submit] 19744: Changes to Tizen:Generic/qt5

noreply at tizen.org noreply at tizen.org
Fri Jan 17 07:31:02 GMT 2014


Hi,
Tomasz Olszak have made the following changes to qt5 in project Tizen:Generic. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #19744

  submit:       Tizen:Generic:build/qt5(cleanup) -> Tizen:Generic


Message:
Submitter: Tomasz Olszak <olszak.tomasz at gmail.com>
Comments: Resubmitting because of obs bug: Bug-Tizen: TINF-441
Git project: platform/upstream/qtbase
Tag: submit/tizen/20140117.072735
Commit: 3ae79a73eeb601870097c4caf01c4d57c6e90389 Fixes build on mobile:arm/atom ivi and generic

State:   new        2014-01-17T07:27:29 tizenrobot
Comment: <no comment>
spec files:
-----------
--- qt5.spec
+++ qt5.spec
@@ -37,7 +37,7 @@
 # make sense. This allows to update spec contents easily as snapshots
 # evolve.
 Name:       qt5
-VCS:        platform/upstream/qtbase#d85b7e61c1a2a65f66ce2e1ce28f935e454b649e
+VCS:        platform/upstream/qtbase#3ae79a73eeb601870097c4caf01c4d57c6e90389
 Summary:    Cross-platform application and UI framework
 Version:    5.2.1
 Release:    0
@@ -72,13 +72,11 @@
 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)
@@ -213,7 +211,6 @@
 %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
@@ -229,7 +226,6 @@
 
 %description plugin-platform-minimalegl
 This package contains the minimalegl platform plugin
-%endif
 
 %package plugin-platform-linuxfb
 Summary:    Linux framebuffer platform plugin
@@ -375,11 +371,9 @@
 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
 
 
@@ -560,6 +554,7 @@
     -device-option QT_QPA_DEFAULT_PLATFORM=xcb \
 %endif
 %endif
+    -opengl es2 \
     -prefix "%{_prefix}" \
     -bindir "%{_libdir}/qt5/bin" \
     -libdir "%{_libdir}" \
@@ -984,7 +979,6 @@
 %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
@@ -992,7 +986,6 @@
 %files plugin-platform-minimalegl
 %defattr(-,root,root,-)
 %{_libdir}/qt5/plugins/platforms/libqminimalegl.so
-%endif
 
 %files plugin-platform-linuxfb
 %defattr(-,root,root,-)

other changes:
--------------


More information about the Tizen-submit mailing list