[packages/xorg-driver-video-sis] - updated to 0.10.9 - removed obsolete xserver-1.19 patch

qboosh qboosh at pld-linux.org
Fri Jan 20 18:32:04 CET 2017


commit 6c5805e40f1da1d42fddb0923426201b76ab9dd6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jan 20 18:33:27 2017 +0100

    - updated to 0.10.9
    - removed obsolete xserver-1.19 patch

 xorg-driver-video-sis.spec | 16 ++++++++--------
 xserver-1.19.patch         | 16 ----------------
 2 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/xorg-driver-video-sis.spec b/xorg-driver-video-sis.spec
index 62382dd..30403ca 100644
--- a/xorg-driver-video-sis.spec
+++ b/xorg-driver-video-sis.spec
@@ -1,15 +1,14 @@
 Summary:	X.org video driver for SiS and XGI video chips
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla układów graficznych SiS i XGI
 Name:		xorg-driver-video-sis
-Version:	0.10.8
-Release:	5
+Version:	0.10.9
+Release:	1
 License:	MIT
 Group:		X11/Applications
-Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-%{version}.tar.bz2
-# Source0-md5:	c173c4ce572eb19db5dfdc8a858c6c67
+Source0:	https://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-%{version}.tar.bz2
+# Source0-md5:	1d0f425b84988edf8d144803860c9bde
 Patch0:		%{name}-x32.patch
-Patch1:		xserver-1.19.patch
-URL:		http://xorg.freedesktop.org/
+URL:		https://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -20,6 +19,7 @@ BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	rpmbuild(macros) >= 1.389
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.12.901
 BuildRequires:	xorg-proto-fontsproto-devel
+BuildRequires:	xorg-proto-glproto-devel
 BuildRequires:	xorg-proto-randrproto-devel
 BuildRequires:	xorg-proto-renderproto-devel
 BuildRequires:	xorg-proto-videoproto-devel
@@ -27,6 +27,7 @@ BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
 BuildRequires:	xorg-proto-xf86dgaproto-devel >= 2.1
 BuildRequires:	xorg-proto-xf86driproto-devel
 BuildRequires:	xorg-proto-xineramaproto-devel
+BuildRequires:	xorg-proto-xproto-devel
 BuildRequires:	xorg-util-util-macros >= 1.8
 BuildRequires:	xorg-xserver-server-devel >= 1.0.99.901
 %{?requires_xorg_xserver_videodrv}
@@ -60,11 +61,10 @@ XGI Volari Z7 (zwanych serią 315/330/340).
 %prep
 %setup -q -n xf86-video-sis-%{version}
 %patch0 -p1
-%patch1 -p1
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=18304
 # (not used anyway when xserver uses libpciaccess)
-sed -i -e 's|#define.*SIS_USE_BIOS_SCRATCH.*|#undef SIS_USE_BIOS_SCRATCH|g' src/sis.h
+%{__sed} -i -e 's|#define.*SIS_USE_BIOS_SCRATCH.*|#undef SIS_USE_BIOS_SCRATCH|g' src/sis.h
 
 %build
 %{__libtoolize}
diff --git a/xserver-1.19.patch b/xserver-1.19.patch
deleted file mode 100644
index a73ba2d..0000000
--- a/xserver-1.19.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- xf86-video-chips-1.2.6/src/compat-api.h~	2015-09-26 18:28:01.000000000 +0200
-+++ xf86-video-chips-1.2.6/src/compat-api.h	2016-11-28 09:12:37.337570460 +0100
-@@ -75,8 +75,13 @@
- 
- #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
- 
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
-+#define BLOCKHANDLER_ARGS arg, pTimeout
-+#else
- #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+#endif
- 
- #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
- #define CLOSE_SCREEN_ARGS pScreen
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-sis.git/commitdiff/6c5805e40f1da1d42fddb0923426201b76ab9dd6



More information about the pld-cvs-commit mailing list