Hello community,
here is the log from the commit of package xorg-x11-server
checked in at Fri Jul 11 02:26:04 CEST 2008.
--------
--- xorg-x11-server/xorg-x11-server.changes 2008-07-08 08:58:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2008-07-10 14:48:06.346719000 +0200
@@ -1,0 +2,29 @@
+Thu Jul 10 10:27:18 CEST 2008 - sndirsch@suse.de
+
+- xorg-server-xf4vnc-TranslateNone.diff
+ * supposed to fix Xvnc crash when VNC client is running on a
+ display with the same color depth (bnc #389386)
+- ppc.diff
+ * fixes build on ppc/ppc64
+
+-------------------------------------------------------------------
+Thu Jul 10 09:34:11 CEST 2008 - sndirsch@suse.de
+
+- enabled build of Xvnc/libvnc
+- xorg-server-xf4vnc-disable-dmxvnc.diff
+ * disabled VNC feature in DMX to fix VNC build
+
+-------------------------------------------------------------------
+Thu Jul 10 08:56:00 CEST 2008 - sndirsch@suse.de
+
+- updated to new vnc patch "xorg-server-xf4vnc.patch "by Dan
+ Nicholson, which is still disabled due to build errors
+- obsoletes the following patches:
+ * xorg-server-1.4-vnc-64bit.diff
+ * xorg-server-1.4-vnc-disable_render.diff
+ * xorg-server-1.4-vnc-fix.patch
+ * xorg-server-1.4-vnc-memory.diff
+ * xorg-server-1.4-vnc-render_sig11.diff
+ * xorg-server-1.4-vnc.patch
+
+-------------------------------------------------------------------
Old:
----
xorg-server-1.4-vnc-64bit.diff
xorg-server-1.4-vnc-disable_render.diff
xorg-server-1.4-vnc-fix.patch
xorg-server-1.4-vnc-memory.diff
xorg-server-1.4-vnc.patch
xorg-server-1.4-vnc-render_sig11.diff
New:
----
ppc.diff
xorg-server-xf4vnc-disable-dmxvnc.diff
xorg-server-xf4vnc.patch
xorg-server-xf4vnc-TranslateNone.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.b19439/_old 2008-07-11 02:25:41.000000000 +0200
+++ /var/tmp/diff_new_pack.b19439/_new 2008-07-11 02:25:41.000000000 +0200
@@ -14,8 +14,7 @@
Name: xorg-x11-server
%define dirsuffix 1.4.99.905
%define fglrx_driver_hack 0
-### FIXME
-%define vnc 0
+%define vnc 1
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
%if %vnc
BuildRequires: libjpeg-devel
@@ -23,7 +22,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.3
-Release: 115
+Release: 117
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -65,10 +64,10 @@
Patch36: libdrm.diff
%if %vnc
### Dan Nicholson
-#http://www.linuxfromscratch.org/~dnicholson/patches/xorg-server-1.4-vnc.patc...
-Patch39: xorg-server-1.4-vnc.patch
-Patch40: xorg-server-1.4-vnc-fix.patch
-Patch43: xorg-server-1.4-vnc-64bit.diff
+#http://people.freedesktop.org/~dbn/xorg-server-xf4vnc.patch
+Patch39: xorg-server-xf4vnc.patch
+Patch40: xorg-server-xf4vnc-disable-dmxvnc.diff
+Patch42: xorg-server-xf4vnc-TranslateNone.diff
%endif
Patch41: loadmod-bug197195.diff
Patch45: bug-197858_dpms.diff
@@ -82,17 +81,15 @@
Patch93: pixman.diff
Patch99: commit-50e80c3.diff
Patch101: zap_warning_xserver.diff
-Patch102: xorg-server-1.4-vnc-memory.diff
Patch103: confine_to_shape.diff
Patch104: bitmap_always_unscaled.diff
Patch106: randr1_1-sig11.diff
Patch109: events.diff
-Patch110: xorg-server-1.4-vnc-disable_render.diff
-Patch111: xorg-server-1.4-vnc-render_sig11.diff
Patch112: fix-dpi-values.diff
Patch113: no-return-in-nonvoid-function.diff
Patch114: 64bit-portability-issue.diff
Patch115: commit-a18551c.diff
+Patch116: ppc.diff
%description
This package contains the X.Org Server.
@@ -179,12 +176,8 @@
%patch36 -p0
%if %vnc
%patch39 -p1
-%patch40 -p1
-%patch43 -p0
-%patch102 -p1
-### disabled since it broke 24bit color depth support (Bug #390011)
-#%patch110 -p0
-%patch111 -p0
+%patch40 -p0
+%patch42 -p1
chmod 755 hw/vnc/symlink-vnc.sh
%endif
%patch41 -p1
@@ -211,6 +204,9 @@
%patch113 -p0
%patch114 -p0
%patch115 -p1
+%ifarch ppc ppc64
+%patch116 -p1
+%endif
%build
pushd xorg-docs-*
@@ -327,11 +323,6 @@
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia
%endif
%if %vnc
-%ifarch s390 s390x
-rm $RPM_BUILD_ROOT/mfb.h
-%endif
-%endif
-%if %vnc
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
cat > $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name} << EOF
## Name: VNC Server
@@ -530,6 +521,26 @@
%endif
%changelog
+* Thu Jul 10 2008 sndirsch@suse.de
+- xorg-server-xf4vnc-TranslateNone.diff
+ * supposed to fix Xvnc crash when VNC client is running on a
+ display with the same color depth (bnc #389386)
+- ppc.diff
+ * fixes build on ppc/ppc64
+* Thu Jul 10 2008 sndirsch@suse.de
+- enabled build of Xvnc/libvnc
+- xorg-server-xf4vnc-disable-dmxvnc.diff
+ * disabled VNC feature in DMX to fix VNC build
+* Thu Jul 10 2008 sndirsch@suse.de
+- updated to new vnc patch "xorg-server-xf4vnc.patch "by Dan
+ Nicholson, which is still disabled due to build errors
+- obsoletes the following patches:
+ * xorg-server-1.4-vnc-64bit.diff
+ * xorg-server-1.4-vnc-disable_render.diff
+ * xorg-server-1.4-vnc-fix.patch
+ * xorg-server-1.4-vnc-memory.diff
+ * xorg-server-1.4-vnc-render_sig11.diff
+ * xorg-server-1.4-vnc.patch
* Tue Jul 08 2008 sndirsch@suse.de
- commit-a18551c.diff
* Fix GLX in Xvfb and kdrive.
++++++ ppc.diff ++++++
diff -u -r -p xorg-server-1.4.99.905.orig//Xext/panoramiX.c xorg-server-1.4.99.905/Xext/panoramiX.c
--- xorg-server-1.4.99.905.orig//Xext/panoramiX.c 2008-06-30 20:11:03.000000000 +0000
+++ xorg-server-1.4.99.905/Xext/panoramiX.c 2008-07-10 10:31:28.675430884 +0000
@@ -1099,14 +1099,8 @@ ProcPanoramiXDispatch (ClientPtr client)
return BadRequest;
}
-
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
-#define SHIFT_L(v,s) (v) << (s)
-#define SHIFT_R(v,s) (v) >> (s)
-#else
#define SHIFT_L(v,s) (v) >> (s)
#define SHIFT_R(v,s) (v) << (s)
-#endif
static void
CopyBits(char *dst, int shiftL, char *src, int bytes)
diff -u -r -p xorg-server-1.4.99.905.orig//dix/colormap.c xorg-server-1.4.99.905/dix/colormap.c
--- xorg-server-1.4.99.905.orig//dix/colormap.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/dix/colormap.c 2008-07-10 10:31:28.765431880 +0000
@@ -281,9 +281,6 @@ CreateColormap (Colormap mid, ScreenPtr
#if defined(_XSERVER64)
pmap->pad0 = 0;
pmap->pad1 = 0;
-#if (X_BYTE_ORDER == X_LITTLE_ENDIAN)
- pmap->pad2 = 0;
-#endif
#endif
pmap->red = (EntryPtr)((char *)pmap + sizeof(ColormapRec));
sizebytes = size * sizeof(Entry);
diff -u -r -p xorg-server-1.4.99.905.orig//glx/glxdri.c xorg-server-1.4.99.905/glx/glxdri.c
--- xorg-server-1.4.99.905.orig//glx/glxdri.c 2008-06-26 21:14:44.000000000 +0000
+++ xorg-server-1.4.99.905/glx/glxdri.c 2008-07-10 10:31:29.025434759 +0000
@@ -465,9 +465,7 @@ nooverride:
bpp = 4;
format = GL_BGRA;
type =
-#if X_BYTE_ORDER == X_BIG_ENDIAN
!override ? GL_UNSIGNED_INT_8_8_8_8_REV :
-#endif
GL_UNSIGNED_BYTE;
} else {
bpp = 2;
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/common/xf86xv.c xorg-server-1.4.99.905/hw/xfree86/common/xf86xv.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/common/xf86xv.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/common/xf86xv.c 2008-07-10 10:31:28.965434095 +0000
@@ -2013,29 +2013,18 @@ xf86XVCopyYUV12ToPacked(
Y = srcy; V = srcv; U = srcu;
i = w;
while (i >= 4) {
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
- Dst[1] = Y[2] | (Y[3] << 16) | (U[1] << 8) | (V[1] << 24);
- Dst[2] = Y[4] | (Y[5] << 16) | (U[2] << 8) | (V[2] << 24);
- Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24);
-#else
/* This assumes a little-endian framebuffer */
Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1];
Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2];
Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3];
-#endif
Dst += 4; Y += 8; V += 4; U += 4;
i -= 4;
}
while (i--) {
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
-#else
/* This assumes a little-endian framebuffer */
Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
-#endif
Dst++; Y += 2; V++; U++;
}
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/int10/generic.c xorg-server-1.4.99.905/hw/xfree86/int10/generic.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/int10/generic.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/int10/generic.c 2008-07-10 10:31:28.915433541 +0000
@@ -449,20 +449,12 @@ read_b(xf86Int10InfoPtr pInt, int addr)
static CARD16
read_w(xf86Int10InfoPtr pInt, int addr)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 1) > 0)
- return V_ADDR_RW(addr);
-#endif
return V_ADDR_RB(addr) | (V_ADDR_RB(addr + 1) << 8);
}
static CARD32
read_l(xf86Int10InfoPtr pInt, int addr)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 3) > 2)
- return V_ADDR_RL(addr);
-#endif
return V_ADDR_RB(addr) |
(V_ADDR_RB(addr + 1) << 8) |
(V_ADDR_RB(addr + 2) << 16) |
@@ -478,10 +470,6 @@ write_b(xf86Int10InfoPtr pInt, int addr,
static void
write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 1) > 0)
- { V_ADDR_WW(addr, val); }
-#endif
V_ADDR_WB(addr, val);
V_ADDR_WB(addr + 1, val >> 8);
}
@@ -489,10 +477,6 @@ write_w(xf86Int10InfoPtr pInt, int addr,
static void
write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 3) > 2)
- { V_ADDR_WL(addr, val); }
-#endif
V_ADDR_WB(addr, val);
V_ADDR_WB(addr + 1, val >> 8);
V_ADDR_WB(addr + 2, val >> 16);
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/modes/xf86Cursors.c xorg-server-1.4.99.905/hw/xfree86/modes/xf86Cursors.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/modes/xf86Cursors.c 2008-06-30 20:11:03.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/modes/xf86Cursors.c 2008-07-10 10:31:28.915433541 +0000
@@ -137,6 +137,7 @@ cursor_bitpos (int flags, int x, Bool ma
mask = !mask;
if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
x = (x & ~3) | (3 - (x & 3));
+#define X_BYTE_ORDER X_BIG_ENDIAN
if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
(X_BYTE_ORDER == X_BIG_ENDIAN))
x = (x & ~7) | (7 - (x & 7));
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/vbe/vbe.c xorg-server-1.4.99.905/hw/xfree86/vbe/vbe.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/vbe/vbe.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/vbe/vbe.c 2008-07-10 10:31:28.925433652 +0000
@@ -23,14 +23,9 @@
#define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
-#define B_O16(x) (x)
-#define B_O32(x) (x)
-#else
#define B_O16(x) ((((x) & 0xff) << 8) | (((x) & 0xff) >> 8))
#define B_O32(x) ((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) \
| (((x) & 0xff0000) >> 8) | (((x) & 0xff000000) >> 24))
-#endif
#define L_ADD(x) (B_O32(x) & 0xffff) + ((B_O32(x) >> 12) & 0xffff00)
#define FARP(p) (((unsigned)(p & 0xffff0000) >> 12) | (p & 0xffff))
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaaPCache.c xorg-server-1.4.99.905/hw/xfree86/xaa/xaaPCache.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaaPCache.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/xaa/xaaPCache.c 2008-07-10 10:31:28.895433320 +0000
@@ -1081,21 +1081,12 @@ XAAInitPixmapCache(
CACHEINIT(pScrn) = 1;
}
-#if X_BYTE_ORDER == X_BIG_ENDIAN
static CARD32 StippleMasks[4] = {
0x80808080,
0xC0C0C0C0,
0x00000000,
0xF0F0F0F0
};
-#else
-static CARD32 StippleMasks[4] = {
- 0x01010101,
- 0x03030303,
- 0x00000000,
- 0x0F0F0F0F
-};
-#endif
Bool
XAACheckStippleReducibility(PixmapPtr pPixmap)
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaacexp.h xorg-server-1.4.99.905/hw/xfree86/xaa/xaacexp.h
--- xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaacexp.h 2008-04-10 18:58:01.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/xaa/xaacexp.h 2008-07-10 10:31:28.895433320 +0000
@@ -12,13 +12,8 @@
#define CHECKRETURN(b) if(width <= ((b) * 32)) return(base)
#endif
-#if X_BYTE_ORDER == X_BIG_ENDIAN
# define SHIFT_L(value, shift) ((value) >> (shift))
# define SHIFT_R(value, shift) ((value) << (shift))
-#else
-# define SHIFT_L(value, shift) ((value) << (shift))
-# define SHIFT_R(value, shift) ((value) >> (shift))
-#endif
#ifndef MSBFIRST
# ifdef FIXEDBASE
diff -u -r -p xorg-server-1.4.99.905.orig//include/colormapst.h xorg-server-1.4.99.905/include/colormapst.h
--- xorg-server-1.4.99.905.orig//include/colormapst.h 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/include/colormapst.h 2008-07-10 10:31:29.035434870 +0000
@@ -108,9 +108,6 @@ typedef struct _ColormapRec
XID pad1;
#endif
XID mid; /* client's name for colormap */
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
- XID pad2;
-#endif
ScreenPtr pScreen; /* screen map is associated with */
short flags; /* 1 = IsDefault
* 2 = AllAllocated */
++++++ xorg-server-xf4vnc-disable-dmxvnc.diff ++++++
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am ./hw/dmx/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/Makefile.am 2008-07-10 07:21:28.000000000 +0000
@@ -1,6 +1,6 @@
DIST_SUBDIRS = input vnc config glxProxy examples doc
-SUBDIRS = input vnc config examples
+SUBDIRS = input config examples
bin_PROGRAMS = Xdmx
if XINERAMA
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h ./hw/dmx/dmx-config.h
--- ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/dmx-config.h 2008-07-10 07:19:44.000000000 +0000
@@ -72,8 +72,8 @@
/* Enable the DMX extension */
#define DMXEXT
-/* Enable VNC ability */
-#define DMXVNC 1
+/* Disable VNC ability */
+#undef DMXVNC
/* Disable the extensions that are not currently supported */
#undef BEZIER
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/input/Makefile.am ./hw/dmx/input/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/input/Makefile.am 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/input/Makefile.am 2008-07-10 07:20:43.000000000 +0000
@@ -65,7 +65,6 @@
-I$(top_srcdir)/hw/xfree86/common \
$(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \
- -DDMXVNC=1 \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/vnc/Makefile.am ./hw/dmx/vnc/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/vnc/Makefile.am 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/vnc/Makefile.am 2008-07-10 07:18:02.000000000 +0000
@@ -37,7 +37,6 @@
-I$(top_srcdir)/hw/xfree86/common \
-DHAVE_DMX_CONFIG_H \
$(DIX_CFLAGS) \
- -DDMXVNC=1 \
@DMXMODULES_CFLAGS@
###EXTRA_DIST = dmxdetach.c
++++++ xorg-server-xf4vnc.patch ++++++
++++ 24035 lines (skipped)
++++++ xorg-server-xf4vnc-TranslateNone.diff ++++++
diff -u -r -p xorg-server-1.4.0.90.old//hw/vnc/translate.c xorg-server-1.4.0.90/hw/vnc/translate.c
--- xorg-server-1.4.0.90.old//hw/vnc/translate.c 2008-07-03 18:59:24.000000000 +0200
+++ xorg-server-1.4.0.90/hw/vnc/translate.c 2008-07-03 18:59:44.000000000 +0200
@@ -168,17 +168,17 @@ rfbTranslateNone(ScreenPtr pScreen, char
{
VNCSCREENPTR(pScreen);
DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum];
- int truewidth = PixmapBytePad(width, in->bitsPerPixel) / 4;
+ int truewidth = PixmapBytePad(width, in->bitsPerPixel);
- if ((x + truewidth > pVNC->width) || truewidth != width) {
- unsigned char *buffer = malloc(truewidth * height * in->bitsPerPixel / 8);
+ if ((x + width > pVNC->width) || truewidth != width * in->bitsPerPixel / 8) {
+ unsigned char *buffer = malloc(truewidth * height);
unsigned char *buf = buffer;
- (*pScreen->GetImage)(pDraw, x, y, truewidth, height, ZPixmap, ~0, (char*)buf);
+ (*pScreen->GetImage)(pDraw, x, y, width, height, ZPixmap, ~0, (char*)buf);
while (height--) {
memcpy(optr, buf, width * in->bitsPerPixel / 8);
optr += width * in->bitsPerPixel / 8;
- buf += truewidth * in->bitsPerPixel / 8;
+ buf += truewidth;
}
free(buffer);
return;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org