Hello community,

here is the log from the commit of package xf86-video-mach64.2606 for 
openSUSE:12.3:Update checked in at 2014-03-07 10:18:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/xf86-video-mach64.2606 (Old)
 and      /work/SRC/openSUSE:12.3:Update/.xf86-video-mach64.2606.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-mach64.2606"

Changes:
--------
New Changes file:

--- /dev/null   2014-02-13 01:09:38.344032506 +0100
+++ 
/work/SRC/openSUSE:12.3:Update/.xf86-video-mach64.2606.new/xf86-video-mach64.changes
        2014-03-07 10:18:28.000000000 +0100
@@ -0,0 +1,45 @@
+-------------------------------------------------------------------
+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)
+
+-------------------------------------------------------------------
+Sat Dec 22 23:45:48 UTC 2012 - [email protected]
+
+- Update to version 6.9.4:
+  + Remove call to obsolete miInitializeBackingStore()
+  + Remove dummy UTS / DFS hooks. fdo#51137
+  + Mach64PixelARGB should use exaGetPixmapFirstPixel
+  + Fix build with neither XAA nor EXA against xserver 1.13.0
+  + Don't gratuitously disable Render when ShadowFBing
+  + mach64: fix build on 32-bit. tvout code only builds on 32-bit.
+- Drop U_mach64-fix-build-on-32-bit.patch, fixed upstream.
+
+-------------------------------------------------------------------
+Tue Sep 18 14:01:40 UTC 2012 - [email protected]
+
+- U_mach64-fix-build-on-32-bit.patch 
+  * fix build on 32-bit. tvout code only builds on 32-bit.
+
+-------------------------------------------------------------------
+Mon Sep 17 19:42:18 UTC 2012 - [email protected]
+
+- Update to version 6.9.3
+  * fix build against server without XAA 
+
+-------------------------------------------------------------------
+Thu Apr 19 15:23:54 UTC 2012 - [email protected]
+
+- Update to version 6.9.1:
+  + Fall back to shadowfb if XAA is unavailable
+- Use %x11_abi_videodrv_req instead of static ABI Requires.
+
+-------------------------------------------------------------------
+Wed Apr 18 15:51:24 UTC 2012 - [email protected]
+
+- Split xf86-video-mach64 from xorg-x11-driver-video.
+  Initial version: 6.9.0.
+

New:
----
  U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch
  xf86-video-mach64-6.9.4.tar.bz2
  xf86-video-mach64.changes
  xf86-video-mach64.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xf86-video-mach64.spec ++++++
#
# spec file for package xf86-video-mach64
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:           xf86-video-mach64
Version:        6.9.4
Release:        0
Summary:        ATI Mach64 series video driver for the Xorg X server
License:        MIT
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 possible 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)
BuildRequires:  pkgconfig(libdrm) >= 2.2
BuildRequires:  pkgconfig(pciaccess) >= 0.12.901
BuildRequires:  pkgconfig(randrproto)
BuildRequires:  pkgconfig(renderproto)
BuildRequires:  pkgconfig(videoproto)
BuildRequires:  pkgconfig(xextproto)
BuildRequires:  pkgconfig(xf86driproto)
BuildRequires:  pkgconfig(xorg-macros) >= 1.8
BuildRequires:  pkgconfig(xorg-server) >= 1.2
BuildRequires:  pkgconfig(xproto)
Supplements:    xorg-x11-server
# This was part of the xorg-x11-driver-video package up to version 7.6
Conflicts:      xorg-x11-driver-video <= 7.6
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
%x11_abi_videodrv_req

%description
mach64 is an Xorg driver for ATI Mach64 series video cards.

%prep
%setup -q
%patch -p1

%build
%configure
make %{?_smp_mflags}

%install
%make_install
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print

%files
%defattr(-,root,root)
%doc ChangeLog COPYING README
%dir %{_libdir}/xorg/modules/drivers
%{_libdir}/xorg/modules/drivers/mach64_drv.so

%changelog
++++++ 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]

Reply via email to