frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch 

#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
    and cfb24 only need to be built on sparc
This commit is contained in:
Alan Coopersmith 2005-12-03 17:04:45 +00:00
parent 98231c6b38
commit 26f9c43056
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-12-03 Alan Coopersmith <alan.coopersmith@sun.com>
* xorg/Makefile.am:
* xorg/configure.ac:
* xorg/hw/xfree86/Makefile.am:
* hw/xfree86/dixmods/Makefile.am:
Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809>
Patch #3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908>
xf8_32wid and cfb24 only need to be built on sparc
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> 2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac: * configure.ac:

3
Makefile.am
View File

@ -11,7 +11,10 @@ endif
if CFB if CFB
CFB_DIR=cfb CFB_DIR=cfb
CFB16_DIR=cfb16 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 CFB24_DIR=cfb24
endif
CFB32_DIR=cfb32 CFB32_DIR=cfb32
endif endif

3
configure.ac
View File

@ -167,6 +167,7 @@ dnl hw/xfree86/os-support/bus/Makefile.am, among others.
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
DEFAULT_INT10="x86emu" DEFAULT_INT10="x86emu"
use_x86_asm="no" use_x86_asm="no"
build_xf8_32wid="no"
dnl Override defaults as needed for specific platforms: dnl Override defaults as needed for specific platforms:
@ -197,6 +198,7 @@ case $host_cpu in
esac esac
;; ;;
sparc*) sparc*)
build_xf8_32wid="yes" # used by sunffb driver
xorg_loader_sparcmuldiv="yes" xorg_loader_sparcmuldiv="yes"
SPARC64_VIDEO=yes SPARC64_VIDEO=yes
BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
@ -212,6 +214,7 @@ case $host_cpu in
;; ;;
esac esac
AM_CONDITIONAL(BUILD_XF8_32WID, [test x$build_xf8_32wid = xyes])
dnl BSD *_video.c selection dnl BSD *_video.c selection
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])

7
hw/xfree86/Makefile.am
View File

@ -4,11 +4,14 @@ endif
DOC_SUBDIR = doc 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 \ SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
xf8_32bpp xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) utils \ xf8_32bpp $(XF8_32WID_SUBDIR) loader scanpci dixmods exa \
$(DOC_SUBDIR) getconfig $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \

7
hw/xfree86/dixmods/Makefile.am
View File

@ -10,10 +10,15 @@ if XTRAP
XTRAPMOD = libxtrap.la XTRAPMOD = libxtrap.la
endif endif
# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
if BUILD_XF8_32WID
CFB24MOD = libcfb24.la
endif
module_LTLIBRARIES = libafb.la \ module_LTLIBRARIES = libafb.la \
libcfb.la \ libcfb.la \
libcfb16.la \ libcfb16.la \
libcfb24.la \ $(CFB24MOD) \
libcfb32.la \ libcfb32.la \
libfb.la \ libfb.la \
liblayer.la \ liblayer.la \