OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=7

0018-vnc-support.txt.diff

@@ -19,3 +19,22 @@ diff -x .deps -u -r xcliplist.orig/cliplistmod.c xcliplist/cliplistmod.c
  void rfbLoginAuthProcessClientMessage(rfbClientPtr cl)
  {
      int n1 = 0, n2 = 0;
+--- ../xorg-server-1.1.99.903.old/hw/xfree86/vnc/Makefile.am	2007-01-16 20:52:51.000000000 +0000
++++ hw/xfree86/vnc/Makefile.am	2007-01-16 21:35:00.000000000 +0000
+@@ -5,6 +5,7 @@
+                    -I$(top_srcdir)/hw/xfree86/ramdac \
+                    -I$(top_srcdir)/GL/glx \
+                    -I$(top_srcdir)/GL/include \
++		   -I$(top_srcdir)/hw/dmx/vnc \
+                    -I$(top_builddir)/GL/include \
+ 		   -I@MESA_SOURCE@/include \
+                    -DHAVE_XORG_CONFIG_H \
+@@ -20,6 +21,8 @@
+ libvnc_la_LDFLAGS = -module -avoid-version
+ libvnc_ladir = $(moduledir)/extensions
+ libvnc_la_SOURCES = \
++	$(top_srcdir)/hw/dmx/vnc/vncauth.c \
++	$(top_srcdir)/hw/vnc/d3des.c \
+ 	auth.c \
+ 	cmap.c \
+ 	corre.c \

bug227111-ddc_screensize.diff

@@ -0,0 +1,19 @@
+diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
+index a1650bc..9e36388 100644
+--- a/hw/xfree86/ddc/ddcProperty.c
++++ b/hw/xfree86/ddc/ddcProperty.c
+@@ -313,9 +313,11 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr
+ 
+     preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
+ 
+-    Monitor->widthmm = 10 * DDC->features.hsize;
+-    Monitor->heightmm = 10 * DDC->features.vsize;
+-    
++    if (!Monitor->widthmm) 
++	Monitor->widthmm = 10 * DDC->features.hsize;
++    if (!Monitor->heightmm)
++	Monitor->heightmm = 10 * DDC->features.vsize;
++
+     /* If this is a digital display, then we can use reduced blanking */
+     if (DDC->features.input_type) 
+         Monitor->reducedblanking = TRUE;

xorg-x11-server.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 16 22:50:02 CET 2007 - sndirsch@suse.de
+
+- 0018-vnc-support.txt.diff
+  * fixed unresolved symbols vncRandomBytes/deskey in VNC module
+    (terminated Xserver when client connected)
+
+-------------------------------------------------------------------
+Tue Jan 16 19:05:39 CET 2007 - sndirsch@suse.de
+
+- bug227111-ddc_screensize.diff:
+  * allow user overrides for monitor settings (Bug #227111) 
+
 -------------------------------------------------------------------
 Mon Jan 15 18:27:54 CET 2007 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        42
+Release:        43
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -82,6 +82,7 @@ Patch39:        0018-vnc-support.txt
 Patch40:        0018-vnc-support.txt.diff
 %endif
 Patch41:        loadmod-bug197195.diff
+Patch42:        bug227111-ddc_screensize.diff
 Patch334:       p_pci-domain.diff
 Patch357:       p_pci-ce-x.diff
 
@@ -175,6 +176,7 @@ popd
 %patch40 -p0
 %endif
 %patch41 -p1
+%patch42 -p1
 
 %build
 autoreconf -fi
@@ -498,6 +500,13 @@ exit 0
 %endif
 
 %changelog -n xorg-x11-server
+* Tue Jan 16 2007 - sndirsch@suse.de
+- 0018-vnc-support.txt.diff
+  * fixed unresolved symbols vncRandomBytes/deskey in VNC module
+  (terminated Xserver when client connected)
+* Tue Jan 16 2007 - sndirsch@suse.de
+- bug227111-ddc_screensize.diff:
+  * allow user overrides for monitor settings (Bug #227111)
 * Mon Jan 15 2007 - sndirsch@suse.de
 - loadmod-bug197195.diff:
   * check the complete path (Bug #197195)