GNU bug report logs -
#51947
[PATCH core-updates-frozen 0/2] Fix xf86-video-mach64 and xf86-video-nouveau builds.
Previous Next
Reported by: Josselin Poiret <dev <at> jpoiret.xyz>
Date: Thu, 18 Nov 2021 14:05:01 UTC
Severity: normal
Tags: patch
Done: Timothy Sample <samplet <at> ngyro.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51947 in the body.
You can then email your comments to 51947 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#51947
; Package
guix-patches
.
(Thu, 18 Nov 2021 14:05:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Josselin Poiret <dev <at> jpoiret.xyz>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Thu, 18 Nov 2021 14:05:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Hello everyone,
This patchset fixes compilation for both xf86-video drivers that
wouldn't build with xorg-server 21.1 because some variables were
renamed. The first is home-made while the second is an upstream patch
that hasn't found its way to a release yet.
They both successfully build on my machine, although I can't test
either of them. Given the nature of the changes, this shouldn't be
too much of an issue.
Happy sprinting,
Josselin
Josselin Poiret (2):
gnu: xf86-video-mach64: Patch to build with xorg-server 21.1.
gnu: xf86-video-nouveau: Use upstream patch for xorg-server 21.1.
.../xf86-video-mach64-bool-to-boolean.patch | 79 +++++++++++++++++++
.../xf86-video-nouveau-fixup-ABI.patch | 64 +++++++++++++++
gnu/packages/xorg.scm | 6 +-
3 files changed, 147 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch
create mode 100644 gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch
--
2.33.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#51947
; Package
guix-patches
.
(Thu, 18 Nov 2021 14:08:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 51947 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xorg.scm (xf86-video-mach64): Use patch.
* gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch: Add
it.
---
.../xf86-video-mach64-bool-to-boolean.patch | 79 +++++++++++++++++++
gnu/packages/xorg.scm | 3 +-
2 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch
diff --git a/gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch b/gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch
new file mode 100644
index 0000000000..b85acdd401
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch
@@ -0,0 +1,79 @@
+From ff1a69144735298d1a190fa23b3ae5747e914859 Mon Sep 17 00:00:00 2001
+From: Josselin Poiret <dev <at> 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
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 391a4d33d8..2740d34deb 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3107,7 +3107,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)
--
2.33.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#51947
; Package
guix-patches
.
(Thu, 18 Nov 2021 14:08:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 51947 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xorg.scm (xf86-video-nouveau): Use patch.
* gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch: Add it.
---
.../xf86-video-nouveau-fixup-ABI.patch | 64 +++++++++++++++++++
gnu/packages/xorg.scm | 3 +-
2 files changed, 66 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch
diff --git a/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch b/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch
new file mode 100644
index 0000000000..a18e3f8ab9
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch
@@ -0,0 +1,64 @@
+From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied <at> redhat.com>
+Date: Mon, 13 Jul 2020 09:20:15 +1000
+Subject: [PATCH] nouveau: fixup driver for new X server ABI
+
+---
+ src/compat-api.h | 4 ++++
+ src/nouveau_exa.c | 2 +-
+ src/nv_driver.c | 6 +++---
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index fde2f4b..8a1fcf9 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -102,4 +102,8 @@
+
+ #endif
+
++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
++#define secondary_dst slave_dst
++#endif
++
+ #endif
+diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
+index 55df6f8..db3b112 100644
+--- a/src/nouveau_exa.c
++++ b/src/nouveau_exa.c
+@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv)
+
+ #ifdef NOUVEAU_PIXMAP_SHARING
+ static Bool
+-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p)
++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p)
+ {
+ struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+ struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index e72a6b6..f9ab4af 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
+ {
+ RegionRec pixregion;
+
+- PixmapRegionInit(&pixregion, dirty->slave_dst);
++ PixmapRegionInit(&pixregion, dirty->secondary_dst);
+
+- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
+ #ifdef HAS_DIRTYTRACKING_ROTATION
+ PixmapSyncDirtyHelper(dirty);
+ #else
+ PixmapSyncDirtyHelper(dirty, &pixregion);
+ #endif
+
+- DamageRegionProcessPending(&dirty->slave_dst->drawable);
++ DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ RegionUninit(&pixregion);
+ }
+
+--
+2.33.1
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2740d34deb..8a6e2951f9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3240,7 +3240,8 @@ (define-public xf86-video-nouveau
(uri (string-append "mirror://xorg/individual/driver/xf86-video-nouveau-"
version ".tar.bz2"))
(sha256
- (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"))))
+ (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"))
+ (patches (search-patches "xf86-video-nouveau-fixup-ABI.patch"))))
(build-system gnu-build-system)
(inputs `(("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))
--
2.33.1
Reply sent
to
Timothy Sample <samplet <at> ngyro.com>
:
You have taken responsibility.
(Thu, 18 Nov 2021 15:55:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Josselin Poiret <dev <at> jpoiret.xyz>
:
bug acknowledged by developer.
(Thu, 18 Nov 2021 15:55:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 51947-done <at> debbugs.gnu.org (full text, mbox):
Hi Josselin,
Josselin Poiret via Guix-patches via <guix-patches <at> gnu.org> writes:
> They both successfully build on my machine, although I can't test
> either of them. Given the nature of the changes, this shouldn't be
> too much of an issue.
Agreed.
> Josselin Poiret (2):
> gnu: xf86-video-mach64: Patch to build with xorg-server 21.1.
> gnu: xf86-video-nouveau: Use upstream patch for xorg-server 21.1.
Pushed as 572641103880ce87b631e00e6212787747f694aa and
674dbeb43639db31c3f3a6e69ee7203296d0b50f. I made one small change,
which is to list the patches in “gnu/local.mk” under ‘dist_patch_DATA’.
Thanks!
-- Tim
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Fri, 17 Dec 2021 12:24:12 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 92 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.