Accepting request 1043626 from home:dirkmueller:Factory

- update to 1.2.6:
  * Remove miInitializeBackingStore
    Stop using deprecated xf86PciInfo.h
    Fix spelling/wording issues
    Build xz tarballs instead of bzip2
    Update configure.ac bug URL for gitlab migration
    autogen: add default patch prefix
    autogen.sh: use quoted string variables
    autogen.sh: use exec instead of waiting for configure to finish
    autogen.sh: Honor NOCONFIGURE=1
    configure: Drop AM_MAINTAINER_MODE
    don't use PCITAG in struct anymore
- drop U_don-t-use-PCITAG-in-struct-anymore.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/1043626
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-voodoo?expand=0&rev=13
This commit is contained in:
Stefan Dirsch 2022-12-31 12:50:04 +00:00 committed by Git OBS Bridge
parent a45e42bce3
commit 1bf7c6c136
7 changed files with 93 additions and 44 deletions

View File

@ -1,26 +0,0 @@
From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
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 */
--
1.8.4.5

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
size 305489

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:622973f03ac0bd0c854794ebeac268f15f4f831ec0dbe36e6cfa2b65042af602
size 276472

Binary file not shown.

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sun Dec 18 15:32:28 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 1.2.6:
* Remove miInitializeBackingStore
Stop using deprecated xf86PciInfo.h
Fix spelling/wording issues
Build xz tarballs instead of bzip2
Update configure.ac bug URL for gitlab migration
autogen: add default patch prefix
autogen.sh: use quoted string variables
autogen.sh: use exec instead of waiting for configure to finish
autogen.sh: Honor NOCONFIGURE=1
configure: Drop AM_MAINTAINER_MODE
don't use PCITAG in struct anymore
- drop U_don-t-use-PCITAG-in-struct-anymore.patch (upstream)
-------------------------------------------------------------------
Fri Feb 6 15:03:35 UTC 2015 - sndirsch@suse.com

59
xf86-video-voodoo.keyring Normal file
View File

@ -0,0 +1,59 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQuQWxhbiBDb29w
ZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohrBBMRCgArAhsD
BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCWtvjmAUJHaXqrgAKCRCi+54I
Hy0TDmAsAJ4ubyCVncwKtAGVIx9whDq7f6SxZgCfXAVWUqRR20c98J39lLTtcopZ
Dfi0KEFsYW4gQ29vcGVyc21pdGggPGFsYW5jQGZyZWVkZXNrdG9wLm9yZz6IaAQT
EQoAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlrb454FCR2l6q4ACgkQ
ovueCB8tEw6whACdFj9U5SQuhv0e8BQvI4orGPzUMSkAoImqdVB7sU7Z++djBrj3
uJc4m0F6tCtBbGFuIENvb3BlcnNtaXRoIDxhbGFuLmNvb3BlcnNtaXRoQHN1bi5j
b20+iGYEExEKACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCWtvjngUJHaXq
rgAKCRCi+54IHy0TDhtDAJ95lL7Flj8EzdWqYogu7V9W5Xmd4gCgi0vN3iglPVNH
2gHOcTpdNyl0wcy5Ag0EUXnVIQEQAKHpjOmY056n0tsZoW9q5egsMcl5tKC8uimr
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
=zQQb
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package xf86-video-voodoo
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,20 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xf86-video-voodoo
Version: 1.2.5
Version: 1.2.6
Release: 0
Summary: Voodoo video driver for the Xorg X server
License: MIT
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_don-t-use-PCITAG-in-struct-anymore.patch
BuildRequires: pkg-config
URL: https://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz
Source1: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz.sig
Source2: xf86-video-voodoo.keyring
BuildRequires: pkgconfig
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
BuildRequires: pkgconfig(randrproto)
@ -38,9 +39,8 @@ BuildRequires: pkgconfig(xproto)
Supplements: modalias(xorg-x11-server:pci:v0000121Ad*sv*sd*bc03sc*i*)
# This was part of the xorg-x11-driver-video package up to version 7.6
Conflicts: xorg-x11-driver-video <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x
%x11_abi_videodrv_req
%{?x11_abi_videodrv_req}
%description
voodoo is an Xorg driver for Voodoo 1 and Voodoo 2 series video cards.
@ -78,21 +78,20 @@ supported.
%prep
%setup -q
%patch0 -p1
%build
%configure
make %{?_smp_mflags}
%make_build
%install
%make_install
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
find %{buildroot} -type f -name "*.la" -delete -print
%files
%defattr(-,root,root)
%doc ChangeLog COPYING README
%license COPYING
%doc ChangeLog README
%dir %{_libdir}/xorg/modules/drivers
%{_libdir}/xorg/modules/drivers/voodoo_drv.so
%{_datadir}/man/man4/voodoo.4%{?ext_man}
%{_mandir}/man4/voodoo.4%{?ext_man}
%changelog