Hello community, here is the log from the commit of package xf86-video-mach64 for openSUSE:Factory checked in at 2014-02-28 07:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mach64 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mach64.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mach64" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mach64/xf86-video-mach64.changes 2013-08-23 11:09:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mach64.new/xf86-video-mach64.changes 2014-02-28 07:25:44.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 24 19:34:32 UTC 2014 - [email protected] + +- U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch + * Deal with pPict->pDrawable == NULL for source-only pictures. + Falling back to software rendering for such source pictures + (solid/gradient). (bnc#865607) + +------------------------------------------------------------------- New: ---- U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mach64.spec ++++++ --- /var/tmp/diff_new_pack.rqmfTL/_old 2014-02-28 07:25:45.000000000 +0100 +++ /var/tmp/diff_new_pack.rqmfTL/_new 2014-02-28 07:25:45.000000000 +0100 @@ -24,6 +24,8 @@ Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch bnc#865607 -- fixes crash in mach64 driver +Patch: U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -49,6 +51,7 @@ %prep %setup -q +%patch -p1 %build %configure ++++++ U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch ++++++ >From 2c83b465b336a012f2d2716940bf483358388000 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb <[email protected]> Date: Mon, 03 Jun 2013 17:01:23 +0000 Subject: Deal with pPict->pDrawable == NULL for source-only pictures. Falling back to software rendering for such source pictures (solid/gradient). Signed-off-by: Matthieu Herrb <[email protected]> Reviewed-by: Alex Deucher <[email protected]> --- diff --git a/src/atimach64render.c b/src/atimach64render.c index ffde2cb..8d259fa 100644 --- a/src/atimach64render.c +++ b/src/atimach64render.c @@ -339,10 +339,13 @@ Mach64GetOrder(int val, int *shift) static Bool Mach64CheckTexture(PicturePtr pPict) { - int w = pPict->pDrawable->width; - int h = pPict->pDrawable->height; + int h,w; int l2w, l2h, level, i; + if (pPict->pDrawable == NULL) + return FALSE; + w = pPict->pDrawable->width; + h = pPict->pDrawable->height; for (i = 0; i < MACH64_NR_TEX_FORMATS; i++) { if (Mach64TexFormats[i].pictFormat == pPict->format) break; -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
