Hello community, here is the log from the commit of package xf86-video-mach64 for openSUSE:Factory checked in at 2015-02-10 20:16:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-28 07:25:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-mach64.new/xf86-video-mach64.changes 2015-02-10 20:16:28.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 6 11:34:11 UTC 2015 - [email protected] + +- U_mach64-fix-build-probably-not-required-with-pci-acce.patch + * fixes build against xorg-server 1.17 + +------------------------------------------------------------------- New: ---- U_mach64-fix-build-probably-not-required-with-pci-acce.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mach64.spec ++++++ --- /var/tmp/diff_new_pack.WIRuXv/_old 2015-02-10 20:16:29.000000000 +0100 +++ /var/tmp/diff_new_pack.WIRuXv/_new 2015-02-10 20:16:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-mach64 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,8 @@ 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 +Patch0: U_Deal-with-pPict-pDrawable-NULL-for-source-only-pictures.patch +Patch1: U_mach64-fix-build-probably-not-required-with-pci-acce.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -51,7 +52,8 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build %configure ++++++ U_mach64-fix-build-probably-not-required-with-pci-acce.patch ++++++ >From 810572536e153ac9e4615a35e2ab99dc266806da Mon Sep 17 00:00:00 2001 From: Dave Airlie <[email protected]> Date: Sat, 15 Nov 2014 11:29:54 +1000 Subject: [PATCH] mach64: fix build probably not required with pci access anyways --- src/atipreinit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/atipreinit.c b/src/atipreinit.c index e3048d2..dbcd9fd 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -1079,12 +1079,14 @@ ATIPreInit } } +#ifndef XSERVER_LIBPCIACCESS if (!xf86LinearVidMem()) { xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR, "A linear aperture is not available.\n"); goto bail; } +#endif /* * Set colour weights. -- 1.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
