debian/changelog | 5 - debian/patches/fix-fdo65964.diff | 27 ------- debian/patches/fix-setwindowpixmap.diff | 111 -------------------------------- debian/patches/series | 2 4 files changed, 3 insertions(+), 142 deletions(-)
New commits: commit 4cbf3ac39c25d9bcc682555f885b501f6c6a26b5 Author: Maarten Lankhorst <[email protected]> Date: Tue Jan 28 12:37:26 2014 +0100 release to trusty diff --git a/debian/changelog b/debian/changelog index 91945ae..84200c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -glamor-egl (0.6.0-0ubuntu1) UNRELEASED; urgency=low +glamor-egl (0.6.0-0ubuntu1) trusty; urgency=low * Merge fixes from the debian branch. * Rename xserver-xorg-glamoregl to xserver-xorg-video-glamoregl. @@ -8,7 +8,7 @@ glamor-egl (0.6.0-0ubuntu1) UNRELEASED; urgency=low * New upstream release. * Remove upstreamed patches. - -- Maarten Lankhorst <[email protected]> Tue, 28 Jan 2014 11:41:47 +0100 + -- Maarten Lankhorst <[email protected]> Tue, 28 Jan 2014 12:37:10 +0100 glamor-egl (0.5.1-0ubuntu7) trusty; urgency=low commit a013813bad1128b6c3f7eb91a3c2abd75b2953d4 Author: Maarten Lankhorst <[email protected]> Date: Tue Jan 28 12:35:21 2014 +0100 Remove upstreamed patches. diff --git a/debian/changelog b/debian/changelog index fcf5bc8..91945ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ glamor-egl (0.6.0-0ubuntu1) UNRELEASED; urgency=low - Add conflicts/replaces. * Make xserver-xorg-video-glamoregl depend on the correct libglamor0 version. * New upstream release. + * Remove upstreamed patches. -- Maarten Lankhorst <[email protected]> Tue, 28 Jan 2014 11:41:47 +0100 diff --git a/debian/patches/fix-fdo65964.diff b/debian/patches/fix-fdo65964.diff deleted file mode 100644 index 1baba53..0000000 --- a/debian/patches/fix-fdo65964.diff +++ /dev/null @@ -1,27 +0,0 @@ -commit 29c0907d413ad5be2af3480d008018cd7f5a9e85 -Author: Michel Dänzer <[email protected]> -Date: Tue Sep 17 13:25:02 2013 +0200 -Subject: Fix RegionContainsRect test for PutImage - - The return value of RegionContainsRect() is not a boolean but an enum - indicating that the region contains the rectangle completely, partially - or not at all. We can only take the PutImage fastpath when the region - contatins the rectangle completely. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65964 - Signed-off-by: Michel Dänzer <[email protected]> - Reviewed-by: Zhigang Gong <[email protected]> - -diff --git a/src/glamor_putimage.c b/src/glamor_putimage.c -index 34e86a1..6567f14 100644 ---- a/src/glamor_putimage.c -+++ b/src/glamor_putimage.c -@@ -287,7 +287,7 @@ _glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y, - box.x2 = x + w + drawable->x; - box.y2 = y + h + drawable->y; - -- if ((clip != NULL && !RegionContainsRect(clip, &box)) -+ if ((clip != NULL && RegionContainsRect(clip, &box) != rgnIN) - || gc->alu != GXcopy) { - temp_pixmap = glamor_create_pixmap(drawable->pScreen, w, h, depth, 0); - if (temp_pixmap == NULL) diff --git a/debian/patches/fix-setwindowpixmap.diff b/debian/patches/fix-setwindowpixmap.diff deleted file mode 100644 index 2d91f33..0000000 --- a/debian/patches/fix-setwindowpixmap.diff +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/src/glamor.c b/src/glamor.c -index 7637f3b..e8e68be 100644 ---- a/src/glamor.c -+++ b/src/glamor.c -@@ -413,6 +413,9 @@ glamor_init(ScreenPtr screen, unsigned int flags) - glamor_priv->saved_procs.create_picture = ps->CreatePicture; - ps->CreatePicture = glamor_create_picture; - -+ glamor_priv->saved_procs.set_window_pixmap = screen->SetWindowPixmap; -+ screen->SetWindowPixmap = glamor_set_window_pixmap; -+ - glamor_priv->saved_procs.destroy_picture = ps->DestroyPicture; - ps->DestroyPicture = glamor_destroy_picture; - glamor_init_composite_shaders(screen); -@@ -531,6 +534,7 @@ glamor_close_screen(CLOSE_SCREEN_ARGS_DECL) - ps->CompositeRects = glamor_priv->saved_procs.composite_rects; - ps->Glyphs = glamor_priv->saved_procs.glyphs; - ps->UnrealizeGlyph = glamor_priv->saved_procs.unrealize_glyph; -+ screen->SetWindowPixmap = glamor_priv->saved_procs.set_window_pixmap; - #endif - screen_pixmap = screen->GetScreenPixmap(screen); - glamor_set_pixmap_private(screen_pixmap, NULL); -diff --git a/src/glamor_compositerects.c b/src/glamor_compositerects.c -index f1564a2..1a57699 100644 ---- a/src/glamor_compositerects.c -+++ b/src/glamor_compositerects.c -@@ -215,8 +215,8 @@ glamor_composite_rectangles(CARD8 op, - if (dst->pCompositeClip->data && - (!pixman_region_intersect(®ion, ®ion, dst->pCompositeClip) || - region_is_empty(®ion))) { -- DEBUGF(("%s: zero-intersection between rectangles and clip\n", -- __FUNCTION__)); -+ DEBUGF("%s: zero-intersection between rectangles and clip\n", -+ __FUNCTION__); - pixman_region_fini(®ion); - return; - } -diff --git a/src/glamor_fbo.c b/src/glamor_fbo.c -index a46a740..4838a27 100644 ---- a/src/glamor_fbo.c -+++ b/src/glamor_fbo.c -@@ -212,7 +212,7 @@ glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo) - break; - } - -- FatalError("destination is framebuffer incomplete: %s [%#x]\n", -+ FatalError("destination is framebuffer incomplete: %s [%x]\n", - str, status); - } - glamor_put_dispatch(fbo->glamor_priv); -diff --git a/src/glamor_priv.h b/src/glamor_priv.h -index ffdd7fd..b6a1075 100644 ---- a/src/glamor_priv.h -+++ b/src/glamor_priv.h -@@ -221,6 +221,7 @@ struct glamor_saved_procs { - CreatePictureProcPtr create_picture; - DestroyPictureProcPtr destroy_picture; - UnrealizeGlyphProcPtr unrealize_glyph; -+ SetWindowPixmapProcPtr set_window_pixmap; - }; - - #ifdef GLAMOR_GLES2 -@@ -934,6 +935,8 @@ void glamor_destroy_upload_pixmap(PixmapPtr pixmap); - - int glamor_create_picture(PicturePtr picture); - -+void glamor_set_window_pixmap(WindowPtr pWindow, PixmapPtr pPixmap); -+ - Bool - glamor_prepare_access_picture(PicturePtr picture, glamor_access_t access); - -diff --git a/src/glamor_window.c b/src/glamor_window.c -index 3da11e4..b67c728 100644 ---- a/src/glamor_window.c -+++ b/src/glamor_window.c -@@ -69,3 +69,35 @@ glamor_change_window_attributes(WindowPtr pWin, unsigned long mask) - } - return TRUE; - } -+ -+void -+glamor_set_window_pixmap(WindowPtr win, PixmapPtr pPixmap) -+{ -+ ScreenPtr screen = win->drawable.pScreen; -+ glamor_screen_private *glamor_priv = -+ glamor_get_screen_private(screen); -+ PixmapPtr old = screen->GetWindowPixmap(win); -+ -+ if (pPixmap != old) { -+ glamor_pixmap_private *pixmap_priv; -+ PicturePtr pic = NULL; -+ -+ pixmap_priv = glamor_get_pixmap_private(old); -+ if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) && pixmap_priv->base.picture->pDrawable == (DrawablePtr)win) { -+ pic = pixmap_priv->base.picture; -+ pixmap_priv->base.is_picture = 0; -+ pixmap_priv->base.picture = NULL; -+ } -+ -+ pixmap_priv = glamor_get_pixmap_private(pPixmap); -+ if (pixmap_priv) { -+ pixmap_priv->base.is_picture = !!pic; -+ pixmap_priv->base.picture = pic; -+ } -+ } -+ -+ screen->SetWindowPixmap = glamor_priv->saved_procs.set_window_pixmap; -+ (screen->SetWindowPixmap)(win, pPixmap); -+ glamor_priv->saved_procs.set_window_pixmap = screen->SetWindowPixmap; -+ screen->SetWindowPixmap = glamor_set_window_pixmap; -+} diff --git a/debian/patches/series b/debian/patches/series index fb2d6e7..2a1afc2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -fix-fdo65964.diff glapi-link.patch -fix-setwindowpixmap.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
