Hi, On 04/11/2014 01:39 AM, Pali Rohár wrote: > Hello, > > last version of xserver-xorg-driver-ati from git cannot be > compiled on ubuntu 12.04. Error log is here: > > https://launchpadlibrarian.net/171644383/buildlog_ubuntu-precise-amd64.xserver-xorg-video-ati_1:7.3.0-git201404022307~ubuntu12.04.1_FAILEDTOBUILD.txt.gz > > It looks like problem is with file xf86platformBus.h which is > missing. Where is located that file? Or it was added only in some > new xserver and ati driver now cannot be compiled for older > versions?
Oops, sorry about that. Can you please try the attached patch? If that fixes it I'll push it to the ati git right away. Thanks & Regards, Hans
>From b50da3b96c212086cb58501dbe988d64f1f35b6d Mon Sep 17 00:00:00 2001 From: Hans de Goede <[email protected]> Date: Fri, 11 Apr 2014 09:44:37 +0200 Subject: [PATCH xf86-video-ati] Fix building on older servers without xf86platformBus.h Signed-off-by: Hans de Goede <[email protected]> --- src/radeon_kms.c | 2 +- src/radeon_probe.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/radeon_kms.c b/src/radeon_kms.c index f7f0a0d..fb93f8a 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -593,7 +593,7 @@ static int radeon_get_drm_master_fd(ScrnInfoPtr pScrn) char *busid; int fd; -#if defined(ODEV_ATTRIB_FD) +#ifdef XF86_PDEV_SERVER_FD if (pRADEONEnt->platform_dev) { fd = xf86_get_platform_device_int_attrib(pRADEONEnt->platform_dev, ODEV_ATTRIB_FD, -1); diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 4f5e645..9500189 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -37,12 +37,16 @@ #define _RADEON_PROBE_H_ 1 #include <stdint.h> +#include "xorg-server.h" #include "xf86str.h" #include "xf86DDC.h" #include "randrstr.h" #include "xf86Crtc.h" + +#ifdef XSERVER_PLATFORM_BUS #include "xf86platformBus.h" +#endif #include "compat-api.h" #include "exa.h" @@ -137,7 +141,9 @@ typedef struct int fd_ref; unsigned long fd_wakeup_registered; /* server generation for which fd has been registered for wakeup handling */ int fd_wakeup_ref; +#ifdef XSERVER_PLATFORM_BUS struct xf86_platform_device *platform_dev; +#endif } RADEONEntRec, *RADEONEntPtr; extern const OptionInfoRec *RADEONOptionsWeak(void); -- 1.9.0
_______________________________________________ xorg-driver-ati mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-driver-ati
