From 235fdd712bb379aba0847ce5cd9e92557d516834 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:39:39 +0100 Subject: [PATCH] update to 1.2.6 [release 1.2.6-1mamba;Sun Feb 26 2023] --- README.md | 2 + xf86-video-voodoo.spec | 90 +++++++++++++++++++++ xorg-drv-video-voodoo-1.2.5-no-PCITAG.patch | 26 ++++++ 3 files changed, 118 insertions(+) create mode 100644 xf86-video-voodoo.spec create mode 100644 xorg-drv-video-voodoo-1.2.5-no-PCITAG.patch diff --git a/README.md b/README.md index 7860e32..9be44e3 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # xf86-video-voodoo +Voodoo video driver for X.Org. + diff --git a/xf86-video-voodoo.spec b/xf86-video-voodoo.spec new file mode 100644 index 0000000..84a812f --- /dev/null +++ b/xf86-video-voodoo.spec @@ -0,0 +1,90 @@ +%define xorg_ver %(pkg-config xorg-server --modversion|cut -d. -f 1-2) +Name: xf86-video-voodoo +Version: 1.2.6 +Release: 1mamba +Summary: Voodoo video driver for X.Org +Group: System/X11 +Vendor: openmamba +Distribution: openmamba +Packager: Silvan Calarco +URL: https://www.x.org/wiki/ +Source: ftp://x.org/pub/individual/driver/xf86-video-voodoo-%{version}.tar.xz +Patch0: xorg-drv-video-voodoo-1.2.5-no-PCITAG.patch +License: MIT +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +## AUTOBUILDREQ-END +BuildRequires: xorg-server-devel >= 21.1.3-1mamba +BuildRequires: libXrender >= 0.9.1 +BuildRequires: libXrandr >= 1.1.1 +BuildRequires: libXv >= 1.0.1 +BuildRequires: libXinerama-devel >= 1.0.1 +BuildRequires: libpthread-stubs-devel +Requires: xorg-server >= %{xorg_ver} +Requires: xorg-server <= %{xorg_ver}.255 +Provides: xorg-drv-video-voodoo +Obsoletes: xorg-drv-video-voodoo < 1.2.6 + +%description +Voodoo video driver for X.Org. + +%debug_package + +%prep +%setup -q +#%patch0 -p1 + +%build +%configure +%make + +%install +%makeinstall + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%files +%defattr(-,root,root) +%{_libdir}/xorg/modules/drivers/voodoo_drv.so +%{_mandir}/man4/voodoo.4* + +%changelog +* Sun Feb 26 2023 Silvan Calarco 1.2.6-1mamba +- update to 1.2.6 + +* Sat Feb 19 2022 Automatic Build System 1.2.5-8mamba +- rebuilt by autoport with build requirements: xorg-server-devel>=21.1.3-1mamba + +* Sun Mar 03 2019 Silvan Calarco 1.2.5-7mamba +- rebuilt with xorg-server 1.20.4 + +* Thu Dec 07 2017 Automatic Build System 1.2.5-6mamba +- rebuild with xorg-server 1.19.5 + +* Sun Sep 13 2015 Silvan Calarco 1.2.5-5mamba +- X.org 1.17.2 rebuild + +* Sat Jun 14 2014 Automatic Build System 1.2.5-4mamba +- X.org 1.15 rebuild + +* Tue Mar 05 2013 Silvan Calarco 1.2.5-3mamba +- xorg-server 1.12 mass rebuild + +* Thu Dec 06 2012 Silvan Calarco 1.2.5-2mamba +- mass rebuild: xorg-server 1.10 backport from devel-xorg + +* Tue Aug 14 2012 Automatic Build System 1.2.5-1mamba +- automatic version update by autodist + +* Thu Jun 07 2012 Silvan Calarco 1.2.4-4mamba +- automatic update by autodist + +* Fri Feb 17 2012 Silvan Calarco 1.2.4-3mamba +- automatic update by autodist + +* Fri Aug 12 2011 Silvan Calarco 1.2.4-2mamba +- automatic port from devel + +* Sat Sep 11 2010 Silvan Calarco 1.2.4-1mamba +- first build as individual package diff --git a/xorg-drv-video-voodoo-1.2.5-no-PCITAG.patch b/xorg-drv-video-voodoo-1.2.5-no-PCITAG.patch new file mode 100644 index 0000000..31e7079 --- /dev/null +++ b/xorg-drv-video-voodoo-1.2.5-no-PCITAG.patch @@ -0,0 +1,26 @@ +From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 22 Sep 2014 10:56:02 +1000 +Subject: [PATCH] don't use PCITAG in struct anymore + +--- + src/voodoo.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/voodoo.h b/src/voodoo.h +index bfed497..c3eb64e 100644 +--- a/src/voodoo.h ++++ b/src/voodoo.h +@@ -23,7 +23,9 @@ typedef struct { + + Bool Voodoo2; /* Set if Voodoo2 */ + pciVideoPtr PciInfo; /* PCI data */ ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + CARD32 PhysBase; + + CARD32 Width; /* Current width */ +-- +2.4.6 +