Control: tags -1 + patch

On 2022-02-13 08:03 +0100, Lucas Nussbaum wrote:

> Source: xserver-xorg-video-trident
> Version: 1:1.3.8-2
> Severity: serious
> Justification: FTBFS
> Tags: bookworm sid ftbfs
> User: [email protected]
> 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 -fvisibility=hidden 
>> -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/libdrm 
>> -I/usr/include/X11/dri  -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. 
>> -fstack-protector-strong -Wformat -Werror=format-security -c -o 
>> blade_accel.lo ../../src/blade_accel.c
>> libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../src -I.. -Wdate-time 
>> -D_FORTIFY_SOURCE=2 -fvisibility=hidden -I/usr/include/xorg 
>> -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/X11/dri -g -O2 
>> -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat 
>> -Werror=format-security -c ../../src/blade_accel.c  -fPIC -DPIC -o 
>> .libs/blade_accel.o
>> In file included from ../../src/blade_accel.c:38:
>> ../../src/trident.h:41:10: fatal error: xf86RamDac.h: No such file or 
>> directory
>>    41 | #include "xf86RamDac.h"
>>       |          ^~~~~~~~~~~~~~
>> compilation terminated.
>> make[3]: *** [Makefile:539: blade_accel.lo] Error 1

The reason is the removal of ramdac drivers in xserver 1.21[1].
Upstream's git repository for -trident has a patch[2] which works for me
(only build-time tested because I lack the hardware), attached for
convenience.

Cheers,
       Sven


1. 
https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb
2. 
https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/commit/07a5c4732f1c28ffcb873ee04500e3cb813c50b4

From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <[email protected]>
Date: Tue, 7 Dec 2021 22:28:04 +0100
Subject: [PATCH] Remove ramdac

ramdac drivers have been removed from xserver since version 21.0.99.1
and
https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb
resulting in the following build failure:

In file included from trident_bank.c:37:
trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory
   41 | #include "xf86RamDac.h"
      |          ^~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496

Signed-off-by: Fabrice Fontaine <[email protected]>
---
 src/trident.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/trident.h b/src/trident.h
index 5cadf52..c82de4c 100644
--- a/src/trident.h
+++ b/src/trident.h
@@ -38,7 +38,6 @@
 #include "xaa.h"
 #endif
 #include "xf86fbman.h"
-#include "xf86RamDac.h"
 #include "compiler.h"
 #include "vgaHW.h"
 #include "xf86i2c.h"
@@ -103,7 +102,6 @@ typedef struct {
     int			useEXA;
     int			Chipset;
     int			DACtype;
-    int			RamDac;
     int                 ChipRev;
     int			HwBpp;
     int			BppShift;
@@ -169,7 +167,6 @@ typedef struct {
     CARD32		BltScanDirection;
     CARD32		DrawFlag;
     CARD16		LinePattern;
-    RamDacRecPtr	RamDacRec;
     int			CursorOffset;
     xf86CursorInfoPtr	CursorInfoRec;
     xf86Int10InfoPtr	Int10;
--
2.34.1

Reply via email to