commit c12e168541b8e77a4e0d01eab8e996b7a3c8f840
Author: Jan Rękorajski <[email protected]>
Date: Wed Nov 3 16:44:05 2021 +0100
- fix building with xserver 21
- rel 3
xorg-driver-video-mach64.spec | 4 ++-
xserver-21.patch | 64 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-mach64.spec b/xorg-driver-video-mach64.spec
index 94b1ab7..f1eeaea 100644
--- a/xorg-driver-video-mach64.spec
+++ b/xorg-driver-video-mach64.spec
@@ -2,11 +2,12 @@ Summary: X.org video drivers for ATI
VGAWonder/Mach32/Mach64 adapters
Summary(pl.UTF-8): Sterowniki obrazu X.org do kart graficznych ATI
VGAWonder/Mach32/Mach64
Name: xorg-driver-video-mach64
Version: 6.9.6
-Release: 2
+Release: 3
License: MIT
Group: X11/Applications
Source0:
http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-%{version}.tar.bz2
# Source0-md5: 0e12f9a3b5659e1e27e03adc42b04d99
+Patch0: xserver-21.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -60,6 +61,7 @@ większość kart z serii:
%prep
%setup -q -n xf86-video-mach64-%{version}
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/xserver-21.patch b/xserver-21.patch
new file mode 100644
index 0000000..71a1037
--- /dev/null
+++ b/xserver-21.patch
@@ -0,0 +1,64 @@
+--- xf86-video-mach64-6.9.6/src/aticonfig.c~ 2018-05-18 18:51:41.000000000
+0200
++++ xf86-video-mach64-6.9.6/src/aticonfig.c 2021-11-03 16:43:10.058593661
+0100
+@@ -311,42 +311,42 @@
+
+ (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize);
+
+-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool
+-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool
+-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool
+-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool
+-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool
+-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool
+-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool
+-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool
+-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool
++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean
++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean
++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean
++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean
++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean
++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean
++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean
++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean
++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean
+
+ #ifdef XF86DRI_DEVEL
+
+-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool
++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean
+ # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str
+ # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num
+ # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num
+-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool
++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean
+ # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num
+
+ #endif /* XF86DRI_DEVEL */
+
+ #ifdef TV_OUT
+
+-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool
++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean
+ # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str
+
+ #endif /* TV_OUT */
+
+-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool
+-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool
+-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool
+-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool
+-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool
++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean
++# define TestCacheMMIO
PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean
++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean
++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean
++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean
+ # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str
+-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool
+-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool
++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean
++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean
+
+ # define ReferenceClock \
+ PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-mach64.git/commitdiff/c12e168541b8e77a4e0d01eab8e996b7a3c8f840
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
