![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package xgl checked in at Wed Apr 19 15:52:46 CEST 2006. -------- --- xgl/xgl.changes 2006-04-14 18:43:01.000000000 +0200 +++ STABLE/xgl/xgl.changes 2006-04-19 01:07:33.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 19 01:06:05 CEST 2006 - dreveman@suse.de + +- Fix YUV conversion issue. +- Fix support for running mutiple servers. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.DqUzld/_old 2006-04-19 15:52:06.000000000 +0200 +++ /var/tmp/diff_new_pack.DqUzld/_new 2006-04-19 15:52:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xgl (Version cvs_060414) +# spec file for package xgl (Version cvs_060419) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,7 +22,7 @@ Obsoletes: Xglx xglx PreReq: %fillup_prereq Autoreqprov: on -Version: cvs_060414 +Version: cvs_060419 Release: 1 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -145,6 +145,9 @@ /etc/X11/xgl-cards-white-list %changelog -n xgl +* Wed Apr 19 2006 - dreveman@suse.de +- Fix YUV conversion issue. +- Fix support for running mutiple servers. * Fri Apr 14 2006 - dreveman@suse.de - Optimize same cases of texture loading. Makes some applications more resposive. ++++++ xorg-server-1.1.99.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/ChangeLog new/xorg-server-1.1.99.1/ChangeLog --- old/xorg-server-1.1.99.1/ChangeLog 2006-04-13 15:42:05.000000000 +0200 +++ new/xorg-server-1.1.99.1/ChangeLog 2006-04-19 00:08:42.000000000 +0200 @@ -1,3 +1,16 @@ +2006-04-19 David Reveman <davidr@novell.com> + + * hw/xgl/glx/xglx.c: Pass display offset to xglxInitXorg. + + * hw/xgl/glx/xglx.h: + * hw/xgl/glx/xglxorg.c: Use offset for xorg display so that more than + one server can be started. + +2006-04-18 David Reveman <davidr@novell.com> + + * fb/fbmmx.c (fbCompositeSrc_yv12x8888mmx): Translate U, V start + pointers correctly and set srcEnd correctly. + 2006-04-13 David Reveman <davidr@novell.com> * hw/xgl/xglparse.c (xglProcessArgument, xglUseMsg): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/mesa/main/Makefile.am new/xorg-server-1.1.99.1/GL/mesa/main/Makefile.am --- old/xorg-server-1.1.99.1/GL/mesa/main/Makefile.am 2006-04-13 21:50:51.000000000 +0200 +++ new/xorg-server-1.1.99.1/GL/mesa/main/Makefile.am 2006-04-13 22:12:31.000000000 +0200 @@ -25,7 +25,6 @@ api_noop.c \ api_validate.c \ attrib.c \ - bitset.h \ blend.c \ bufferobj.c \ buffers.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/mesa/main/Makefile.in new/xorg-server-1.1.99.1/GL/mesa/main/Makefile.in --- old/xorg-server-1.1.99.1/GL/mesa/main/Makefile.in 2006-04-13 21:51:07.000000000 +0200 +++ new/xorg-server-1.1.99.1/GL/mesa/main/Makefile.in 2006-04-13 22:14:11.000000000 +0200 @@ -554,7 +554,6 @@ api_noop.c \ api_validate.c \ attrib.c \ - bitset.h \ blend.c \ bufferobj.c \ buffers.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/fb/fbmmx.c new/xorg-server-1.1.99.1/fb/fbmmx.c --- old/xorg-server-1.1.99.1/fb/fbmmx.c 2006-04-13 16:24:59.000000000 +0200 +++ new/xorg-server-1.1.99.1/fb/fbmmx.c 2006-04-18 22:31:47.000000000 +0200 @@ -2711,8 +2711,8 @@ pSrc->transform->matrix[1][2] == (pSrc->pDrawable->height << 16)) { srcY = srcY + ((pSrc->pDrawable->height >> 0) - 1) * srcStride; - srcU = srcU + ((pSrc->pDrawable->height >> 1) - 0) * uvStride; - srcV = srcV + ((pSrc->pDrawable->height >> 1) - 0) * uvStride; + srcU = srcU + ((pSrc->pDrawable->height >> 1) - 1) * uvStride; + srcV = srcV + ((pSrc->pDrawable->height >> 1) - 1) * uvStride; srcStride = -srcStride; uvStride = -uvStride; @@ -2730,7 +2730,7 @@ CARD8 *ps, *ps0, *ps1; int x, x0, y, line, xStep, yStep; int distx, idistx, disty, idisty; - int srcEnd = (pSrc->pDrawable->width - 1) << 16; + int srcEnd = pSrc->pDrawable->width << 16; x0 = pSrc->transform->matrix[0][2] + ((xSrc + srcXoff) << 16); y = pSrc->transform->matrix[1][2] + ((ySrc + srcYoff) << 16); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c new/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c --- old/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c 2006-04-07 08:22:24.000000000 +0200 +++ new/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c 2006-04-18 23:14:44.000000000 +0200 @@ -136,6 +136,7 @@ static Bool softCursor = FALSE; static Bool fullscreen = TRUE; static Bool xDpms = FALSE; +static int displayOffset = 0; static Bool randrExtension = FALSE; static int randrEvent, randrError; @@ -1388,6 +1389,8 @@ if (xDisplayName) fullscreen = FALSE; + displayOffset = atoi (display + 1); + checkDisplayName = TRUE; } @@ -1447,7 +1450,7 @@ char *name = xDisplayName; if (!name) - name = xglxInitXorg (); + name = xglxInitXorg (displayOffset); xdisplay = XOpenDisplay (name); if (!xdisplay) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glx/xglx.h new/xorg-server-1.1.99.1/hw/xgl/glx/xglx.h --- old/xorg-server-1.1.99.1/hw/xgl/glx/xglx.h 2006-04-04 15:27:23.000000000 +0200 +++ new/xorg-server-1.1.99.1/hw/xgl/glx/xglx.h 2006-04-18 23:13:02.000000000 +0200 @@ -140,7 +140,7 @@ xglxAbortXorg (void); char * -xglxInitXorg (void); +xglxInitXorg (int displayOffset); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glx/xglxorg.c new/xorg-server-1.1.99.1/hw/xgl/glx/xglxorg.c --- old/xorg-server-1.1.99.1/hw/xgl/glx/xglxorg.c 2006-04-04 19:23:40.000000000 +0200 +++ new/xorg-server-1.1.99.1/hw/xgl/glx/xglxorg.c 2006-04-18 23:12:41.000000000 +0200 @@ -55,8 +55,11 @@ static char *xorgProgs[] = { "/usr/bin/Xorg", "/usr/X11R6/bin/Xorg" }; static char *xorgProg = NULL; -static char *xorgDisplay = ":93"; -static char *xorgTerminate = "-terminate"; +static char xorgDisplayBuf[256]; +static char *xorgDisplay = NULL; +static int xorgDisplayOffset = 93; + +static char *xorgTerminate = "-terminate"; static pid_t xorgPid = 0; static int receivedUsr1 = 0; @@ -538,7 +541,7 @@ } char * -xglxInitXorg (void) +xglxInitXorg (int displayOffset) { sighandler_t oldSigUsr1; pid_t pid; @@ -591,6 +594,12 @@ if (!xglxAddXorgArguments (auth, sizeof (auth) / sizeof (char *))) return 0; + if (!xorgDisplay) + { + xorgDisplay = xorgDisplayBuf; + sprintf (xorgDisplay, ":%d", xorgDisplayOffset + displayOffset); + } + if (!xglxAddXorgArguments (&xorgDisplay, 1)) return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de