ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xf86-video-mach64: Patch to build with xorg-server 21.1.

Browse source 
* gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch: New
patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-mach64): Use it.

Signed-off-by: Timothy Sample <samplet@ngyro.com>
This commit is contained in:
Josselin Poiret 2021-11-18 14:07:27 +00:00 committed by Timothy Sample
parent adebc0c9fa
commit 5726411038
No known key found for this signature in database
GPG key ID: 2AC6A5EC1C357C59
3 changed files with 82 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1885,6 +1885,7 @@ dist_patch_DATA = \
%D%/packages/patches/wpa-supplicant-CVE-2021-30004.patch \
%D%/packages/patches/x265-arm-flags.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-mach64-bool-to-boolean.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \

79
gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch Normal file
View file

@ -0,0 +1,79 @@
From ff1a69144735298d1a190fa23b3ae5747e914859 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Thu, 18 Nov 2021 13:18:25 +0000
Subject: [PATCH] Rename bool to boolean for OptionInfoRec.
* src/aticonfig.c: Change uses of .value.bool to .value.boolean
---
src/aticonfig.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/aticonfig.c b/src/aticonfig.c
index 621e79e..8ea0c6e 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -311,42 +311,42 @@ ATIProcessOptions
(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
--
2.33.1

3
gnu/packages/xorg.scm
View file

@ -3104,7 +3104,8 @@ (define-public xf86-video-mach64
(sha256
(base32
"171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"))
(patches (search-patches "xf86-video-mach64-glibc-2.20.patch"))))
(patches (search-patches "xf86-video-mach64-glibc-2.20.patch"
"xf86-video-mach64-bool-to-boolean.patch"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
("xorgproto" ,xorgproto)