[packages/xorg-driver-video-xgi] - fix building with gcc 10+, rel 7

baggins baggins at pld-linux.org
Thu Nov 4 00:08:25 CET 2021


commit 7815132812e5edf29662f1d846d884dcaf561929
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Nov 4 00:08:06 2021 +0100

    - fix building with gcc 10+, rel 7

 gcc10.patch                | 16 ++++++++++++++++
 xorg-driver-video-xgi.spec |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-xgi.spec b/xorg-driver-video-xgi.spec
index 9992185..149a0ac 100644
--- a/xorg-driver-video-xgi.spec
+++ b/xorg-driver-video-xgi.spec
@@ -2,13 +2,14 @@ Summary:	X.org video drivers for XGI adapters
 Summary(pl.UTF-8):	Sterowniki obrazu X.org do kart graficznych XGI
 Name:		xorg-driver-video-xgi
 Version:	1.6.1
-Release:	6
+Release:	7
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-%{version}.tar.bz2
 # Source0-md5:	103a17936676318b4b09af94dbc420a9
 Patch0:		%{name}-build.patch
 Patch1:		xserver-1.19.patch
+Patch2:		gcc10.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -50,6 +51,7 @@ Sterowniki obrazu X.org do kart graficznych XGI:
 %setup -q -n xf86-video-xgi-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..b32c297
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,16 @@
+--- xf86-video-xgi-1.6.1/src/xgi_accel.h~	2015-08-18 00:57:47.000000000 +0200
++++ xf86-video-xgi-1.6.1/src/xgi_accel.h	2021-11-04 00:07:13.033520669 +0100
+@@ -119,10 +119,10 @@
+ /* Jong 09/27/2007; recover for compiler error */
+ /* typedef unsigned long ulong ; */
+ 
+-unsigned long    r_port, w_port ;
++extern unsigned long    r_port, w_port ;
+ 
+-int     G2CmdQueLen;
+-int 	Alignment ;
++extern int     G2CmdQueLen;
++extern int 	Alignment ;
+ /* int    GBCount = 0 ; */
+ 
+ extern void Volari_SetDefaultIdleWait(XGIPtr pXGI, unsigned HDisplay, 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-xgi.git/commitdiff/7815132812e5edf29662f1d846d884dcaf561929



More information about the pld-cvs-commit mailing list