Attachment 3908 Details for Bug 4809 – Proposed fix for modular tree

[patch] Proposed fix for modular tree

cfb24.patch (text/plain), 2.97 KB, created by Alan Coopersmith on 2005-11-26 10:55:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2005-11-26 10:55:51 UTC

Size: 2.97 KB

patch

obsolete

>Index: xorg/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Makefile.am,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile.am
>--- xorg/Makefile.am	1 Nov 2005 15:01:50 -0000	1.13
>+++ xorg/Makefile.am	25 Nov 2005 23:56:42 -0000
>@@ -11,7 +11,10 @@
> if CFB
> CFB_DIR=cfb
> CFB16_DIR=cfb16
>+# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
>+if BUILD_XF8_32WID
> CFB24_DIR=cfb24
>+endif
> CFB32_DIR=cfb32
> endif
> 
>Index: xorg/configure.ac
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
>retrieving revision 1.131
>diff -u -r1.131 configure.ac
>--- xorg/configure.ac	23 Nov 2005 07:14:45 -0000	1.131
>+++ xorg/configure.ac	25 Nov 2005 23:56:42 -0000
>@@ -168,6 +168,7 @@
> xorg_bus_sparc="no"
> xorg_bus_ix86pci="no"
> use_x86_asm="no"
>+build_xf8_32wid="no"
> 
> dnl Override defaults as needed for specific platforms:
> 
>@@ -202,6 +203,7 @@
> 	esac
> 	;;
>   sparc*)
>+	build_xf8_32wid="yes"	# used by sunffb driver
> 	xorg_bus_sparc="yes"
> 	xorg_loader_sparcmuldiv="yes"
> 	SPARC64_VIDEO=yes
>@@ -219,6 +221,7 @@
> 	;;
> esac
> 
>+AM_CONDITIONAL(BUILD_XF8_32WID, [test x$build_xf8_32wid = xyes])
> 
> dnl BSD *_video.c selection
> AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
>Index: xorg/hw/xfree86/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/Makefile.am,v
>retrieving revision 1.31
>diff -u -r1.31 Makefile.am
>--- xorg/hw/xfree86/Makefile.am	23 Nov 2005 07:14:46 -0000	1.31
>+++ xorg/hw/xfree86/Makefile.am	25 Nov 2005 23:56:42 -0000
>@@ -4,11 +4,14 @@
> 
> DOC_SUBDIR = doc
> 
>+if BUILD_XF8_32WID
>+XF8_32WID_SUBDIR=xf8_32wid
>+endif
> 
> SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
>           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
>-	  xf8_32bpp xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) utils \
>-	  $(DOC_SUBDIR) getconfig
>+	  xf8_32bpp $(XF8_32WID_SUBDIR) loader scanpci dixmods exa \
>+	  $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
> 
> DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
>                parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
>Index: xorg/hw/xfree86/dixmods/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dixmods/Makefile.am,v
>retrieving revision 1.18
>diff -u -r1.18 Makefile.am
>--- xorg/hw/xfree86/dixmods/Makefile.am	19 Nov 2005 03:53:04 -0000	1.18
>+++ xorg/hw/xfree86/dixmods/Makefile.am	25 Nov 2005 23:56:42 -0000
>@@ -10,11 +10,15 @@
> XTRAPMOD = libxtrap.la
> endif
> 
>+if BUILD_XF8_32WID
>+CFB24MOD = libcfb24.la
>+endif
>+
> module_LTLIBRARIES = libafb.la \
>                      libbitmap.la \
>                      libcfb.la \
>                      libcfb16.la \
>-                     libcfb24.la \
>+                     $(CFB24MOD) \
>                      libcfb32.la \
>                      libdbe.la \
>                      libfb.la \

Flags:

ajax: 6.9/7.0+

Actions: View | Splinter Review

Attachments on bug 4809: 3908 | 4011

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.