More patches from downstream
This commit is contained in:
Ben Byer
Jeremy Huddleston
parent
2c4d1eeb41
commit
120e831640
@ -1,15 +1,10 @@
|
||||
AM_CFLAGS = -I$(top_srcdir) \
|
||||
-I$(top_srcdir)/hw/darwin/quartz \
|
||||
-I$(top_srcdir)/GL/glx \
|
||||
-I$(top_srcdir)/hw/darwin/quartz/cr \
|
||||
-I$(top_srcdir)/GL/include
|
||||
-I$(top_srcdir)/GL/include \
|
||||
-I$(top_srcdir)/GL/mesa/glapi \
|
||||
-I$(top_srcdir)/hw/darwin/quartz \
|
||||
-I$(top_srcdir)/hw/darwin/quartz/xpr
|
||||
|
||||
if HAVE_AGL_FRAMEWORK
|
||||
noinst_LIBRARIES = libAGLcore.a
|
||||
libAGLcore_a_SOURCES = aglGlx.c \
|
||||
$(top_srcdir)/hw/darwin/quartz/xpr/x-list.c \
|
||||
$(top_srcdir)/hw/darwin/quartz/xpr/x-list.h \
|
||||
$(top_srcdir)/hw/darwin/quartz/xpr/x-hash.c \
|
||||
$(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \
|
||||
noinst_LIBRARIES = libCGLcore.a
|
||||
libCGLcore_a_SOURCES = indirect.c \
|
||||
$(top_srcdir)/hw/dmx/glxProxy/compsize.c
|
||||
endif
|
||||
|
||||
@ -1008,6 +1008,7 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Bool enable_stereo = false;
|
||||
/* based on code in i830_dri.c
|
||||
This ends calling glAquaSetVisualConfigs to set the static
|
||||
numconfigs, etc. */
|
||||
@ -1022,16 +1023,18 @@ glAquaInitVisualConfigs(void)
|
||||
int i = 0;
|
||||
|
||||
GLAQUA_DEBUG_MSG("glAquaInitVisualConfigs ");
|
||||
|
||||
|
||||
/* count num configs:
|
||||
2 stereo (on, off) (optional)
|
||||
2 Z buffer (0, 24 bit)
|
||||
2 AUX buffer (0, 2)
|
||||
2 buffers (single, double)
|
||||
2 stencil (0, 8 bit)
|
||||
2 accum (0, 64 bit)
|
||||
= 32 configs */
|
||||
= 64 configs with stereo, or 32 without */
|
||||
|
||||
lclNumConfigs = 2 * 2 * 2 * 2 * 2; /* 32 */
|
||||
if (enable_stereo) lclNumConfigs = 2 * 2 * 2 * 2 * 2 * 2; /* 64 */
|
||||
else lclNumConfigs = 2 * 2 * 2 * 2 * 2; /* 32 */
|
||||
|
||||
/* alloc */
|
||||
lclVisualConfigs = xcalloc(sizeof(__GLXvisualConfig), lclNumConfigs);
|
||||
@ -1040,54 +1043,55 @@ glAquaInitVisualConfigs(void)
|
||||
/* fill in configs */
|
||||
if (NULL != lclVisualConfigs) {
|
||||
i = 0; /* current buffer */
|
||||
for (depth = 0; depth < 2; depth++) {
|
||||
for (stereo = 0; stereo < (enable_stereo ? 2 : 1); stereo++) {
|
||||
for (depth = 0; depth < 2; depth++) {
|
||||
for (aux = 0; aux < 2; aux++) {
|
||||
for (buffers = 0; buffers < 2; buffers++) {
|
||||
for (stencil = 0; stencil < 2; stencil++) {
|
||||
for (accum = 0; accum < 2; accum++) {
|
||||
lclVisualConfigs[i].vid = -1;
|
||||
lclVisualConfigs[i].class = -1;
|
||||
lclVisualConfigs[i].rgba = TRUE;
|
||||
lclVisualConfigs[i].redSize = -1;
|
||||
lclVisualConfigs[i].greenSize = -1;
|
||||
lclVisualConfigs[i].blueSize = -1;
|
||||
lclVisualConfigs[i].redMask = -1;
|
||||
lclVisualConfigs[i].greenMask = -1;
|
||||
lclVisualConfigs[i].blueMask = -1;
|
||||
lclVisualConfigs[i].alphaMask = 0;
|
||||
if (accum) {
|
||||
lclVisualConfigs[i].accumRedSize = 16;
|
||||
lclVisualConfigs[i].accumGreenSize = 16;
|
||||
lclVisualConfigs[i].accumBlueSize = 16;
|
||||
lclVisualConfigs[i].accumAlphaSize = 16;
|
||||
}
|
||||
else {
|
||||
lclVisualConfigs[i].accumRedSize = 0;
|
||||
lclVisualConfigs[i].accumGreenSize = 0;
|
||||
lclVisualConfigs[i].accumBlueSize = 0;
|
||||
lclVisualConfigs[i].accumAlphaSize = 0;
|
||||
}
|
||||
lclVisualConfigs[i].doubleBuffer = buffers ? TRUE : FALSE;
|
||||
lclVisualConfigs[i].stereo = FALSE;
|
||||
lclVisualConfigs[i].bufferSize = -1;
|
||||
|
||||
lclVisualConfigs[i].depthSize = depth? 24 : 0;
|
||||
lclVisualConfigs[i].stencilSize = stencil ? 8 : 0;
|
||||
lclVisualConfigs[i].auxBuffers = aux ? 2 : 0;
|
||||
lclVisualConfigs[i].level = 0;
|
||||
lclVisualConfigs[i].visualRating = GLX_NONE_EXT;
|
||||
lclVisualConfigs[i].transparentPixel = 0;
|
||||
lclVisualConfigs[i].transparentRed = 0;
|
||||
lclVisualConfigs[i].transparentGreen = 0;
|
||||
lclVisualConfigs[i].transparentBlue = 0;
|
||||
lclVisualConfigs[i].transparentAlpha = 0;
|
||||
lclVisualConfigs[i].transparentIndex = 0;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (buffers = 0; buffers < 2; buffers++) {
|
||||
for (stencil = 0; stencil < 2; stencil++) {
|
||||
for (accum = 0; accum < 2; accum++) {
|
||||
lclVisualConfigs[i].vid = -1;
|
||||
lclVisualConfigs[i].class = -1;
|
||||
lclVisualConfigs[i].rgba = TRUE;
|
||||
lclVisualConfigs[i].redSize = -1;
|
||||
lclVisualConfigs[i].greenSize = -1;
|
||||
lclVisualConfigs[i].blueSize = -1;
|
||||
lclVisualConfigs[i].redMask = -1;
|
||||
lclVisualConfigs[i].greenMask = -1;
|
||||
lclVisualConfigs[i].blueMask = -1;
|
||||
lclVisualConfigs[i].alphaMask = 0;
|
||||
if (accum) {
|
||||
lclVisualConfigs[i].accumRedSize = 16;
|
||||
lclVisualConfigs[i].accumGreenSize = 16;
|
||||
lclVisualConfigs[i].accumBlueSize = 16;
|
||||
lclVisualConfigs[i].accumAlphaSize = 16;
|
||||
} else {
|
||||
lclVisualConfigs[i].accumRedSize = 0;
|
||||
lclVisualConfigs[i].accumGreenSize = 0;
|
||||
lclVisualConfigs[i].accumBlueSize = 0;
|
||||
lclVisualConfigs[i].accumAlphaSize = 0;
|
||||
}
|
||||
lclVisualConfigs[i].doubleBuffer = buffers ? TRUE : FALSE;
|
||||
lclVisualConfigs[i].stereo = stereo ? TRUE : FALSE;
|
||||
lclVisualConfigs[i].bufferSize = -1;
|
||||
|
||||
lclVisualConfigs[i].depthSize = depth? 24 : 0;
|
||||
lclVisualConfigs[i].stencilSize = stencil ? 8 : 0;
|
||||
lclVisualConfigs[i].auxBuffers = aux ? 2 : 0;
|
||||
lclVisualConfigs[i].level = 0;
|
||||
lclVisualConfigs[i].visualRating = GLX_NONE_EXT;
|
||||
lclVisualConfigs[i].transparentPixel = 0;
|
||||
lclVisualConfigs[i].transparentRed = 0;
|
||||
lclVisualConfigs[i].transparentGreen = 0;
|
||||
lclVisualConfigs[i].transparentBlue = 0;
|
||||
lclVisualConfigs[i].transparentAlpha = 0;
|
||||
lclVisualConfigs[i].transparentIndex = 0;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (i != lclNumConfigs)
|
||||
GLAQUA_DEBUG_MSG("glAquaInitVisualConfigs failed to alloc visual configs");
|
||||
@ -1095,7 +1099,6 @@ glAquaInitVisualConfigs(void)
|
||||
GlxSetVisualConfigs(lclNumConfigs, lclVisualConfigs, lclVisualPrivates);
|
||||
}
|
||||
|
||||
|
||||
static void glAquaSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
|
||||
void **privates)
|
||||
{
|
||||
|
||||
2049
GL/apple/indirect.c
2049
GL/apple/indirect.c
File diff suppressed because it is too large
Load Diff
180
configure.ac
180
configure.ac
@ -517,11 +517,11 @@ AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build
|
||||
|
||||
dnl DDXes.
|
||||
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
|
||||
AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no])
|
||||
AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: no)]), [XVFB=$enableval], [XVFB=yes])
|
||||
AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
|
||||
AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
|
||||
AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
|
||||
AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
|
||||
AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: no)]), [XPRINT=$enableval], [XPRINT=no])
|
||||
AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: auto)]), [XPRINT=$enableval], [XPRINT=auto])
|
||||
AC_ARG_ENABLE(xgl, AS_HELP_STRING([--enable-xgl], [Build Xgl server (default: no)]), [XGL=$enableval], [XGL=no])
|
||||
AC_ARG_ENABLE(xglx, AS_HELP_STRING([--enable-xglx], [Build Xglx xgl module (default: no)]), [XGLX=$enableval], [XGLX=no])
|
||||
AC_ARG_ENABLE(xegl, AS_HELP_STRING([--enable-xegl], [Build Xegl xgl module (default: no)]), [XEGL=$enableval], [XEGL=no])
|
||||
@ -555,7 +555,7 @@ if test "x$SETUID" = "xauto" ; then
|
||||
case $host_cpu in
|
||||
sparc) SETUID="no" ;;
|
||||
*) SETUID="yes" ;;
|
||||
esac
|
||||
esac ;;
|
||||
esac
|
||||
if test "x$SETUID" = xyes; then
|
||||
touch testfile
|
||||
@ -722,7 +722,10 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
|
||||
PKG_CHECK_MODULES([GL], [glproto >= 1.4.8])
|
||||
AC_SUBST(XLIB_CFLAGS)
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
|
||||
case $host_os in
|
||||
darwin*) GLX_LIBS='$(top_builddir)/GL/apple/indirect.o $(top_builddir)/GL/glx/libglx.la' ;;
|
||||
*) GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' ;;
|
||||
esac
|
||||
test -d GL || mkdir GL
|
||||
case $host_os in
|
||||
solaris*)
|
||||
@ -967,7 +970,7 @@ AC_SUBST([VENDOR_NAME])
|
||||
AC_SUBST([VENDOR_NAME_SHORT])
|
||||
AC_SUBST([VENDOR_RELEASE])
|
||||
AC_SUBST([VENDOR_MAN_VERSION])
|
||||
|
||||
AC_SUBST([XORG_DATE])
|
||||
AC_DEFINE(DDXOSINIT, 1, [Use OsVendorInit])
|
||||
AC_DEFINE(SERVER_LOCK, 1, [Use a lock to prevent multiple servers on a display])
|
||||
AC_DEFINE(SMART_SCHEDULE, 1, [Include time-based scheduler])
|
||||
@ -1280,64 +1283,61 @@ dnl has it in libc), or if libdl is needed to get it.
|
||||
AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl"))
|
||||
|
||||
case $host_os in
|
||||
darwin*)
|
||||
XORG_OS="Darwin"
|
||||
build_darwin=yes
|
||||
if test "X$XQUARTZ" = Xauto; then
|
||||
AC_CACHE_CHECK([for Carbon framework],xorg_cv_Carbon_framework,[
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -framework Carbon"
|
||||
AC_LINK_IFELSE([char FSFindFolder();
|
||||
darwin*)
|
||||
XORG_OS="Darwin"
|
||||
build_darwin=yes
|
||||
if test "X$XQUARTZ" = Xauto; then
|
||||
AC_CACHE_CHECK([for Carbon framework],xorg_cv_Carbon_framework,[
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -framework Carbon"
|
||||
AC_LINK_IFELSE([char FSFindFolder();
|
||||
int main() {
|
||||
FSFindFolder();
|
||||
return 0;}
|
||||
],[xorg_cv_Carbon_framework=yes],
|
||||
[xorg_cv_Carbon_framework=no])
|
||||
LDFLAGS=$save_LDFLAGS])
|
||||
if test "X$xorg_cv_Carbon_framework" = Xyes; then
|
||||
AC_DEFINE([DARWIN_WITH_QUARTZ],[1],
|
||||
[Have Quartz])
|
||||
XQUARTZ=yes
|
||||
else
|
||||
XQUARTZ=no
|
||||
fi
|
||||
fi
|
||||
# glxAGL / glxCGL don't work yet
|
||||
# AC_CACHE_CHECK([for AGL framework],xorg_cv_AGL_framework,[
|
||||
# save_LDFLAGS=$LDFLAGS
|
||||
# LDFLAGS="$LDFLAGS -framework AGL"
|
||||
# AC_LINK_IFELSE([char aglEnable();
|
||||
#int main() {
|
||||
#aglEnable();
|
||||
#return 0;}
|
||||
# ],[xorg_cv_AGL_framework=yes],
|
||||
# [xorg_cv_AGL_framework=no])
|
||||
# LDFLAGS=$save_LDFLAGS
|
||||
# ])
|
||||
xorg_cv_AGL_framework=no
|
||||
DARWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
|
||||
AC_SUBST([DARWIN_LIBS])
|
||||
AC_CHECK_LIB([Xplugin],[xp_init],[:])
|
||||
AC_SUBST([APPLE_APPLICATIONS_DIR])
|
||||
CFLAGS="${CFLAGS} -D__DARWIN__"
|
||||
PLIST_VERSION_STRING=$PACKAGE_VERSION
|
||||
AC_SUBST([PLIST_VERSION_STRING])
|
||||
PLIST_VENDOR_WEB=$VENDOR_WEB
|
||||
AC_SUBST([PLIST_VENDOR_WEB])
|
||||
# Not sure that we should be disabling all these...
|
||||
if test "x$XF86MISC" = xyes || test "x$XF86MISC" = xauto; then
|
||||
AC_MSG_NOTICE([Disabling XF86Misc extension])
|
||||
XF86MISC=no
|
||||
fi
|
||||
if test "x$XF86VIDMODE" = xyes || test "x$XF86VIDMODE" = xauto; then
|
||||
AC_MSG_NOTICE([Disabling XF86VidMode extension])
|
||||
XF86VIDMODE=no
|
||||
fi
|
||||
if test "x$DGA" = xyes || test "x$DGA" = xauto; then
|
||||
AC_MSG_NOTICE([Disabling DGA extension])
|
||||
DGA=no
|
||||
fi
|
||||
;;
|
||||
],[xorg_cv_Carbon_framework=yes],
|
||||
[xorg_cv_Carbon_framework=no])
|
||||
LDFLAGS=$save_LDFLAGS])
|
||||
if test "X$xorg_cv_Carbon_framework" = Xyes; then
|
||||
AC_DEFINE([DARWIN_WITH_QUARTZ],[1],
|
||||
[Have Quartz])
|
||||
XQUARTZ=yes
|
||||
else
|
||||
XQUARTZ=no
|
||||
fi
|
||||
fi
|
||||
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
|
||||
AC_CACHE_CHECK([for AGL framework],xorg_cv_AGL_framework,[
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -framework AGL"
|
||||
AC_LINK_IFELSE([char aglEnable();
|
||||
int main() {
|
||||
aglEnable();
|
||||
return 0;}
|
||||
],[xorg_cv_AGL_framework=yes],
|
||||
[xorg_cv_AGL_framework=no])
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
])
|
||||
AC_CHECK_LIB([Xplugin],[xp_init],[:])
|
||||
AC_SUBST([APPLE_APPLICATIONS_DIR])
|
||||
CFLAGS="${CFLAGS} -D__DARWIN__"
|
||||
PLIST_VERSION_STRING=$VENDOR_VERSION_STRING
|
||||
AC_SUBST([PLIST_VERSION_STRING])
|
||||
PLIST_VENDOR_WEB=$VENDOR_WEB
|
||||
AC_SUBST([PLIST_VENDOR_WEB])
|
||||
# Not sure that we should be disabling all these...
|
||||
if test "x$XF86MISC" = xyes; then
|
||||
AC_MSG_NOTICE([Disabling XF86Misc extension])
|
||||
XF86MISC=no
|
||||
fi
|
||||
if test "x$XF86VIDMODE" = xyes; then
|
||||
AC_MSG_NOTICE([Disabling XF86VidMode extension])
|
||||
XF86VIDMODE=no
|
||||
fi
|
||||
if test "x$DGA" = xyes; then
|
||||
AC_MSG_NOTICE([Disabling DGA extension])
|
||||
DGA=no
|
||||
fi
|
||||
;;
|
||||
linux*)
|
||||
if test "x$LNXAPM" = xyes; then
|
||||
XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
|
||||
@ -1458,10 +1458,6 @@ return 0;}
|
||||
Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \
|
||||
Xorg to your platform, please email xorg@lists.freedesktop.org.])
|
||||
;;
|
||||
esac
|
||||
|
||||
case $host_cpu in
|
||||
i*86)
|
||||
case $host_os in
|
||||
darwin*) ;;
|
||||
*) xorg_bus_ix86pci=yes ;;
|
||||
@ -1542,6 +1538,32 @@ return 0;}
|
||||
fi
|
||||
AC_SUBST(PERL)
|
||||
|
||||
# The Xorg binary needs to export symbols so that they can be used from modules
|
||||
# Some platforms require extra flags to do this. gcc should set these flags
|
||||
# when -rdynamic is passed to it, other compilers/linkers may need to be added
|
||||
# here.
|
||||
if test "x$GCC" = "xyes"; then
|
||||
GCC_WARNINGS1="-Wall -Wpointer-arith -Wstrict-prototypes"
|
||||
GCC_WARNINGS2="-Wmissing-prototypes -Wmissing-declarations"
|
||||
GCC_WARNINGS3="-Wnested-externs -fno-strict-aliasing"
|
||||
GCC_WARNINGS="$GCC_WARNINGS1 $GCC_WARNINGS2 $GCC_WARNINGS3"
|
||||
if test "x$WERROR" = "xyes"; then
|
||||
GCC_WARNINGS="${GCC_WARNINGS} -Werror"
|
||||
fi
|
||||
XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS"
|
||||
case $host_os in
|
||||
darwin*) ;; # Symbols are exported by default, no need
|
||||
# to do anything special. I think that the following
|
||||
# is wrong anyway when using libtool. Should be using
|
||||
# the libtool flag -export-dynamic?
|
||||
*)LD_EXPORT_SYMBOLS_FLAG="-rdynamic" ;;
|
||||
esac
|
||||
fi
|
||||
case $host_os in
|
||||
openbsd*)
|
||||
LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST([XORG_CFLAGS])
|
||||
|
||||
dnl these only go in xorg-config.h
|
||||
@ -1575,6 +1597,26 @@ return 0;}
|
||||
AC_SUBST([extdir])
|
||||
AC_SUBST([logdir])
|
||||
fi
|
||||
|
||||
if test "x$XF86VIDMODE" = xyes; then
|
||||
AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
|
||||
fi
|
||||
|
||||
if test "x$XF86MISC" = xyes; then
|
||||
AC_DEFINE(XF86MISC, 1, [Support XFree86 miscellaneous extensions])
|
||||
fi
|
||||
# Support for objc in autotools is minimal and not documented.
|
||||
OBJC='$(CC)'
|
||||
OBJCLD='$(CCLD)'
|
||||
OBJCLINK='$(LINK)'
|
||||
OBJCFLAGS='$(CFLAGS)'
|
||||
AC_SUBST([OBJC])
|
||||
AC_SUBST([OBJCCLD])
|
||||
AC_SUBST([OBJCLINK])
|
||||
AC_SUBST([OBJCFLAGS])
|
||||
# internal, undocumented automake func follows :(
|
||||
_AM_DEPENDENCIES([OBJC])
|
||||
|
||||
AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
|
||||
AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
|
||||
AM_CONDITIONAL([XORG_BUS_FREEBSDPCI], [test "x$xorg_bus_freebsdpci" = xyes])
|
||||
@ -1661,7 +1703,6 @@ if test "x$XPRINT" = xyes; then
|
||||
fi
|
||||
AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes])
|
||||
|
||||
|
||||
dnl XWin DDX
|
||||
|
||||
AC_MSG_CHECKING([whether to build XWin DDX])
|
||||
@ -1888,6 +1929,10 @@ AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
|
||||
|
||||
AC_SUBST(XKB_COMPILED_DIR)
|
||||
|
||||
AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])
|
||||
if test "x$DGA" = xyes; then
|
||||
AC_DEFINE(DGA, 1, [Support DGA extension])
|
||||
fi
|
||||
dnl and the rest of these are generic, so they're in config.h
|
||||
AC_DEFINE(XResExtension, 1, [Build XRes extension])
|
||||
|
||||
@ -2095,6 +2140,9 @@ hw/darwin/bundle/Swedish.lproj/Makefile
|
||||
hw/darwin/bundle/ko.lproj/Makefile
|
||||
hw/darwin/iokit/Makefile
|
||||
hw/darwin/quartz/Makefile
|
||||
hw/darwin/quartz/cr/Makefile
|
||||
hw/darwin/quartz/fullscreen/Makefile
|
||||
hw/darwin/quartz/xpr/Makefile
|
||||
hw/darwin/utils/Makefile
|
||||
hw/kdrive/Makefile
|
||||
hw/kdrive/ati/Makefile
|
||||
|
||||
@ -235,7 +235,6 @@ glxMesa_la_DEPENDENCIES = XDarwinApp
|
||||
endif
|
||||
|
||||
endif
|
||||
if HAVE_X_PLUGIN
|
||||
|
||||
xprplugindir = $(darwinappdir)/Contents/Resources/xpr.bundle/Contents/MacOS
|
||||
xprplugin_LTLIBRARIES =
|
||||
@ -259,9 +258,6 @@ xpr_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
|
||||
-module -avoid-version -no-undefined
|
||||
xpr_la_DEPENDENCIES = XDarwinApp
|
||||
|
||||
endif
|
||||
|
||||
if HAVE_AGL_FRAMEWORK
|
||||
glxCGLplugindir = $(darwinappdir)/Contents/Resources/glxCGL.bundle/Contents/MacOS
|
||||
glxCGLplugin_LTLIBRARIES =
|
||||
glxCGL_la_SOURCES =
|
||||
@ -293,10 +289,6 @@ glxAGL_la_LDFLAGS = -shrext '' \
|
||||
-module -avoid-version -no-undefined
|
||||
glxAGL_la_DEPENDENCIES = XDarwinApp
|
||||
|
||||
|
||||
|
||||
endif
|
||||
|
||||
man1_MANS = XDarwin.man
|
||||
|
||||
uninstall-hook:
|
||||
|
||||
@ -5,10 +5,9 @@ AM_OBJCFLAGS = @XORG_CFLAGS@
|
||||
|
||||
INCLUDES = -I$(srcdir) -I$(srcdir)/.. @XORG_INCS@
|
||||
AM_DEFS = -DHAS_CG_MACH_PORT -DHAS_KL_API
|
||||
if HAVE_X_PLUGIN
|
||||
AM_DEFS += -DBUILD_XPR
|
||||
XPR = xpr
|
||||
endif
|
||||
|
||||
DEFS = @DEFS@ $(AM_DEFS) -DXBINDIR=\"${bindir}\"
|
||||
SUBDIRS = cr fullscreen $(XPR)
|
||||
|
||||
|
||||
@ -338,7 +338,7 @@ extern void XFree86DGAExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef GLXEXT
|
||||
typedef struct __GLXprovider __GLXprovider;
|
||||
#ifdef INXDARWINAPP
|
||||
#if defined(__DARWIN__) && !defined(INXQUARTZ)
|
||||
extern __GLXprovider* __DarwinglXMesaProvider;
|
||||
extern void DarwinGlxPushProvider(__GLXprovider *impl);
|
||||
extern void DarwinGlxExtensionInit(INITARGS);
|
||||
@ -348,8 +348,8 @@ extern __GLXprovider __glXMesaProvider;
|
||||
extern void GlxPushProvider(__GLXprovider *impl);
|
||||
extern void GlxExtensionInit(INITARGS);
|
||||
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
|
||||
#endif // INXDARWINAPP
|
||||
#endif // GLXEXT
|
||||
#endif
|
||||
#endif
|
||||
#ifdef XF86DRI
|
||||
extern void XFree86DRIExtensionInit(INITARGS);
|
||||
#endif
|
||||
@ -633,14 +633,14 @@ InitExtensions(argc, argv)
|
||||
#endif
|
||||
|
||||
#ifdef GLXEXT
|
||||
#ifdef INXDARWINAPP
|
||||
#if defined(__DARWIN__) && !defined(INXQUARTZ)
|
||||
DarwinGlxPushProvider(__DarwinglXMesaProvider);
|
||||
if (!noGlxExtension) DarwinGlxExtensionInit();
|
||||
#else
|
||||
GlxPushProvider(&__glXMesaProvider);
|
||||
if (!noGlxExtension) GlxExtensionInit();
|
||||
#endif // INXDARWINAPP
|
||||
#endif // GLXEXT
|
||||
#endif
|
||||
#endif
|
||||
#ifdef XFIXES
|
||||
/* must be before Render to layer DisplayCursor correctly */
|
||||
if (!noXFixesExtension) XFixesExtensionInit();
|
||||
|
||||
@ -74,6 +74,7 @@ SOFTWARE.
|
||||
#define TRANS_SERVER
|
||||
#define TRANS_REOPEN
|
||||
#include <X11/Xtrans/Xtrans.h>
|
||||
#include <X11/Xtrans/Xtransint.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
@ -660,9 +661,15 @@ ClientAuthorized(ClientPtr client,
|
||||
XID auth_id;
|
||||
char *reason = NULL;
|
||||
XtransConnInfo trans_conn;
|
||||
|
||||
struct sockaddr *saddr;
|
||||
priv = (OsCommPtr)client->osPrivate;
|
||||
trans_conn = priv->trans_conn;
|
||||
saddr = (struct sockaddr *) (trans_conn->addr);
|
||||
|
||||
/* Allow any client to connect without authorization on a launchd socket,
|
||||
because it is securely created -- this prevents a race condition on launch */
|
||||
if (saddr->sa_len > 11 && saddr->sa_family == AF_UNIX &&
|
||||
!strncmp(saddr->sa_data, "/tmp/launch", 11)) goto done;
|
||||
|
||||
auth_id = CheckAuthorization (proto_n, auth_proto,
|
||||
string_n, auth_string, client, &reason);
|
||||
@ -719,6 +726,7 @@ ClientAuthorized(ClientPtr client,
|
||||
}
|
||||
}
|
||||
priv->auth_id = auth_id;
|
||||
done:
|
||||
priv->conn_time = 0;
|
||||
|
||||
#ifdef XDMCP
|
||||
|
||||
Loading…
Reference in New Issue
Block a user