.gitignore | 1
COPYING | 2717 ++++++++
GL/glx/Makefile.am | 1
GL/glx/glxcmds.c | 53
GL/glx/glxcmdsswap.c | 9
GL/glx/glxdrawable.h | 1
GL/glx/glxdri.c | 44
GL/glx/glxext.c | 9
GL/glx/glxext.h | 3
GL/glx/glxserver.h | 2
Makefile.am | 12
Xi/opendev.c | 4
acinclude.m4 | 33
composite/compalloc.c | 1
composite/compinit.c | 202
composite/compwindow.c | 2
config/Makefile.am | 18
config/config-backends.h | 59
config/config.c | 542 -
config/dbus-api | 19
config/dbus-core.c | 243
config/dbus.c | 441 +
config/hal.c | 371 +
config/x11-input.fdi | 31
configure.ac | 112
dix/Makefile.am | 5
dix/cursor.c | 22
dix/devices.c | 1
dix/getevents.c | 94
dix/main.c | 28
dix/property.c | 64
exa/exa.c | 39
exa/exa_unaccel.c | 37
fb/fb.h | 34
fb/fballpriv.c | 4
fb/fboverlay.c | 6
fb/fbpict.c | 2
fb/fbscreen.c | 33
hw/darwin/Makefile.am | 1
hw/kdrive/ati/Makefile.am | 4
hw/kdrive/chips/Makefile.am | 4
hw/kdrive/ephyr/Makefile.am | 5
hw/kdrive/epson/Makefile.am | 4
hw/kdrive/fake/Makefile.am | 4
hw/kdrive/fbdev/Makefile.am | 4
hw/kdrive/i810/Makefile.am | 4
hw/kdrive/mach64/Makefile.am | 4
hw/kdrive/mga/Makefile.am | 4
hw/kdrive/neomagic/Makefile.am | 4
hw/kdrive/nvidia/Makefile.am | 4
hw/kdrive/pm2/Makefile.am | 4
hw/kdrive/r128/Makefile.am | 4
hw/kdrive/savage/s3curs.c | 8
hw/kdrive/sdl/Makefile.am | 2
hw/kdrive/sis300/Makefile.am | 4
hw/kdrive/smi/Makefile.am | 4
hw/kdrive/src/kasync.c | 5
hw/kdrive/src/kdrive.c | 14
hw/kdrive/src/kdrive.h | 3
hw/kdrive/src/kinput.c | 19
hw/kdrive/trio/s3curs.c | 8
hw/kdrive/vesa/Makefile.am | 4
hw/kdrive/via/Makefile.am | 4
hw/xfree86/Makefile.am | 8
hw/xfree86/common/xf86.h | 16
hw/xfree86/common/xf86Config.c | 44
hw/xfree86/common/xf86Configure.c | 65
hw/xfree86/common/xf86Cursor.c | 10
hw/xfree86/common/xf86Debug.c | 117
hw/xfree86/common/xf86Events.c | 10
hw/xfree86/common/xf86Helper.c | 14
hw/xfree86/common/xf86Init.c | 91
hw/xfree86/common/xf86Mode.c | 6
hw/xfree86/common/xf86Module.h | 2
hw/xfree86/common/xf86Priv.h | 3
hw/xfree86/common/xf86Privstr.h | 3
hw/xfree86/common/xf86Xinput.c | 34
hw/xfree86/common/xf86pciBus.c | 24
hw/xfree86/ddc/ddcProperty.c | 4
hw/xfree86/doc/man/xorg.conf.man.pre | 7
hw/xfree86/dri/dri.c | 209
hw/xfree86/dri/dri.h | 14
hw/xfree86/dri/dristruct.h | 2
hw/xfree86/dri/xf86dri.c | 11
hw/xfree86/int10/generic.c | 62
hw/xfree86/int10/helper_mem.c | 127
hw/xfree86/int10/xf86int10.h | 20
hw/xfree86/loader/xf86sym.c | 21
hw/xfree86/modes/xf86Crtc.c | 10
hw/xfree86/modes/xf86Crtc.h | 12
hw/xfree86/modes/xf86Cursors.c | 116
hw/xfree86/modes/xf86EdidModes.c | 5
hw/xfree86/modes/xf86RandR12.c | 5
hw/xfree86/modes/xf86Rotate.c | 378 -
hw/xfree86/os-support/bus/altixPCI.c | 142
hw/xfree86/os-support/bus/linuxPci.c | 60
hw/xfree86/os-support/hurd/hurd_bell.c | 30
hw/xfree86/os-support/linux/int10/linux.c | 21
hw/xfree86/os-support/linux/lnx.h | 1
hw/xfree86/os-support/linux/lnx_axp.c | 4
hw/xfree86/os-support/linux/lnx_bell.c | 30
hw/xfree86/os-support/solaris/Makefile.am | 10
hw/xfree86/scanpci/extrapci.ids | 22
hw/xfree86/scanpci/pci.ids | 1478 +++-
hw/xfree86/scanpci/xf86PciStdIds.h | 9210 ++++++++++++++++++++++++++++--
hw/xfree86/utils/cvt/cvt.man.pre | 2
hw/xfree86/utils/gtf/gtf.man.pre | 2
hw/xfree86/xf1bpp/Makefile.am | 10
hw/xfree86/xf4bpp/ppcGCstr.h | 22
hw/xprint/pcl/PclInit.c | 32
include/Makefile.am | 1
include/dix-config.h.in | 8
include/dix.h | 3
include/hotplug.h | 49
include/inputstr.h | 1
include/xorg-server.h.in | 3
os/Makefile.am | 6
randr/randrstr.h | 5
randr/rrcrtc.c | 4
randr/rrinfo.c | 2
randr/rroutput.c | 9
randr/rrscreen.c | 9
render/picture.c | 2
xkb/xkbUtils.c | 5
124 files changed, 15168 insertions(+), 2893 deletions(-)
New commits:
commit f3955c0a020b39021050cd33c20a17f14fc4b579
Author: Arkadiusz Miskiewicz <[EMAIL PROTECTED]>
Date: Wed Aug 1 21:04:22 2007 +0300
XFree86: xf1bpp: distclean generated files as well
Make sure we clean up after ourselves: not sure why distcheck didn't flag
this one.
diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 341fe3b..ef3d08f 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -55,7 +55,7 @@ libxf1bppmfb_a_SOURCES = \
mfbwindow.c \
mfbzerarc.c
-BUILT_SOURCES = $(libxf1bppgen_a_SOURCES) $(libxf1bppgen_a_SOURCES)
+BUILT_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) \
mfbmodule.c
@@ -173,7 +173,8 @@ mfbtileG.c:
echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
$(libxf1bppmfb_a_SOURCES):
- echo "#include \"mfbmap.h\"" > $$i
- echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i
+ echo "#include \"mfbmap.h\"" > $@
+ echo "#include \"$(top_srcdir)/mfb/[EMAIL PROTECTED]"" >> $@
EXTRA_DIST = mfbmap.sh mfbunmap.sh
+DISTCLEANFILES = $(BUILT_SOURCES)
commit a04c95f4446e5c169dea71019321d790ab4fa139
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Aug 1 20:37:05 2007 +0300
configure.ac: Fix argument quoting for argv[]
m4 quoting. Yar boo sux.
diff --git a/configure.ac b/configure.ac
index 728b79a..518f332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,7 +1077,7 @@ if ! test "x$have_clock_gettime" = xno; then
#define _POSIX_C_SOURCE 199309L
#include <time.h>
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[[]]) {
struct timespec tp;
if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
commit 99a88826e5e8cfa25c5f8a88c12799d33114729c
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 20:34:58 2007 +0300
configure.ac: Actually use -lrt in monotonic clock test
If we need -lrt to use clock_gettime, then make sure we link with it.
diff --git a/configure.ac b/configure.ac
index ffcc72d..728b79a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,6 +1070,9 @@ if ! test "x$have_clock_gettime" = xno; then
CLOCK_LIBS=""
fi
+ LIBS_SAVE="$LIBS"
+ LIBS="$CLOCK_LIBS"
+
AC_RUN_IFELSE([
#define _POSIX_C_SOURCE 199309L
#include <time.h>
@@ -1084,6 +1087,8 @@ int main(int argc, char *argv[]) {
}
], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
[MONOTONIC_CLOCK="cross compiling"])
+
+ LIBS="$LIBS_SAVE"
else
MONOTONIC_CLOCK=no
fi
commit 1c80e04f876e9254b93ef87eadfcff71234340c6
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 20:08:31 2007 +0300
configure.ac: Disable D-Bus config API support by default
This is problematic, so don't even bother with it unless someone wants it.
respeclaration is dead, long live HAL.
diff --git a/configure.ac b/configure.ac
index c80f2ed..ffcc72d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,7 +522,7 @@ AC_ARG_ENABLE(fontcache,
AS_HELP_STRING([--enable-fontcache], [Build FontCa
AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE
extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build
XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval],
[XF86BIGFONT=yes])
AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS
extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
-AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--disable-config-dbus], [Build
D-BUS support (default: auto)]), [CONFIG_DBUS_API=$enableval],
[CONFIG_DBUS_API=auto])
+AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build
D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval],
[CONFIG_DBUS_API=no])
AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build
HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils],
[Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval],
[XF86UTILS=yes])
commit c46663367329615bd2c9b63e93c9534036e5a2ae
Author: Michel Dänzer <[EMAIL PROTECTED]>
Date: Wed Aug 1 18:32:09 2007 +0200
GLX/DRI: Remove some unused variables.
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 051784c..685683d 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -374,15 +374,13 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
{
RegionPtr pRegion = NULL;
PixmapPtr pixmap;
- int w, h, bpp, override = 0;
+ int bpp, override = 0;
GLenum format, type;
ScreenPtr pScreen = glxPixmap->pScreen;
__GLXDRIscreen * const screen =
(__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum);
pixmap = (PixmapPtr) glxPixmap->pDraw;
- w = pixmap->drawable.width;
- h = pixmap->drawable.height;
if (screen->texOffsetStart && screen->driScreen.setTexOffset) {
__GLXpixmap **texOffsetOverride = screen->texOffsetOverride;
@@ -972,7 +970,6 @@ static Bool
glxDRIEnterVT (int index, int flags)
{
__GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
- Bool ret;
LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
commit 17cb4f64e3c39725e83b1e311c09422d7e1c0e52
Author: Michel Dänzer <[EMAIL PROTECTED]>
Date: Wed Aug 1 18:13:18 2007 +0200
GLX_EXT_texture_from_pixmap: Use client provided texture target when
available.
This prevents situations where the server doesn't use the target the
client thinks it does, usually resulting in the texture being sampled as all
white.
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 3038b13..900a347 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1260,13 +1260,15 @@ static int ValidateCreateDrawable(ClientPtr client,
** Create a GLX Pixmap from an X Pixmap.
*/
int DoCreateGLXPixmap(__GLXclientState *cl, XID fbconfigId,
- GLuint screenNum, XID pixmapId, XID glxPixmapId)
+ GLuint screenNum, XID pixmapId, XID glxPixmapId,
+ CARD32 *attribs, CARD32 numAttribs)
{
ClientPtr client = cl->client;
DrawablePtr pDraw;
__GLXpixmap *pGlxPixmap;
__GLcontextModes *modes;
- int retval;
+ GLenum target = 0;
+ int retval, i;
retval = ValidateCreateDrawable (client, screenNum, fbconfigId,
pixmapId, glxPixmapId,
@@ -1292,6 +1294,30 @@ int DoCreateGLXPixmap(__GLXclientState *cl, XID
fbconfigId,
pGlxPixmap->modes = modes;
+ for (i = 0; i < numAttribs; i++) {
+ if (attribs[2 * i] == GLX_TEXTURE_TARGET_EXT) {
+ switch (attribs[2 * i + 1]) {
+ case GLX_TEXTURE_2D_EXT:
+ target = GL_TEXTURE_2D;
+ break;
+ case GLX_TEXTURE_RECTANGLE_EXT:
+ target = GL_TEXTURE_RECTANGLE_ARB;
+ break;
+ }
+ }
+ }
+
+ if (!target) {
+ int w = pDraw->width, h = pDraw->height;
+
+ if (h & (h - 1) || w & (w - 1))
+ target = GL_TEXTURE_RECTANGLE_ARB;
+ else
+ target = GL_TEXTURE_2D;
+ }
+
+ pGlxPixmap->target = target;
+
/*
** Bump the ref count on the X pixmap so it won't disappear.
*/
@@ -1304,14 +1330,16 @@ int __glXDisp_CreateGLXPixmap(__GLXclientState *cl,
GLbyte *pc)
{
xGLXCreateGLXPixmapReq *req = (xGLXCreateGLXPixmapReq *) pc;
return DoCreateGLXPixmap( cl, req->visual, req->screen,
- req->pixmap, req->glxpixmap );
+ req->pixmap, req->glxpixmap, NULL, 0 );
}
int __glXDisp_CreatePixmap(__GLXclientState *cl, GLbyte *pc)
{
xGLXCreatePixmapReq *req = (xGLXCreatePixmapReq *) pc;
return DoCreateGLXPixmap( cl, req->fbconfig, req->screen,
- req->pixmap, req->glxpixmap );
+ req->pixmap, req->glxpixmap,
+ (CARD32*)(req + 1),
+ req->numAttribs );
}
int __glXDisp_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc)
@@ -1319,7 +1347,7 @@ int
__glXDisp_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc)
xGLXCreateGLXPixmapWithConfigSGIXReq *req =
(xGLXCreateGLXPixmapWithConfigSGIXReq *) pc;
return DoCreateGLXPixmap( cl, req->fbconfig, req->screen,
- req->pixmap, req->glxpixmap );
+ req->pixmap, req->glxpixmap, NULL, 0 );
}
@@ -1681,7 +1709,6 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
xGLXGetDrawableAttributesReply reply;
CARD32 attributes[4];
int numAttribs;
- PixmapPtr pixmap;
glxPixmap = (__GLXpixmap *)LookupIDByType(drawId, __glXPixmapRes);
if (!glxPixmap) {
@@ -1696,19 +1723,11 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID
drawId)
reply.numAttribs = numAttribs;
attributes[0] = GLX_TEXTURE_TARGET_EXT;
+ attributes[1] = glxPixmap->target == GL_TEXTURE_2D ? GLX_TEXTURE_2D_EXT :
+ GLX_TEXTURE_RECTANGLE_EXT;
attributes[2] = GLX_Y_INVERTED_EXT;
attributes[3] = GL_FALSE;
- /* XXX this is merely less wrong, see fdo bug #8991 */
- pixmap = (PixmapPtr) glxPixmap->pDraw;
- if ((pixmap->drawable.width & (pixmap->drawable.width - 1)) ||
- (pixmap->drawable.height & (pixmap->drawable.height - 1))
- /* || strstr(CALL_GetString(GL_EXTENSIONS,
- "GL_ARB_texture_non_power_of_two")) */)
- attributes[1] = GLX_TEXTURE_RECTANGLE_EXT;
- else
- attributes[1] = GLX_TEXTURE_2D_EXT;
-
if (client->swapped) {
__glXSwapGetDrawableAttributesReply(client, &reply, attributes);
} else {
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index 1857bc1..12bc030 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -266,7 +266,7 @@ int __glXDispSwap_CreateGLXPixmap(__GLXclientState *cl,
GLbyte *pc)
__GLX_SWAP_INT(&req->glxpixmap);
return DoCreateGLXPixmap( cl, req->visual, req->screen,
- req->pixmap, req->glxpixmap );
+ req->pixmap, req->glxpixmap, NULL, 0 );
}
int __glXDispSwap_CreatePixmap(__GLXclientState *cl, GLbyte *pc)
@@ -279,9 +279,12 @@ int __glXDispSwap_CreatePixmap(__GLXclientState *cl,
GLbyte *pc)
__GLX_SWAP_INT(&req->fbconfig);
__GLX_SWAP_INT(&req->pixmap);
__GLX_SWAP_INT(&req->glxpixmap);
+ __GLX_SWAP_INT(&req->numAttribs);
return DoCreateGLXPixmap( cl, req->fbconfig, req->screen,
- req->pixmap, req->glxpixmap );
+ req->pixmap, req->glxpixmap,
+ (CARD32*)(req + 1),
+ req->numAttribs );
}
int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte
*pc)
@@ -297,7 +300,7 @@ int
__glXDispSwap_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc
__GLX_SWAP_INT(&req->glxpixmap);
return DoCreateGLXPixmap( cl, req->fbconfig, req->screen,
- req->pixmap, req->glxpixmap );
+ req->pixmap, req->glxpixmap, NULL, 0 );
}
int __glXDispSwap_DestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc)
diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h
index 6500cc7..b7ecad9 100644
--- a/GL/glx/glxdrawable.h
+++ b/GL/glx/glxdrawable.h
@@ -54,6 +54,7 @@ typedef struct {
ScreenPtr pScreen;
Bool idExists;
int refcnt;
+ GLenum target;
#ifdef XF86DRI
DamagePtr pDamage;
__DRIcontext *pDRICtx;
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index db564c0..051784c 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -375,7 +375,7 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
RegionPtr pRegion = NULL;
PixmapPtr pixmap;
int w, h, bpp, override = 0;
- GLenum target, format, type;
+ GLenum format, type;
ScreenPtr pScreen = glxPixmap->pScreen;
__GLXDRIscreen * const screen =
(__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum);
@@ -384,11 +384,6 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
w = pixmap->drawable.width;
h = pixmap->drawable.height;
- if (h & (h - 1) || w & (w - 1))
- target = GL_TEXTURE_RECTANGLE_ARB;
- else
- target = GL_TEXTURE_2D;
-
if (screen->texOffsetStart && screen->driScreen.setTexOffset) {
__GLXpixmap **texOffsetOverride = screen->texOffsetOverride;
int i, firstEmpty = 16, texname;
@@ -416,7 +411,7 @@ alreadyin:
glxPixmap->pDRICtx = &((__GLXDRIcontext*)baseContext)->driContext;
- CALL_GetIntegerv(GET_DISPATCH(), (target == GL_TEXTURE_2D ?
+ CALL_GetIntegerv(GET_DISPATCH(), (glxPixmap->target == GL_TEXTURE_2D ?
GL_TEXTURE_BINDING_2D :
GL_TEXTURE_BINDING_RECTANGLE_NV,
&texname));
@@ -481,7 +476,7 @@ nooverride:
pixmap->drawable.y) );
CALL_TexImage2D( GET_DISPATCH(),
- (target,
+ (glxPixmap->target,
0,
bpp == 4 ? 4 : 3,
pixmap->drawable.width,
@@ -511,7 +506,7 @@ nooverride:
pixmap->drawable.y + p[i].y1) );
CALL_TexSubImage2D( GET_DISPATCH(),
- (target,
+ (glxPixmap->target,
0,
p[i].x1, p[i].y1,
p[i].x2 - p[i].x1, p[i].y2 - p[i].y1,
diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h
index dc4cd4a..6774e4d 100644
--- a/GL/glx/glxext.h
+++ b/GL/glx/glxext.h
@@ -80,7 +80,8 @@ extern int DoGetFBConfigs(__GLXclientState *cl, unsigned
screen,
extern int DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
GLXContextID shareList, VisualID visual, GLuint screen, GLboolean
isDirect);
extern int DoCreateGLXPixmap(__GLXclientState *cl, XID fbconfigId,
- GLuint screenNum, XID pixmapId, XID glxpixmapId);
+ GLuint screenNum, XID pixmapId, XID glxpixmapId, CARD32 *attribs,
+ CARD32 numAttribs);
extern int DoDestroyPixmap(__GLXclientState *cl, XID glxpixmapId);
extern int DoQueryContext(__GLXclientState *cl, GLXContextID gcId);
commit a4197db9504adae6af005b2218eee36b8af0d98b
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 14:04:51 2007 +0300
GL: GLX: Make sure glxbyteorder.h is distributed
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index c4141bc..7c1730e 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -40,6 +40,7 @@ libglxdri_la_SOURCES = \
libglx_la_SOURCES = \
g_disptab.h \
+ glxbyteorder.h \
glxcmds.c \
glxcmdsswap.c \
glxcontext.h \
commit ad7421fc764e2b82e20d90f12225a03a1d636f18
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:30:00 2007 +0300
Bump version to 1.3.99.1 for development
This is not actually .1, just bumping for a different devel version.
diff --git a/configure.ac b/configure.ac
index 17da31e..c80f2ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
dnl This is the not the Xorg version number, it's the server version number.
dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.3.99.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.99.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 43e71a54502d9ab28ece7f6296d1416d60948dad
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:16:35 2007 +0300
XFree86: xf1bpp: Fix previous build system commit
Amateur error.
diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 4439f8d..341fe3b 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -173,7 +173,7 @@ mfbtileG.c:
echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
$(libxf1bppmfb_a_SOURCES):
- echo "#include \"mfbmap.h\"" > $$i ; \
- echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i ; \
+ echo "#include \"mfbmap.h\"" > $$i
+ echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i
EXTRA_DIST = mfbmap.sh mfbunmap.sh
commit 6d6bc93b0a13c5356544561e326d4aedf33e61c2
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:11:22 2007 +0300
Build system: Add missing files
A couple of headers weren't added to the build.
diff --git a/config/Makefile.am b/config/Makefile.am
index 0efd6ce..056f30e 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = @DIX_CFLAGS@
noinst_LIBRARIES = libconfig.a
-libconfig_a_SOURCES = config.c
+libconfig_a_SOURCES = config.c config-backends.h
if HAVE_DBUS
AM_CFLAGS += @DBUS_CFLAGS@
diff --git a/include/Makefile.am b/include/Makefile.am
index 4289b81..96d98b5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -47,6 +47,7 @@ sdk_HEADERS = \
validate.h \
window.h \
windowstr.h \
+ xkbsrv.h \
xorg-server.h
endif
commit 505ec436af3a173e0ba32c6f14b4cf9837a553eb
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:11:08 2007 +0300
XFree86: Properly clean up after ourselves
CLEAN is not a useful variable. CLEANFILES/DISTCLEANFILES, on the other
hand,
are useful variables.
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index cef6b5b..ca7dda1 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -71,7 +71,7 @@ Xorg_LDADD = $(XORG_LIBS) \
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
BUILT_SOURCES = xorg.conf.example
-CLEAN = xorg.conf.example xorg.conf.example.pre
+DISTCLEANFILES += xorg.conf.example xorg.conf.example.pre
EXTRA_DIST = xorgconf.cpp
if SOLARIS_ASM_INLINE
commit 1ace9770fed4a2ba354ff06a96189428beb36088
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:10:38 2007 +0300
Build system: Non-dtrace distcheck hacks
automake 1.10 really wants foo.c for foo.O, so give it some dummy files to
deal with if it really needs them.
diff --git a/dix/Makefile.am b/dix/Makefile.am
index a1f02c1..3c92a4a 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -57,3 +57,8 @@ noinst_PROGRAMS = dix.O
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
ld -r -o $@ .libs/*.o
endif
+
+dix.c:
+ touch $@
+
+CLEANFILES = dix.c
diff --git a/os/Makefile.am b/os/Makefile.am
index c5e7b03..53b2d7f 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -59,5 +59,9 @@ noinst_PROGRAMS = os.O
os.O: dtrace.o $(am_libos_la_OBJECTS)
ld -r -o $@ dtrace.o .libs/*.o
-
endif
+
+os.c:
+ touch $@
+
+CLEANFILES = os.c
commit cacbdf18ee771d43228c2e96e8ef9a32251ceb55
Author: Daniel Drake <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:08:37 2007 +0300
Remove duplicated licenses
Some files had two copies of the same license.
diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h
index c55a5f9..82d1f2d 100644
--- a/hw/xfree86/xf4bpp/ppcGCstr.h
+++ b/hw/xfree86/xf4bpp/ppcGCstr.h
@@ -20,28 +20,6 @@
* SOFTWARE.
*
*/
-/***********************************************************
- Copyright IBM Corporation 1988
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of IBM not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c
index 734ec5f..1832252 100644
--- a/hw/xprint/pcl/PclInit.c
+++ b/hw/xprint/pcl/PclInit.c
@@ -44,38 +44,6 @@ dealings in this Software without prior written
authorization from said
copyright holders.
*/
-/*
-(c) Copyright 1996 Hewlett-Packard Company
-(c) Copyright 1996 International Business Machines Corp.
-(c) Copyright 1996 Sun Microsystems, Inc.
-(c) Copyright 1996 Novell, Inc.
-(c) Copyright 1996 Digital Equipment Corp.
-(c) Copyright 1996 Fujitsu Limited
-(c) Copyright 1996 Hitachi, Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the copyright holders shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from said
-copyright holders.
-*/
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
commit bd49332e4772bd57ffb76c829f0e4770ab876057
Author: Daniel Drake <[EMAIL PROTECTED]>
Date: Wed Aug 1 08:07:08 2007 +0300
Add proper COPYING file
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).
There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.
Here is a description of the process I used:
tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2
cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim
egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
| grep -v "\.in$" | xargs gvim
cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
diff -urNp xorg-server-1.1.1 xorg-server-1.3.0.0
git clone git://anongit.freedesktop.org/git/xorg/xserver
cd xserver
git diff xorg-server-1.3.0.0..
For each file, licenses have been aggregated as follows:
If 2 files have identical license text but different copyright notices,
the copyright notices are aggregated and the license text
is included only once.
Note that by identical I mean really identical, i.e.:
'AUTHOR(S)' is not the same as 'AUTHORS'
'KEITH PACKARD DISCLAIMS' is not the same as 'KEITH PACKARD AND COMPAQ
DISCLAIM'
Otherwise, licenses and accompanying copyright notices have been
stacked.
When going through the changes from 1.1.1 to 1.3.0.0 then HEAD, licenses
have been added and removed (so I have reflected this since the original
version of my COPYING file). It's slightly concerning to see that even
between 1.3.0.0 and HEAD, new license permutations are being added. I'd
suggest that a primary license be chosen and this would be indicated at
the top of this COPYING file.
diff --git a/COPYING b/COPYING
index bb34bdb..097ef98 100644
--- a/COPYING
+++ b/COPYING
@@ -28,19 +28,19 @@ Permission to use, copy, modify, distribute, and sell this
software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
+documentation, and that the names of Orest Zborowski and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
the software without specific, written prior permission. Orest Zborowski
-and David Wexelblat make no representations about the suitability of this
-software for any purpose. It is provided "as is" without express or
+and David Wexelblat make no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
implied warranty.
-THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -167,11 +167,11 @@ fee is hereby granted, provided that the above copyright
no-
tice appear in all copies and that both that copyright no-
tice and this permission notice appear in supporting docu-
mentation, and that the names of Sun or X Consortium
-not be used in advertising or publicity pertaining to
-distribution of the software without specific prior
-written permission. Sun and X Consortium make no
-representations about the suitability of this software for
-any purpose. It is provided "as is" without any express or
+not be used in advertising or publicity pertaining to
+distribution of the software without specific prior
+written permission. Sun and X Consortium make no
+representations about the suitability of this software for
+any purpose. It is provided "as is" without any express or
implied warranty.
SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
@@ -193,11 +193,11 @@ fee is hereby granted, provided that the above copyright
no-
tice appear in all copies and that both that copyright no-
tice and this permission notice appear in supporting docu-
mentation, and that the names of Sun or The Open Group
-not be used in advertising or publicity pertaining to
-distribution of the software without specific prior
-written permission. Sun and The Open Group make no
-representations about the suitability of this software for
-any purpose. It is provided "as is" without any express or
+not be used in advertising or publicity pertaining to
+distribution of the software without specific prior
+written permission. Sun and The Open Group make no
+representations about the suitability of this software for
+any purpose. It is provided "as is" without any express or
implied warranty.
SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
@@ -237,13 +237,13 @@ Copyright 1991, 1993 Olivetti Research Limited,
Cambridge, England.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -280,13 +280,13 @@ OR PERFORMANCE OF THIS SOFTWARE.
Copyright 1987-1992 by Digital Equipment Corp., Maynard, MA
X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL AND ABSOL-PUTER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -300,7 +300,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copyright 1997 Digital Equipment Corporation.
All rights reserved.
-This software is furnished under license and may be used and copied only in
+This software is furnished under license and may be used and copied only in
accordance with the following terms and conditions. Subject to these
conditions, you may download, copy, install, use, modify and distribute
this software in source and/or binary form. No title or ownership is
@@ -310,7 +310,7 @@ transferred hereby.
this copyright notice and list of conditions as they appear in the
source file.
-2) No right is granted to use any trade name, trademark, or logo of Digital
+2) No right is granted to use any trade name, trademark, or logo of Digital
Equipment Corporation. Neither the "Digital Equipment Corporation"
name nor any trademark or logo of Digital Equipment Corporation may be
used to endorse or promote products derived from this software without
@@ -322,9 +322,9 @@ transferred hereby.
In no event shall DIGITAL be liable for any damages whatsoever, and in
particular, DIGITAL shall not be liable for special, indirect,
consequential, or incidental damages or damages for lost profits, loss
- of revenue or loss of use, whether such damages arise in contract,
+ of revenue or loss of use, whether such damages arise in contract,
negligence, tort, under statute, in equity, at law or otherwise, even
- if advised of the possibility of such damage.
+ if advised of the possibility of such damage.
Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard,
Massachusetts.
@@ -359,19 +359,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -536,8 +536,8 @@ all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-RED HAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+RED HAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -654,7 +654,7 @@ All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
+provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of IBM not be
used in advertising or publicity pertaining to distribution of the
@@ -719,7 +719,7 @@ SOFTWARE.
Copyright (c) 1997 Metro Link Incorporated
Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
+copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
@@ -797,7 +797,7 @@ Software is furnished to do so, subject to the following
conditions:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
