rebuil with xorg-xserver-server 21.1.0

[packages/xorg-driver-video-sis.git] / xorg-driver-video-sis.spec

diff --git a/xorg-driver-video-sis.spec b/xorg-driver-video-sis.spec
index 59bc47e7a920487b41da179fd13f30fe1e6e07ae..17774fcdc9de8a87e39342480f6a1085356ed926 100644 (file)
--- a/xorg-driver-video-sis.spec
+++ b/xorg-driver-video-sis.spec
@@ -1,33 +1,41 @@
 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.9.3
+Version:       0.12.0
 Release:       2
 License:       MIT
 Group:         X11/Applications
-Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-%{version}.tar.bz2
-# Source0-md5: e35d817fa4ee7beb6cd5aa744b9c0783
-URL:           http://xorg.freedesktop.org/
+Source0:       https://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-%{version}.tar.bz2
+# Source0-md5: b8ec9c21758043b1480f11baec296f5d
+Patch0:                %{name}-x32.patch
+URL:           https://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
-BuildRequires: autoconf >= 2.57
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
+BuildRequires: cpp
 BuildRequires: libdrm-devel >= 2.0
 BuildRequires: libtool
 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
-BuildRequires: xorg-proto-xextproto-devel
-BuildRequires: xorg-proto-xf86dgaproto-devel
+BuildRequires: xorg-proto-xextproto-devel >= 7.0.99.1
+BuildRequires: xorg-proto-xf86dgaproto-devel >= 2.1
 BuildRequires: xorg-proto-xf86driproto-devel
-BuildRequires: xorg-proto-xf86miscproto-devel
 BuildRequires: xorg-proto-xineramaproto-devel
-BuildRequires: xorg-util-util-macros >= 0.99.2
+BuildRequires: xorg-proto-xproto-devel
+BuildRequires: xorg-util-util-macros >= 1.8
 BuildRequires: xorg-xserver-server-devel >= 1.0.99.901
-BuildRequires:  rpmbuild(macros) >= 1.389
-%requires_xorg_xserver_videodrv
+%{?requires_xorg_xserver_videodrv}
+Requires:      xorg-lib-libpciaccess >= 0.12.901
+Requires:      xorg-xserver-libdri >= 1.0.99.901
+Requires:      xorg-xserver-libglx >= 1.0.99.901
 Requires:      xorg-xserver-server >= 1.0.99.901
+Provides:      xorg-driver-video
 Obsoletes:     X11-driver-sis < 1:7.0.0
 Obsoletes:     XFree86-SiS
 Obsoletes:     XFree86-driver-sis < 1:7.0.0
@@ -52,6 +60,11 @@ XGI Volari Z7 (zwanych serią 315/330/340).
 
 %prep
 %setup -q -n xf86-video-sis-%{version}
+%patch0 -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
 
 %build
 %{__libtoolize}
@@ -59,8 +72,7 @@ XGI Volari Z7 (zwanych serią 315/330/340).
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-       --disable-static
+%configure
 
 %{__make}
 
@@ -70,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT