Hello community, here is the log from the commit of package xorg-x11-server checked in at Mon Dec 18 15:48:24 CET 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-12-02 22:39:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2006-12-15 16:49:47.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 13 18:26:05 CET 2006 - sndirsch@suse.de + +- libdrm.diff: + * no longer fail when some driver tries to load "drm" module + +------------------------------------------------------------------- +Tue Dec 12 05:37:31 CET 2006 - sndirsch@suse.de + +- xorg-server-1.1.99.901-GetDrawableAttributes.patch: + * hopefully fixes AIGLX issues (X.Org Bug #8991) + +------------------------------------------------------------------- +Fri Dec 8 20:56:59 CET 2006 - sndirsch@suse.de + +- another 64bit warning fix + +------------------------------------------------------------------- New: ---- libdrm.diff xorg-server-1.1.99.901-GetDrawableAttributes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.sVJF6k/_old 2006-12-18 15:47:23.000000000 +0100 +++ /var/tmp/diff_new_pack.sVJF6k/_new 2006-12-18 15:47:23.000000000 +0100 @@ -17,7 +17,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 30 +Release: 31 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -67,6 +67,8 @@ Patch32: acpi_events.diff Patch33: p_pci-off-by-one.diff Patch34: Mesa-6.5.2.diff +Patch35: xorg-server-1.1.99.901-GetDrawableAttributes.patch +Patch36: libdrm.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -136,6 +138,8 @@ %patch32 -p1 %patch33 -p0 %patch34 -p0 +%patch35 -p1 +%patch36 -p0 %build autoreconf -fi @@ -440,6 +444,14 @@ %endif %changelog -n xorg-x11-server +* Wed Dec 13 2006 - sndirsch@suse.de +- libdrm.diff: + * no longer fail when some driver tries to load "drm" module +* Tue Dec 12 2006 - sndirsch@suse.de +- xorg-server-1.1.99.901-GetDrawableAttributes.patch: + * hopefully fixes AIGLX issues (X.Org Bug #8991) +* Fri Dec 08 2006 - sndirsch@suse.de +- another 64bit warning fix * Sat Dec 02 2006 - sndirsch@suse.de - X.Org 7.2RC3 release * Add a -showDefaultModulePath option. ++++++ 64bit.diff ++++++ --- /var/tmp/diff_new_pack.sVJF6k/_old 2006-12-18 15:47:23.000000000 +0100 +++ /var/tmp/diff_new_pack.sVJF6k/_new 2006-12-18 15:47:23.000000000 +0100 @@ -11,3 +11,13 @@ for (i = 0; i < size; i++) ErrorF("%d: %s\n", i, strings[i]); free(strings); +--- hw/xfree86/dri/drimodule.c.orig 2006-12-08 20:54:05.218730315 +0100 ++++ hw/xfree86/dri/drimodule.c 2006-12-08 20:54:46.246132159 +0100 +@@ -88,6 +88,6 @@ + drmSetServerInfo(&DRIDRMServerInfo); + + /* Need a non-NULL return value to indicate success */ +- return 1; ++ return (pointer) 1; + } + ++++++ libdrm.diff ++++++ --- hw/xfree86/common/xf86Helper.c.orig 2006-12-13 16:21:35.000000000 +0100 +++ hw/xfree86/common/xf86Helper.c 2006-12-13 18:23:53.000000000 +0100 @@ -2386,22 +2386,29 @@ _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) { pointer ret; int errmaj = 0, errmin = 0; ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL, &errmaj, &errmin); if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); + + /* "drm" module has been merged into "dri" module, but some drivers + are still trying to load it explictely and fail if it doesn't exist :-( */ + if (!ret && !strcmp(name,"drm")) { + ret = (pointer) -1; + } + return ret; } /* * xf86LoadOneModule loads a single module. */ _X_EXPORT pointer xf86LoadOneModule(char *name, pointer opt) { int errmaj, errmin; char *Name; ++++++ xorg-server-1.1.99.901-GetDrawableAttributes.patch ++++++ --- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800 +++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800 @@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di /*****************************************************************/ /* tree depth = 13 */ -static const int_fast16_t VendorPriv_dispatch_tree[155] = { +static const int_fast16_t VendorPriv_dispatch_tree[159] = { /* [0] -> opcode range [0, 131072], node depth 1 */ 2, 5, @@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis /* [152] -> opcode range [65536, 65552], node depth 13 */ 1, LEAF(88), + 156, EMPTY_LEAF, + /* [156] -> opcode range [65544, 65552], node depth 13 */ + 1, + LEAF(96), + EMPTY_LEAF, }; -static const void *VendorPriv_function_table[96][2] = { +static const void *VendorPriv_function_table[99][2] = { /* [ 0] = 0 */ {NULL, NULL}, /* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT}, /* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT}, @@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX}, /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX}, /* [ 95] = 65543 */ {NULL, NULL}, + /* [ 96] = 65544 */ {NULL, NULL}, + /* [ 97] = 65545 */ {NULL, NULL}, + /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX}, }; const struct __glXDispatchInfo VendorPriv_dispatch_info = { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org