Hello community,
here is the log from the commit of package xf86-video-neomagic for
openSUSE:Factory checked in at 2015-02-10 20:16:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-neomagic (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-neomagic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-neomagic"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-neomagic/xf86-video-neomagic.changes
2013-08-19 10:52:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-neomagic.new/xf86-video-neomagic.changes
2015-02-10 20:16:44.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 6 11:55:07 UTC 2015 - [email protected]
+
+- U_neomagic-fix-build-against-master-X-server.patch
+ * fixes build against xorg-server 1.17
+
+-------------------------------------------------------------------
New:
----
U_neomagic-fix-build-against-master-X-server.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-neomagic.spec ++++++
--- /var/tmp/diff_new_pack.8gxjc9/_old 2015-02-10 20:16:45.000000000 +0100
+++ /var/tmp/diff_new_pack.8gxjc9/_new 2015-02-10 20:16:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-neomagic
#
-# 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
@@ -24,6 +24,7 @@
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+Patch0: U_neomagic-fix-build-against-master-X-server.patch
BuildRequires: pkg-config
BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xorg-server) >= 1.0.99.901
@@ -40,6 +41,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure
++++++ U_neomagic-fix-build-against-master-X-server.patch ++++++
>From 6661bdd4551e4e63e983685464a277845aed3012 Mon Sep 17 00:00:00 2001
From: Dave Airlie <[email protected]>
Date: Sun, 21 Sep 2014 09:51:37 +1000
Subject: [PATCH] neomagic: fix build against master X server.
Signed-off-by: Dave Airlie <[email protected]>
---
src/neo_driver.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 1b0da34..da01962 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
}
#endif
} else
+#ifdef VIDMEM_MMIO
nPtr->NeoMMIOBase =
xf86MapVidMem(pScrn->scrnIndex,
VIDMEM_MMIO, nPtr->NeoMMIOAddr,
0x200000L);
+#endif
if (nPtr->NeoMMIOBase == NULL)
return FALSE;
}
@@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
}
#endif
else
+#ifdef VIDMEM_FRAMEBUFFER
nPtr->NeoFbBase =
xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
(unsigned long)nPtr->NeoLinearAddr,
nPtr->NeoFbMapSize);
+#endif
if (nPtr->NeoFbBase == NULL)
return FALSE;
return TRUE;
--
1.8.4.5
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
