gnu: xf86-video-mach64: Update to 6.9.7.
* gnu/packages/xorg.scm (xf86-video-mach64): Update to 6.9.7. [source]: Remove patches. * gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch, gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them.master
Efraim Flashner
parent
34e90ea115
commit
f3e2d1dddf
|
|
@ -1952,8 +1952,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/x265-arm-flags.patch \
|
||||
%D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.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-nouveau-fixup-ABI.patch \
|
||||
%D%/packages/patches/xf86-video-qxl-fix-build.patch \
|
||||
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Fix test compilation with exa.h in configure when using glibc 2.20.
|
||||
Inspired by a patch by Peter Hutterer <peter.hutterer@who-t.net>.
|
||||
See <https://raw.githubusercontent.com/openembedded/oe-core/master/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch>.
|
||||
|
||||
--- xf86-video-mach64-6.9.4/configure.~1~ 2012-12-20 01:16:10.000000000 -0500
|
||||
+++ xf86-video-mach64-6.9.4/configure 2014-12-19 02:48:18.040097554 -0500
|
||||
@@ -18370,7 +18370,9 @@
|
||||
|
||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
|
||||
- ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default"
|
||||
+ ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default
|
||||
+#include <xorg-server.h>
|
||||
+"
|
||||
if test "x$ac_cv_header_exa_h" = xyes; then :
|
||||
have_exa_h="yes"
|
||||
else
|
||||
|
|
@ -3014,19 +3014,17 @@ It supports a variety of Intel graphics chipsets.")
|
|||
(define-public xf86-video-mach64
|
||||
(package
|
||||
(name "xf86-video-mach64")
|
||||
(version "6.9.6")
|
||||
(version "6.9.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://xorg/individual/driver/xf86-video-mach64-"
|
||||
version
|
||||
".tar.bz2"))
|
||||
".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"))
|
||||
(patches (search-patches "xf86-video-mach64-glibc-2.20.patch"
|
||||
"xf86-video-mach64-bool-to-boolean.patch"))))
|
||||
"1fl1jjx0zdr9alkxw23zx6aj1bj4l8inz5w7y7k2g0kwzazqmmsh"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list mesa xorgproto xorg-server))
|
||||
(native-inputs
|
||||
|
|
|
|||
Reference in New Issue