[xserver-commit] xserver ChangeLog,3.26.2.6,3.26.2.7 Makefile.am,3.7,3.7.2.1 configure.ac,3.27.2.1,3.27.2.2
Keith Packard
xserver-commit@pdx.freedesktop.org
Thu, 23 Oct 2003 23:35:26 -0700
Committed by: keithp
Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv25100
Modified Files:
Tag: xfixes_2_branch
ChangeLog Makefile.am configure.ac
Log Message:
* Makefile.am:
* configure.ac:
* damageext/Makefile.am:
* damageext/damageext.c: (DamageExtNotify), (DamageExtReport),
(DamageExtDestroy), (ProcDamageQueryVersion), (ProcDamageCreate),
(ProcDamageDestroy), (ProcDamageSubtract), (XDamageNumberRequests),
(ProcDamageDispatch), (SProcDamageQueryVersion),
(SProcDamageCreate), (SProcDamageDestroy), (SProcDamageSubtract),
(SProcDamageDispatch), (DamageClientCallback), (DamageResetProc),
(FreeDamageExt), (FreeDamageExtWin), (SDamageNotifyEvent),
(DamageExtensionInit):
* damageext/damageext.h:
* damageext/damageextint.h:
* hw/kdrive/fbdev/Makefile.am:
* hw/kdrive/linux/Makefile.am:
* hw/kdrive/mach64/Makefile.am:
* hw/kdrive/mga/Makefile.am:
* hw/kdrive/nvidia/Makefile.am:
* hw/kdrive/r128/Makefile.am:
* hw/kdrive/smi/Makefile.am:
* hw/kdrive/src/Makefile.am:
* hw/kdrive/vesa/Makefile.am:
* hw/xnest/Makefile.am:
* mi/Makefile.am:
* mi/miinitext.c:
* mi/misprite.c:
* miext/damage/damage.c: (damageDamageRegion), (DamageCreate),
(DamageDestroy):
* miext/damage/damage.h:
* miext/damage/damagestr.h:
* miext/shadow/shadow.c: (shadowSetup):
* xfixes/region.c:
* xfixes/xfixes.h:
* xfixes/xfixesint.h:
Ok, so this change is way bigger than it needed to be, but I
couldn't stand it anymore. The "real" change here is the
addition of the damage extension server side pieces and a
minor change of the miext/damage interface to add a callback
on damage destroy. All of the configuration changes are to
add macros for various sets of libraries so that we don't have to
keep editing every Makefile.am whenever we add another extension
to the library. The xfixes changes expose VERIFY_REGION so
that damageext can use it.
Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.26.2.6
retrieving revision 3.26.2.7
diff -u -d -r3.26.2.6 -r3.26.2.7
--- ChangeLog 23 Oct 2003 17:44:54 -0000 3.26.2.6
+++ ChangeLog 24 Oct 2003 06:35:24 -0000 3.26.2.7
@@ -1,5 +1,51 @@
2003-10-23 Keith Packard <keithp@keithp.com>
+ * Makefile.am:
+ * configure.ac:
+ * damageext/Makefile.am:
+ * damageext/damageext.c: (DamageExtNotify), (DamageExtReport),
+ (DamageExtDestroy), (ProcDamageQueryVersion), (ProcDamageCreate),
+ (ProcDamageDestroy), (ProcDamageSubtract), (XDamageNumberRequests),
+ (ProcDamageDispatch), (SProcDamageQueryVersion),
+ (SProcDamageCreate), (SProcDamageDestroy), (SProcDamageSubtract),
+ (SProcDamageDispatch), (DamageClientCallback), (DamageResetProc),
+ (FreeDamageExt), (FreeDamageExtWin), (SDamageNotifyEvent),
+ (DamageExtensionInit):
+ * damageext/damageext.h:
+ * damageext/damageextint.h:
+ * hw/kdrive/fbdev/Makefile.am:
+ * hw/kdrive/linux/Makefile.am:
+ * hw/kdrive/mach64/Makefile.am:
+ * hw/kdrive/mga/Makefile.am:
+ * hw/kdrive/nvidia/Makefile.am:
+ * hw/kdrive/r128/Makefile.am:
+ * hw/kdrive/smi/Makefile.am:
+ * hw/kdrive/src/Makefile.am:
+ * hw/kdrive/vesa/Makefile.am:
+ * hw/xnest/Makefile.am:
+ * mi/Makefile.am:
+ * mi/miinitext.c:
+ * mi/misprite.c:
+ * miext/damage/damage.c: (damageDamageRegion), (DamageCreate),
+ (DamageDestroy):
+ * miext/damage/damage.h:
+ * miext/damage/damagestr.h:
+ * miext/shadow/shadow.c: (shadowSetup):
+ * xfixes/region.c:
+ * xfixes/xfixes.h:
+ * xfixes/xfixesint.h:
+ Ok, so this change is way bigger than it needed to be, but I
+ couldn't stand it anymore. The "real" change here is the
+ addition of the damage extension server side pieces and a
+ minor change of the miext/damage interface to add a callback
+ on damage destroy. All of the configuration changes are to
+ add macros for various sets of libraries so that we don't have to
+ keep editing every Makefile.am whenever we add another extension
+ to the library. The xfixes changes expose VERIFY_REGION so
+ that damageext can use it.
+
+2003-10-23 Keith Packard <keithp@keithp.com>
+
* fb/fbcopy.c: (fbDoCopy):
Always call SourceValidate, even if src and dst are the same.
This lets the software cursor code use Damage and not have to
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.7
retrieving revision 3.7.2.1
diff -u -d -r3.7 -r3.7.2.1
--- Makefile.am 9 Oct 2003 06:36:26 -0000 3.7
+++ Makefile.am 24 Oct 2003 06:35:24 -0000 3.7.2.1
@@ -8,5 +8,6 @@
randr \
render \
xfixes \
+ damageext \
hw
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.27.2.1
retrieving revision 3.27.2.2
diff -u -d -r3.27.2.1 -r3.27.2.2
--- configure.ac 22 Oct 2003 06:00:49 -0000 3.27.2.1
+++ configure.ac 24 Oct 2003 06:35:24 -0000 3.27.2.2
@@ -82,11 +82,14 @@
# tslib touchscreen driver
AC_CHECK_HEADERS([tslib.h])
-REQUIRED_MODULES="randr render fixesext xextensions xfont xproto xtrans xau xdmcp"
+REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau xdmcp"
DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
DEFAULT_VENDOR_STRING="freedesktop.org"
DEFAULT_VENDOR_RELEASE="6600"
+EXTENSION_LIBS='$(top_builddir)/Xext/libXext.a'
+EXTENSION_INCS='-I$(top_srcdir)/Xext'
+
AC_ARG_ENABLE(shape, [ --disable-shape ],[SHAPE=$enableval],[SHAPE=yes])
AC_ARG_ENABLE(xv, [ --enable-xv ],[XV=$enableval],[XV=no])
AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
@@ -192,7 +195,13 @@
dnl A bunch of configuration values which shouldn't be optional
dnl
AC_DEFINE(RENDER,1,[Support RENDER extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/render/librender.a'
+EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/render'
+
AC_DEFINE(RANDR,1,[Support RANDR extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/randr/librandr.a'
+EXTENSION_INCS="$EXTENSION_INCS "-I'$(top_srcdir)/randr'
+
AC_DEFINE(DDXOSINIT,1,[Use OsVendorInit])
AC_DEFINE(SMART_SCHEDULE,1,[Include time-based scheduler])
AC_DEFINE(NDEBUG,1,[Disable some debugging code])
@@ -204,11 +213,56 @@
AC_DEFINE(BIGREQS,1,[Support BigRequests extension])
AC_DEFINE(PIXPRIV,1,[Support pixmap privates])
AC_DEFINE(XFIXES,1,[Support XFixes extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/xfixes/libxfixes.a'
+EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/xfixes'
+
+AC_DEFINE(DAMAGEEXT,1,[Support Damage extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.a'
+EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
+
+DIX_LIB='$(top_builddir)/dix/libdix.a'
+OS_LIB='$(top_builddir)/os/libos.a'
+MI_LIB='$(top_builddir)/mi/libmi.a'
+MI_INC='-I$(top_srcdir)/mi'
+FB_LIB='$(top_builddir)/fb/libfb.a'
+FB_INC='-I$(top_srcdir)/fb'
+DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.a'
+DAMAGE_INC='-I$(top_srcdir)/miext/damage'
+SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.a'
+SHADOW_INC='-I$(top_srcdir)/miext/shadow'
+XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.a'
+XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
PKG_CHECK_MODULES(XSERVER, $REQUIRED_MODULES)
+XNEST_LIBS=
+XNEST_INCS=
if test "$XNESTSERVER" = yes; then
PKG_CHECK_MODULES(XNESTSERVER, $XNEST_REQUIRED_MODULES)
+ XNEST_LIBS="$DIX_LIB $OS_LIB $XNEST_LIB \
+ $EXTENSION_LIBS $MI_LIB \
+ $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
+ XNEST_INCS="$XNEST_INC $XNEST_OS_INC $DAMAGE_INC $SHADOW_INC \
+ $EXTENSION_INCS $MI_INC"
+fi
+AC_SUBST([XNEST_LIBS])
+AC_SUBST([XNEST_INCS])
+
+KDRIVE_LIBS=
+KDRIVE_INCS=
+if test "$KDRIVESERVER" = yes; then
+ KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
+ KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+ KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
+ KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
+
+ KDRIVE_LIBS="$DIX_LIB $OS_LIB $KDRIVE_LIB $KDRIVE_OS_LIB \
+ $EXTENSION_LIBS $FB_LIB $MI_LIB \
+ $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
+ KDRIVE_INCS="$KDRIVE_INC $KDRIVE_OS_INC $DAMAGE_INC $SHADOW_INC \
+ $EXTENSION_INCS $FB_INC $MI_INC"
fi
+AC_SUBST([KDRIVE_LIBS])
+AC_SUBST([KDRIVE_INCS])
AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include'
@@ -226,6 +280,7 @@
randr/Makefile
render/Makefile
xfixes/Makefile
+damageext/Makefile
Xext/Makefile
hw/Makefile
hw/kdrive/Makefile