Control: tags -1 + patch
On 2022-02-13 08:03 +0100, Lucas Nussbaum wrote:
> Source: xserver-xorg-video-mach64
> Version: 6.9.6-3
> Severity: serious
> Justification: FTBFS
> Tags: bookworm sid ftbfs
> User: lu...@debian.org
> Usertags: ftbfs-20220212 ftbfs-bookworm
>
> Hi,
>
> During a rebuild of all packages in sid, your package failed to build
> on amd64.
>
>
> Relevant part (hopefully):
>> /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H
>> -I. -I../../src -I.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall
>> -Wpointer-arith -Wmissing-declarations -Wformat=2
>> -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
>> -Wbad-function-cast -Wold-style-definition
>> -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow
>> -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls
>> -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self
>> -Werror=main -Werror=missing-braces -Werror=sequence-point
>> -Werror=return-type -Werror=trigraphs -Werror=array-bounds
>> -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast
>> -Werror=pointer-to-int-cast -fno-strict-aliasing -fvisibility=hidden
>> -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm
>> -I/usr/include/X11/dri -I/usr/include/libdrm -I/usr/include/X11/dri
>> -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong
>> -Wformat -Werror=format-security -c -o aticonfig.lo
>> ../../src/aticonfig.c
>> libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../../src
>> -I.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith
>> -Wmissing-declarations -Wformat=2 -Wstrict-prototypes
>> -Wmissing-prototypes -Wnested-externs -Wbad-function-cast
>> -Wold-style-definition -Wdeclaration-after-statement -Wunused
>> -Wuninitialized -Wshadow -Wmissing-noreturn
>> -Wmissing-format-attribute -Wredundant-decls -Wlogical-op
>> -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main
>> -Werror=missing-braces -Werror=sequence-point -Werror=return-type
>> -Werror=trigraphs -Werror=array-bounds -Werror=write-strings
>> -Werror=address -Werror=int-to-pointer-cast
>> -Werror=pointer-to-int-cast -fno-strict-aliasing -fvisibility=hidden
>> -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm
>> -I/usr/include/X11/dri -I/usr/include/libdrm -I/usr/include/X11/dri
>> -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong
>> -Wformat -Werror=format-security -c ../../src/aticonfig.c -fPIC
>> -DPIC -o .libs/aticonfig.o
>> ../../src/aticonfig.c: In function ‘ATIProcessOptions’:
>> ../../src/aticonfig.c:315:63: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 315 | # define Accel PublicOption[ATI_OPTION_ACCEL].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:358:5: note: in expansion of macro ‘Accel’
>> 358 | Accel = CacheMMIO = HWCursor = TRUE;
>> | ^~~~~
>> ../../src/aticonfig.c:342:68: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 342 | # define CacheMMIO
>> PublicOption[ATI_OPTION_MMIO_CACHE].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:358:13: note: in expansion of macro ‘CacheMMIO’
>> 358 | Accel = CacheMMIO = HWCursor = TRUE;
>> | ^~~~~~~~~
>> ../../src/aticonfig.c:322:66: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 322 | # define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:358:25: note: in expansion of macro ‘HWCursor’
>> 358 | Accel = CacheMMIO = HWCursor = TRUE;
>> | ^~~~~~~~
>> ../../src/aticonfig.c:345:67: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 345 | # define ShadowFB
>> PublicOption[ATI_OPTION_SHADOW_FB].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:362:5: note: in expansion of macro ‘ShadowFB’
>> 362 | ShadowFB = TRUE;
>> | ^~~~~~~~
>> ../../src/aticonfig.c:317:64: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 317 | # define Blend PrivateOption[ATI_OPTION_BLEND].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:364:5: note: in expansion of macro ‘Blend’
>> 364 | Blend = PanelDisplay = TRUE;
>> | ^~~~~
>> ../../src/aticonfig.c:344:71: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 344 | # define PanelDisplay
>> PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:364:13: note: in expansion of macro ‘PanelDisplay’
>> 364 | Blend = PanelDisplay = TRUE;
>> | ^~~~~~~~~~~~
>> ../../src/aticonfig.c:348:70: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 348 | # define RenderAccel
>> PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:367:5: note: in expansion of macro ‘RenderAccel’
>> 367 | RenderAccel = TRUE;
>> | ^~~~~~~~~~~
>> ../../src/aticonfig.c:314:70: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 314 | # define ProbeSparse
>> PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:384:31: note: in expansion of macro ‘ProbeSparse’
>> 384 | pATI->OptionProbeSparse = ProbeSparse;
>> | ^~~~~~~~~~~
>> ../../src/aticonfig.c:315:63: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 315 | # define Accel PublicOption[ATI_OPTION_ACCEL].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:385:25: note: in expansion of macro ‘Accel’
>> 385 | pATI->OptionAccel = Accel;
>> | ^~~~~
>> ../../src/aticonfig.c:316:71: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 316 | # define BIOSDisplay
>> PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:386:31: note: in expansion of macro ‘BIOSDisplay’
>> 386 | pATI->OptionBIOSDisplay = BIOSDisplay;
>> | ^~~~~~~~~~~
>> ../../src/aticonfig.c:317:64: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 317 | # define Blend PrivateOption[ATI_OPTION_BLEND].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:387:25: note: in expansion of macro ‘Blend’
>> 387 | pATI->OptionBlend = Blend;
>> | ^~~~~
>> ../../src/aticonfig.c:318:69: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 318 | # define CRTDisplay
>> PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:388:30: note: in expansion of macro ‘CRTDisplay’
>> 388 | pATI->OptionCRTDisplay = CRTDisplay;
>> | ^~~~~~~~~~
>> ../../src/aticonfig.c:320:63: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 320 | # define CSync PublicOption[ATI_OPTION_CSYNC].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:389:25: note: in expansion of macro ‘CSync’
>> 389 | pATI->OptionCSync = CSync;
>> | ^~~~~
>> ../../src/aticonfig.c:321:64: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 321 | # define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:390:25: note: in expansion of macro ‘Devel’
>> 390 | pATI->OptionDevel = Devel;
>> | ^~~~~
>> ../../src/aticonfig.c:342:68: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 342 | # define CacheMMIO
>> PublicOption[ATI_OPTION_MMIO_CACHE].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:417:29: note: in expansion of macro ‘CacheMMIO’
>> 417 | pATI->OptionMMIOCache = CacheMMIO;
>> | ^~~~~~~~~
>> ../../src/aticonfig.c:343:73: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 343 | # define TestCacheMMIO
>> PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:418:33: note: in expansion of macro ‘TestCacheMMIO’
>> 418 | pATI->OptionTestMMIOCache = TestCacheMMIO;
>> | ^~~~~~~~~~~~~
>> ../../src/aticonfig.c:345:67: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 345 | # define ShadowFB
>> PublicOption[ATI_OPTION_SHADOW_FB].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:419:28: note: in expansion of macro ‘ShadowFB’
>> 419 | pATI->OptionShadowFB = ShadowFB;
>> | ^~~~~~~~
>> ../../src/aticonfig.c:349:66: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 349 | # define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:420:27: note: in expansion of macro ‘LCDSync’
>> 420 | pATI->OptionLCDSync = LCDSync;
>> | ^~~~~~~
>> ../../src/aticonfig.c:344:71: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 344 | # define PanelDisplay
>> PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:423:10: note: in expansion of macro ‘PanelDisplay’
>> 423 | if ((PanelDisplay != CRTScreen) ||
>> | ^~~~~~~~~~~~
>> ../../src/aticonfig.c:319:69: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 319 | # define CRTScreen
>> PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:423:26: note: in expansion of macro ‘CRTScreen’
>> 423 | if ((PanelDisplay != CRTScreen) ||
>> | ^~~~~~~~~
>> ../../src/aticonfig.c:344:71: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 344 | # define PanelDisplay
>> PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:425:36: note: in expansion of macro ‘PanelDisplay’
>> 425 | pATI->OptionPanelDisplay = PanelDisplay;
>> | ^~~~~~~~~~~~
>> ../../src/aticonfig.c:319:69: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 319 | # define CRTScreen
>> PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:427:37: note: in expansion of macro ‘CRTScreen’
>> 427 | pATI->OptionPanelDisplay = !CRTScreen;
>> | ^~~~~~~~~
>> ../../src/aticonfig.c:326:62: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 326 | # define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:431:25: note: in expansion of macro ‘IsPCI’
>> 431 | pATI->OptionIsPCI = IsPCI;
>> | ^~~~~
>> ../../src/aticonfig.c:330:70: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 330 | # define LocalTex
>> PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:434:33: note: in expansion of macro ‘LocalTex’
>> 434 | pATI->OptionLocalTextures = LocalTex;
>> | ^~~~~~~~
>> ../../src/aticonfig.c:346:66: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 346 | # define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:457:9: note: in expansion of macro ‘SWCursor’
>> 457 | if (SWCursor || !HWCursor)
>> | ^~~~~~~~
>> ../../src/aticonfig.c:322:66: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 322 | # define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:457:22: note: in expansion of macro ‘HWCursor’
>> 457 | if (SWCursor || !HWCursor)
>> | ^~~~~~~~
>> ../../src/aticonfig.c:322:66: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 322 | # define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:459:13: note: in expansion of macro ‘HWCursor’
>> 459 | if (HWCursor && PublicOption[ATI_OPTION_HWCURSOR].found)
>> | ^~~~~~~~
>> ../../src/aticonfig.c:322:66: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 322 | # define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool
>> | ^~~~
>> ../../src/aticonfig.c:465:13: note: in expansion of macro ‘HWCursor’
>> 465 | if (HWCursor && PublicOption[ATI_OPTION_HWCURSOR].found)
>> | ^~~~~~~~
>> ../../src/aticonfig.c:348:70: error: ‘ValueUnion’ has no member named
>> ‘bool’; did you mean ‘boolean’?
>> 348 | # define RenderAccel
>> PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool
>> |
>> ^~~~
>> ../../src/aticonfig.c:500:30: note: in expansion of macro ‘RenderAccel’
>> 500 | if (pATI->useEXA && !RenderAccel)
>> | ^~~~~~~~~~~
>> make[3]: *** [Makefile:630: aticonfig.lo] Error 1
Attached is a patch that works for me, taken from the upstream git
repository[1]. The build dependency on xserver-xorg-dev should probably
bumped to (>= 2:21.1.1), as the patch will most likely break the build
with older versions.
At [2] there is the commit in xorg-server which broke the mach64 build.
Cheers,
Sven
1.
https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/-/commit/3ab2c144ef34199ceaf95115538a67f932e76f7d
2.
https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747
From 3ab2c144ef34199ceaf95115538a67f932e76f7d Mon Sep 17 00:00:00 2001
From: Josselin Poiret <d...@jpoiret.xyz>
Date: Thu, 18 Nov 2021 13:18:25 +0000
Subject: [PATCH 1/1] 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 bad6474..6995b9a 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.34.1
