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

Merge branch 'master' into my-XACE-SELINUX

This commit is contained in:
Eamon Walsh 2006-10-11 20:50:31 -04:00 committed by Eamon Walsh
parent 23f6f08b7b 042d4a407d
commit 4b53a5e4b1
10 changed files with 7434 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
GL/symlink-mesa.sh
View File

@ -62,7 +62,7 @@ symlink_mesa_glapi() {
src_dir src/mesa/glapi
dst_dir mesa/glapi
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -71,7 +71,7 @@ symlink_mesa_main() {
src_dir src/mesa/main
dst_dir mesa/main
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -80,7 +80,7 @@ symlink_mesa_math() {
src_dir src/mesa/math
dst_dir mesa/math
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -89,7 +89,7 @@ symlink_mesa_ac() {
src_dir src/mesa/array_cache
dst_dir mesa/array_cache
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -98,7 +98,7 @@ symlink_mesa_swrast() {
src_dir src/mesa/swrast
dst_dir mesa/swrast
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -107,7 +107,7 @@ symlink_mesa_ss() {
src_dir src/mesa/swrast_setup
dst_dir mesa/swrast_setup
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -116,7 +116,7 @@ symlink_mesa_tnl() {
src_dir src/mesa/tnl
dst_dir mesa/tnl
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -125,7 +125,7 @@ symlink_mesa_shader() {
src_dir src/mesa/shader
dst_dir mesa/shader
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -134,7 +134,7 @@ symlink_mesa_shader_grammar() {
src_dir src/mesa/shader/grammar
dst_dir mesa/shader/grammar
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -143,7 +143,7 @@ symlink_mesa_shader_slang() {
src_dir src/mesa/shader/slang
dst_dir mesa/shader/slang
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}
@ -152,7 +152,7 @@ symlink_mesa_shader_slang_library() {
src_dir src/mesa/shader/slang/library
dst_dir mesa/shader/slang/library
for src in $REAL_SRC_DIR/*.{c,h}; do
for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
action `basename $src`
done
}

7
configure.ac
View File

@ -583,7 +583,12 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
test -d GL || mkdir GL
$srcdir/GL/symlink-mesa.sh $MESA_SOURCE GL/
case $host_os in
solaris*)
SYMLINK_MESA="/usr/bin/bash $srcdir/GL/symlink-mesa.sh" ;;
*) SYMLINK_MESA=$srcdir/GL/symlink-mesa.sh ;;
esac
$SYMLINK_MESA $MESA_SOURCE GL/
if test $? -ne 0; then
AC_MSG_ERROR([Failed to link Mesa source tree. Please specify a proper path to Mesa sources, or disable GLX.])
fi

4
fb/Makefile.am
View File

@ -10,8 +10,10 @@ if XORG
sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h wfbrename.h
endif
libfb_la_CFLAGS = $(AM_CFLAGS)
if MMX_CAPABLE
libfb_la_CFLAGS = $(AM_CFLAGS) -DUSE_MMX
libfb_la_CFLAGS += -DUSE_MMX
libfbmmx_la_CFLAGS = \
$(DIX_CFLAGS) \

10
fb/fb.h
View File

@ -488,20 +488,20 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
* The term "lane" comes from the hardware term "byte-lane" which
*/
#define FbLaneCase1(n,a,o) ((n) == 0x01 ? \
#define FbLaneCase1(n,a,o) ((n) == 0x01 ? (void) \
WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), \
fgxor) : 0)
#define FbLaneCase2(n,a,o) ((n) == 0x03 ? \
fgxor) : (void) 0)
#define FbLaneCase2(n,a,o) ((n) == 0x03 ? (void) \
WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), \
fgxor) : \
((void)FbLaneCase1((n)&1,a,o), \
FbLaneCase1((n)>>1,a,(o)+1)))
#define FbLaneCase4(n,a,o) ((n) == 0x0f ? \
#define FbLaneCase4(n,a,o) ((n) == 0x0f ? (void) \
WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), \
fgxor) : \
((void)FbLaneCase2((n)&3,a,o), \
FbLaneCase2((n)>>2,a,(o)+2)))
#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (*(FbBits *) ((a)+(o)) = fgxor) : \
#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (void) (*(FbBits *) ((a)+(o)) = fgxor) : \
((void)FbLaneCase4((n)&15,a,o), \
FbLaneCase4((n)>>4,a,(o)+4)))

2
hw/xfree86/os-support/bus/linuxPci.c
View File

@ -498,7 +498,7 @@ xf86GetPciDomain(PCITAG Tag)
pPCI = xf86GetPciHostConfigFromTag(Tag);
if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
return result;
return result + 1;
if (!pPCI || pPCI->fakeDevice)
return 1; /* Domain 0 is reserved */

7
hw/xfree86/scanpci/extrapci.ids
View File

@ -11,11 +11,9 @@
# specified for a device (see the syntax description below).
#
# Don't make gratuitous changes, and please send back
# changes/additions that aren't XFree86-specific to the pciids
# changes/additions that aren't X-specific to the pciids
# project (http://pciids.sf.net/).
#
# $XdotOrg: xserver/xorg/hw/xfree86/scanpci/extrapci.ids,v 1.6 2005/09/19 18:54:05 alanc Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.11 2003/12/18 16:22:27 dawes Exp $
#
# Vendors, devices and subsystems. Please keep sorted.
@ -39,10 +37,7 @@
# Some NVIDIA cards that are not in the master pci.ids file yet.
10de "
0046 NV40 [GeForce 6800 GT]
0048 GeForce 6800 XT
0147 GeForce 6700 XL
0160 GeForce 6500
0163 GeForce 6200 LE
0169 GeForce 6250

1031
hw/xfree86/scanpci/pci.ids
View File

File diff suppressed because it is too large Load Diff

3
hw/xfree86/scanpci/pciid2c.pl
View File

@ -135,8 +135,7 @@ if ($infofile) {
# Print out header information.
$proj = "XdotOrg";
print "/* \$$proj\$ */
print "
/*
* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
*

6920
hw/xfree86/scanpci/xf86PciStdIds.h
View File

File diff suppressed because it is too large Load Diff

8
xkb/xkbUtils.c
View File

@ -754,12 +754,12 @@ unsigned char grp;
grp= state->locked_group;
if (grp>=ctrls->num_groups || grp < 0)
state->locked_group= XkbAdjustGroup(grp,ctrls);
if (grp>=ctrls->num_groups)
state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls);
grp= state->locked_group+state->base_group+state->latched_group;
if (grp>=ctrls->num_groups || grp < 0)
state->group= XkbAdjustGroup(grp,ctrls);
if (grp>=ctrls->num_groups)
state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls);
else state->group= grp;
XkbComputeCompatState(xkbi);
return;