xserver pixman git update 7-12-2010

1 files changed, 16 insertions, 15 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index e3b9a865d..ea2803795 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.9.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2010-10-01"

+AC_INIT([xorg-server], 1.9.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

+RELEASE_DATE="2010-12-06"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -64,9 +64,7 @@ dnl version-config.h covers the version numbers so they can be bumped without
 dnl forcing an entire recompile.x

 AC_CONFIG_HEADERS(include/version-config.h)

 

-AC_PROG_CC

 AM_PROG_AS

-AC_PROG_INSTALL

 AC_PROG_LN_S

 AC_LIBTOOL_WIN32_DLL

 AC_DISABLE_STATIC

@@ -77,7 +75,6 @@ AC_PROG_LEX
 AC_PROG_YACC

 AC_SYS_LARGEFILE

 XORG_PROG_RAWCPP

-AC_PROG_SED

 

 # Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow

 # easier overrides at build time.

@@ -791,7 +788,7 @@ WINDOWSWMPROTO="windowswmproto"
 APPLEWMPROTO="applewmproto >= 1.4"

 

 dnl Core modules for most extensions, et al.

-SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.0.99.3] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

+SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.4] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

 # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc

 AC_SUBST(SDK_REQUIRED_MODULES)

 

@@ -1353,6 +1350,8 @@ FB_LIB='$(top_builddir)/fb/libfb.la'
 FB_INC='-I$(top_srcdir)/fb'

 MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'

 MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'

+MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'

+MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'

 CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'

 

 # SHA1 hashing

@@ -1492,7 +1491,7 @@ AC_EGREP_CPP([I_AM_SVR4],[
 AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])

 AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))

 

-XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"

+XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"

 

 dnl ---------------------------------------------------------------------------

 dnl DDX section.

@@ -1505,7 +1504,7 @@ AC_MSG_RESULT([$XVFB])
 AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

 

 if test "x$XVFB" = xyes; then

-	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"

+	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"

 	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XVFB_LIBS])

 	AC_SUBST([XVFB_SYS_LIBS])

@@ -1526,7 +1525,7 @@ if test "x$XNEST" = xyes; then
 	if test "x$have_xnest" = xno; then

 		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])

 	fi

-	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"

+	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"

 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XNEST_LIBS])

 	AC_SUBST([XNEST_SYS_LIBS])

@@ -1554,7 +1553,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'

 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"

 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"

-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"

+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"

 

 	dnl ==================================================================

 	dnl symbol visibility

@@ -1889,7 +1888,7 @@ if test "x$XWIN" = xyes; then
 			XWIN_SYS_LIBS=-lwinsock2

 			;;

 	esac

-	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"

+	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"

 	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"

 	AC_SUBST(XWIN_LIBS)

 	AC_SUBST(XWIN_SERVER_NAME)

@@ -1919,7 +1918,7 @@ if test "x$XQUARTZ" = xyes; then
 	AC_DEFINE(XQUARTZ,1,[Have Quartz])

 	AC_DEFINE(ROOTLESS,1,[Build Rootless code])

 

-	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"

+	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"

 	AC_SUBST([DARWIN_LIBS])

 

 	AC_CHECK_LIB([Xplugin],[xp_init],[:])

@@ -1980,7 +1979,7 @@ if test "x$DMX" = xyes; then
 	fi

 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"

 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"

-	XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"

+	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"

 	XDMX_SYS_LIBS="$DMXMODULES_LIBS"

 	AC_SUBST([XDMX_CFLAGS])

 	AC_SUBST([XDMX_LIBS])

@@ -2085,13 +2084,13 @@ if test "$KDRIVE" = yes; then
     

     # damage shadow extension glx (NOTYET) fb mi

     KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'

-    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

+    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'

     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"

     

     KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"

 

-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"

+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"

     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'

     case $host_os in

 	*linux*)

@@ -2183,6 +2182,7 @@ damageext/Makefile
 dbe/Makefile

 dix/Makefile

 doc/Makefile

+doc/man/Makefile

 doc/xml/Makefile

 doc/xml/dtrace/Makefile

 doc/xml/xserver.ent

@@ -2191,6 +2191,7 @@ record/Makefile
 config/Makefile

 mi/Makefile

 miext/Makefile

+miext/sync/Makefile

 miext/damage/Makefile

 miext/shadow/Makefile

 miext/cw/Makefile