I have made the following changes intended for : CE:UX:MTF / meegotouch-compositor
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3121 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3121: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-11-18T07:40:13 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: Project:MTF:UX / meegotouch-compositor -> CE:UX:MTF / meegotouch-compositor Index: meegotouch-compositor.changes =================================================================== --- meegotouch-compositor.changes (revision 3) +++ meegotouch-compositor.changes (revision 3) @@ -1,3 +1,11 @@ +* Thu Nov 17 2011 w00t <[email protected]> - 1.1.26 +- Bump version to upstream 1.1.26-2 + +* Wed Nov 16 2011 w00t <[email protected]> - 1.1.20 +- Patch out EGL_KHR_gl_texture_2D_image. + Mesa doesn't actually support this extension, despite (erroneously) reporting + support for it in the past, and switching this check off doesn't do any harm. + * Thu Nov 10 2011 w00t <[email protected]> - 1.1.20 - patch to fix use with mcompositor gestures plugin Index: meegotouch-compositor.spec =================================================================== --- meegotouch-compositor.spec (revision 3) +++ meegotouch-compositor.spec (revision 3) @@ -7,12 +7,12 @@ Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager -Version: 1.1.20 +Version: 1.1.26 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-compositor -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}-2.tar.gz Source1: mdecorator.desktop Source100: meegotouch-compositor.yaml Patch0: BMC_14207_double_xterm_thumbnail.patch @@ -24,6 +24,7 @@ Patch6: BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch Patch7: BMC_22845_move-var-run-to-home.patch Patch8: fix_animations_for_gestures_plugin.patch +Patch9: fix_tfp_on_lenovo.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtDBus) @@ -77,7 +78,7 @@ %prep -%setup -q -n ./%{name}-%{version} +%setup -q -n %{name}-%{version}-2 # BMC_14207_double_xterm_thumbnail.patch %patch0 -p1 @@ -97,6 +98,8 @@ %patch7 -p1 # fix_animations_for_gestures_plugin.patch %patch8 -p1 +# fix_tfp_on_lenovo.patch +%patch9 -p1 # >> setup # << setup Index: meegotouch-compositor.yaml =================================================================== --- meegotouch-compositor.yaml (revision 3) +++ meegotouch-compositor.yaml (revision 3) @@ -1,12 +1,12 @@ Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager -Version: 1.1.20 +Version: 1.1.26 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-compositor Sources: - - "%{name}-%{version}.tar.bz2" + - "%{name}-%{version}-2.tar.gz" ExtraSources: - mdecorator.desktop;%{_sysconfdir}/xdg/autostart Patches: @@ -19,6 +19,7 @@ - BMC_18554_xTerm_is_improperly_redrawn_after_maximization.patch - BMC_22845_move-var-run-to-home.patch - fix_animations_for_gestures_plugin.patch + - fix_tfp_on_lenovo.patch Description: | This package contains the Direct UI compositing window manager. PkgConfigBR: Index: fix_tfp_on_lenovo.patch =================================================================== --- fix_tfp_on_lenovo.patch (added) +++ fix_tfp_on_lenovo.patch (revision 3) @@ -0,0 +1,29 @@ +From 2cd47abfe20946d084fc9b2d6e64504f2edcd195 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Wed, 16 Nov 2011 22:35:44 +0100 +Subject: [PATCH] fix tfp on lenovo, as this extension isn't available under + mesa + +--- + src/mtexturefrompixmap_egl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mtexturefrompixmap_egl.cpp b/src/mtexturefrompixmap_egl.cpp +index da982af..e0dbd9e 100644 +--- a/src/mtexturefrompixmap_egl.cpp ++++ b/src/mtexturefrompixmap_egl.cpp +@@ -40,9 +40,9 @@ public: + dpy = eglGetDisplay(EGLNativeDisplayType(QX11Info::display())); + + QString exts = QLatin1String(eglQueryString(dpy, EGL_EXTENSIONS)); +- if ((exts.contains("EGL_KHR_image") && ++ if ((exts.contains("EGL_KHR_image")/* && + exts.contains("EGL_KHR_image_pixmap") && +- exts.contains("EGL_KHR_gl_texture_2D_image"))) { ++ exts.contains("EGL_KHR_gl_texture_2D_image")*/)) { + has_tfp = true; + eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC) eglGetProcAddress("eglCreateImageKHR"); + eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC) eglGetProcAddress("eglDestroyImageKHR"); +-- +1.7.5.4 + Index: meegotouch-compositor-1.1.26-2.tar.gz =================================================================== Binary files meegotouch-compositor-1.1.26-2.tar.gz (revision 3) added Index: meegotouch-compositor-1.1.20.tar.bz2 =================================================================== Binary files meegotouch-compositor-1.1.20.tar.bz2 (revision 3) deleted
