Attachment 3324 Details for Bug 4511 – Patch to make xorg-server build on alpha

[patch] Patch to make xorg-server build on alpha

xorg-server-alpha.patch (text/plain), 3.03 KB, created by Stefaan on 2005-09-19 08:55:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefaan

Created: 2005-09-19 08:55:41 UTC

Size: 3.03 KB

patch

obsolete

>diff -ur portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/configure.ac xorg-server-0.99.1-r9/work/xorg-server-0.99.1/configure.ac
>--- portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/configure.ac	2005-09-18 13:00:44 +0200
>+++ xorg-server-0.99.1-r9/work/xorg-server-0.99.1/configure.ac	2005-09-18 10:34:45 +0200
>@@ -602,6 +602,9 @@
> 		  ia64*)
> 			linux_ia64=yes
> 			;;
>+		  alpha*)
>+		  	linux_alpha=yes
>+			;;
> 		  *)
> 			;;
> 		esac
>@@ -751,6 +754,7 @@
> AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
> AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
> AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
>+AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
> AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
> AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
> AM_CONDITIONAL(MFB, [test "x$XORG" = xyes])
>diff -ur portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/bus/Makefile.am xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/bus/Makefile.am
>--- portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/bus/Makefile.am	2005-09-18 13:00:43 +0200
>+++ xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/bus/Makefile.am	2005-09-18 10:56:15 +0200
>@@ -1,7 +1,11 @@
> noinst_LTLIBRARIES = libbus.la
> sdk_HEADERS = xf86Pci.h
> 
>+if LINUX_ALPHA
>+PCI_SOURCES = axpPci.c
>+else
> PCI_SOURCES = @XORG_OS_PCI@Pci.c 
>+endif
> 
> if XORG_BUS_IX86PCI
> PCI_SOURCES += ix86Pci.c
>diff -ur portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/Makefile.am xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/Makefile.am
>--- portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/Makefile.am       1999-07-23 23:38:52 +0200
>+++ xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/Makefile.am       2005-09-19 17:44:17 +0200
>@@ -3,6 +3,11 @@
> if LINUX_IA64
> PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
> endif
>+if LINUX_ALPHA
>+PLATFORM_PCI_SUPPORT = lnx_ev56.c
>+       $(srcdir)/lnx_axp.c
>+       $(srcdir)/../shared/xf86Axp.c
>+endif
>
> liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
>                      lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \
>@@ -27,3 +32,4 @@
>        lnx.h \
>        lnx_kbd.h \
>         $(srcdir)/../shared/ia64Pci.h
>+       $(srcdir)/../shared/xf86Axp.h
>diff -ur portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/lnx_video.c xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/lnx_video.c
>--- portage/xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/lnx_video.c	2005-09-18 13:00:43 +0200
>+++ xorg-server-0.99.1-r9/work/xorg-server-0.99.1/hw/xfree86/os-support/linux/lnx_video.c	2005-09-18 09:15:49 +0200
>@@ -42,7 +42,7 @@
> #include "xf86OSpriv.h"
> #include "lnx.h"
> #ifdef __alpha__
>-#include "xf86Axp.h"
>+#include "shared/xf86Axp.h"
> #endif
> 
> #ifdef HAS_MTRR_SUPPORT

Actions: View | Splinter Review

Attachments on bug 4511: 3324

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.