[Tizen-submit] 18679: Changes to Tizen:IVI/qt5

noreply at tizen.org noreply at tizen.org
Thu Dec 12 21:25:26 GMT 2013


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

Thank You,

[This message was auto-generated]

---

Request: #18679

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


Message:
Submitter: Tomasz Olszak <olszak.tomasz at gmail.com>
Comments: GL instead of EGL used on Mobile
Git project: platform/upstream/qtbase
Tag: submit/tizen/20131212.212241
Commit: 3b95475f956a26eaee441dc385b2eec4fdd5ff01 GL instead of EGL Used in Mobile.

State:   new        2013-12-12T21:22:08 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#fe9601b8392cf650582197e0824e284178345610
+VCS:        platform/upstream/qtbase#3b95475f956a26eaee441dc385b2eec4fdd5ff01
 Summary:    Cross-platform application and UI framework
 Version:    5.2.0
 Release:    0
@@ -71,8 +71,10 @@
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(glesv2)
+%if %{with wayland}
 BuildRequires:  pkgconfig(egl)
-%if ! %{with wayland}
+%else
+BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xcomposite)
@@ -111,11 +113,14 @@
 Requires: qt5-plugin-imageformat-gif
 Requires: qt5-plugin-imageformat-ico
 Requires: qt5-plugin-imageformat-jpeg
+%ifnarch %arm armv7l
 Requires: qt5-plugin-platform-eglfs
+Requires: qt5-plugin-platform-minimalegl
+%endif
 Requires: qt5-plugin-platforminputcontext-ibus
 Requires: qt5-plugin-platform-linuxfb
 Requires: qt5-plugin-platform-minimal
-Requires: qt5-plugin-platform-minimalegl
+
 Requires: qt5-plugin-platform-offscreen
 Requires: qt5-plugin-printsupport-cups
 Requires: qt5-plugin-sqldriver-sqlite
@@ -243,6 +248,7 @@
 %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
@@ -258,6 +264,7 @@
 
 %description plugin-platform-minimalegl
 This package contains the minimalegl platform plugin
+%endif
 
 %package plugin-platform-linuxfb
 Summary:    Linux framebuffer platform plugin
@@ -404,7 +411,11 @@
 Group:      Base/Libraries
 Requires:   %{name}-qtopengl = %{version}-%{release}
 Requires:   pkgconfig(glesv2)
+%if %{with wayland}
 Requires:   pkgconfig(egl)
+%else
+Requires:   pkgconfig(gl)
+%endif
 
 
 %description qtopengl-devel
@@ -613,7 +624,6 @@
 %endif
     -verbose \
     -no-gtkstyle \
-    -opengl es2 \
     -no-openvg \
     -nomake tests \
     -nomake examples \
@@ -1001,6 +1011,7 @@
 %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
@@ -1008,6 +1019,7 @@

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list