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

2007-10-20 15:42:04 +00:00 · 2007-10-20 15:42:04 +00:00 · b3235183d9
commit b3235183d9
parent f3b184e7ce
7 changed files with 24088 additions and 59446 deletions
--- a/0018-vnc-support.txt
+++ b/0018-vnc-support.txt
--- a/0018-vnc-support.txt.diff
+++ b/0018-vnc-support.txt.diff
@ -1,40 +0,0 @@
-diff -x .deps -u -r xcliplist.orig/cliplistmod.c xcliplist/cliplistmod.c
--- xcliplist.orig/cliplistmod.c	2007-01-14 13:45:20.000000000 +0000
-+++ xcliplist/cliplistmod.c	2007-01-14 13:46:44.000000000 +0000
-@@ -1,5 +1,5 @@
- 
-#include "xorg/xf86Module.h"
-+#include "../hw/xfree86/common/xf86Module.h"
- 
- extern Bool noTestExtensions;
- 
--- hw/vnc/loginauth.c.orig	2007-01-13 18:00:45.106884000 +0100
-+++ hw/vnc/loginauth.c	2007-01-13 18:08:04.104447000 +0100
-@@ -37,6 +37,8 @@
- #include <sys/types.h>
- #include "rfb.h"
- 
-+char *crypt(const char *key, const char *salt);
-+
- 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 \
--- a/0018-vnc-support.txt.mbox
+++ b/0018-vnc-support.txt.mbox
@ -1,187 +0,0 @@
-From xorg-bounces@lists.freedesktop.org  Thu Jan 11 18:09:18 2007
-Return-Path: <xorg-bounces@lists.freedesktop.org>
-X-Original-To: sndirsch@wotan.suse.de
-Received: from Relay2.suse.de (relay2.suse.de [149.44.160.89])
-	by wotan.suse.de (Postfix) with ESMTP id 8F76413E45
-	for <sndirsch@wotan.suse.de>; Thu, 11 Jan 2007 18:09:18 +0100 (CET)
-Received: by Relay2.suse.de (Postfix)
-	id 8B0DAC03BF; Thu, 11 Jan 2007 18:09:18 +0100 (CET)
-Received: from Relay2.suse.de (localhost [127.0.0.1])
-	by Relay2.suse.de (Postfix) with ESMTP id 6B1D2AE3B2;
-	Thu, 11 Jan 2007 18:09:18 +0100 (CET)
-Received: from Relay2.suse.de ([127.0.0.1])
- by Relay2.suse.de (Relay2 [127.0.0.1]) (amavisd-new, port 10026) with ESMTP
- id 32754-05; Thu, 11 Jan 2007 18:09:12 +0100 (CET)
-Received: from mx2.suse.de (mx2.suse.de [195.135.220.15])
-	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by Relay2.suse.de (Postfix) with ESMTP id 03A1CC03AF;
-	Thu, 11 Jan 2007 18:09:12 +0100 (CET)
-Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.208.82])
-	by mx2.suse.de (Postfix) with ESMTP id BED2E215E1;
-	Thu, 11 Jan 2007 18:09:11 +0100 (CET)
-Received: from gabe.freedesktop.org (localhost [127.0.0.1])
-	by gabe.freedesktop.org (Postfix) with ESMTP id 5525D9EB5A;
-	Thu, 11 Jan 2007 09:09:07 -0800 (PST)
-X-Original-To: xorg@freedesktop.org
-Delivered-To: xorg@freedesktop.org
-Received: from ciao.gmane.org (main.gmane.org [80.91.229.2])
-	by gabe.freedesktop.org (Postfix) with ESMTP id 6CC819EAF1
-	for <xorg@freedesktop.org>; Thu, 11 Jan 2007 09:09:03 -0800 (PST)
-Received: from list by ciao.gmane.org with local (Exim 4.43)
-	id 1H53Q4-0002Z1-Np
-	for xorg@freedesktop.org; Thu, 11 Jan 2007 18:08:52 +0100
-Received: from host-84-9-255-116.bulldogdsl.com ([84.9.255.116])
-	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
-	id 1AlnuQ-0007hv-00
-	for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:08:52 +0100
-Received: from gmane by host-84-9-255-116.bulldogdsl.com with local (Gmexim
-	0.1 (Debian)) id 1AlnuQ-0007hv-00
-	for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:08:52 +0100
-X-Injected-Via-Gmane: http://gmane.org/
-To: xorg@freedesktop.org
-From: Colin Guthrie <gmane@colin.guthr.ie>
-Date: Thu, 11 Jan 2007 17:08:41 +0000
-Message-ID: <eo5qup$tgh$1@sea.gmane.org>
-References: <45A66ACD.2060605@Sun.COM>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Complaints-To: usenet@sea.gmane.org
-X-Gmane-NNTP-Posting-Host: host-84-9-255-116.bulldogdsl.com
-User-Agent: Thunderbird 1.5.0.9 (X11/20070105)
-In-Reply-To: <45A66ACD.2060605@Sun.COM>
-Subject: Re: VNC on Xorg?
-X-BeenThere: xorg@lists.freedesktop.org
-X-Mailman-Version: 2.1.5
-Precedence: list
-List-Id: Discuss issues related to the xorg tree <xorg.lists.freedesktop.org>
-List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
-	<mailto:xorg-request@lists.freedesktop.org?subject=unsubscribe>
-List-Archive: <http://lists.freedesktop.org/archives/xorg>
-List-Post: <mailto:xorg@lists.freedesktop.org>
-List-Help: <mailto:xorg-request@lists.freedesktop.org?subject=help>
-List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
-	<mailto:xorg-request@lists.freedesktop.org?subject=subscribe>
-Sender: xorg-bounces@lists.freedesktop.org
-Errors-To: xorg-bounces@lists.freedesktop.org
-X-Virus-Scanned: by amavisd-new at Relay2.suse.de
-X-Spam-Status: No, hits=-1.7 tagged_above=-20.0 required=5.0 tests=BAYES_20,
- IS_MAILMAN_LIST
-X-Spam-Level: 
-Status: RO
-Content-Length: 561
-Lines: 12
-
-Deron Johnson wrote:
-> Does anybody know of a version of VNC which is based on Xorg 6.9 or
-> greater? For example, Tight VNC is based on an ancient version (XFree86).
-
-I recently updated the Mandriva VNC patch for Xorg 1.1.99.903, but I've
-not tested it at all. It compiles up fine tho'.
-
-http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/x11-server/current/SOURCES/0018-vnc-support.txt?view=log
-
-HTH
-
-Col.
-
-_______________________________________________
-xorg mailing list
-xorg@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/xorg
-
-From xorg-bounces@lists.freedesktop.org  Thu Jan 11 18:15:18 2007
-Return-Path: <xorg-bounces@lists.freedesktop.org>
-X-Original-To: sndirsch@wotan.suse.de
-Received: from Relay1.suse.de (relay1.suse.de [149.44.160.87])
-	by wotan.suse.de (Postfix) with ESMTP id 08DF413E45
-	for <sndirsch@wotan.suse.de>; Thu, 11 Jan 2007 18:15:18 +0100 (CET)
-Received: by Relay1.suse.de (Postfix)
-	id 054EBB189D; Thu, 11 Jan 2007 18:15:18 +0100 (CET)
-Received: from Relay1.suse.de (localhost [127.0.0.1])
-	by Relay1.suse.de (Postfix) with ESMTP id E8AF9BCC22;
-	Thu, 11 Jan 2007 18:15:17 +0100 (CET)
-Received: from Relay1.suse.de ([127.0.0.1])
- by Relay1.suse.de (Relay1 [127.0.0.1]) (amavisd-new, port 10026) with ESMTP
- id 22518-16; Thu, 11 Jan 2007 18:15:12 +0100 (CET)
-Received: from mx1.suse.de (ns1.suse.de [195.135.220.2])
-	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by Relay1.suse.de (Postfix) with ESMTP id AACF2BA55A;
-	Thu, 11 Jan 2007 18:15:12 +0100 (CET)
-Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.208.82])
-	by mx1.suse.de (Postfix) with ESMTP id 6D30F12208;
-	Thu, 11 Jan 2007 18:15:12 +0100 (CET)
-Received: from gabe.freedesktop.org (localhost [127.0.0.1])
-	by gabe.freedesktop.org (Postfix) with ESMTP id E3A279EB68;
-	Thu, 11 Jan 2007 09:15:08 -0800 (PST)
-X-Original-To: xorg@freedesktop.org
-Delivered-To: xorg@freedesktop.org
-Received: from ciao.gmane.org (main.gmane.org [80.91.229.2])
-	by gabe.freedesktop.org (Postfix) with ESMTP id 29AC49EB59
-	for <xorg@freedesktop.org>; Thu, 11 Jan 2007 09:15:03 -0800 (PST)
-Received: from root by ciao.gmane.org with local (Exim 4.43)
-	id 1H53W2-0003Hz-6X
-	for xorg@freedesktop.org; Thu, 11 Jan 2007 18:15:02 +0100
-Received: from host-84-9-255-116.bulldogdsl.com ([84.9.255.116])
-	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
-	id 1AlnuQ-0007hv-00
-	for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:15:02 +0100
-Received: from gmane by host-84-9-255-116.bulldogdsl.com with local (Gmexim
-	0.1 (Debian)) id 1AlnuQ-0007hv-00
-	for <xorg@freedesktop.org>; Thu, 11 Jan 2007 18:15:02 +0100
-X-Injected-Via-Gmane: http://gmane.org/
-To: xorg@freedesktop.org
-From: Colin Guthrie <gmane@colin.guthr.ie>
-Date: Thu, 11 Jan 2007 17:12:37 +0000
-Message-ID: <eo5r66$125$1@sea.gmane.org>
-References: <45A66ACD.2060605@Sun.COM> <eo5qup$tgh$1@sea.gmane.org>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Complaints-To: usenet@sea.gmane.org
-X-Gmane-NNTP-Posting-Host: host-84-9-255-116.bulldogdsl.com
-User-Agent: Thunderbird 1.5.0.9 (X11/20070105)
-In-Reply-To: <eo5qup$tgh$1@sea.gmane.org>
-Subject: Re: VNC on Xorg?
-X-BeenThere: xorg@lists.freedesktop.org
-X-Mailman-Version: 2.1.5
-Precedence: list
-List-Id: Discuss issues related to the xorg tree <xorg.lists.freedesktop.org>
-List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
-	<mailto:xorg-request@lists.freedesktop.org?subject=unsubscribe>
-List-Archive: <http://lists.freedesktop.org/archives/xorg>
-List-Post: <mailto:xorg@lists.freedesktop.org>
-List-Help: <mailto:xorg-request@lists.freedesktop.org?subject=help>
-List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/xorg>,
-	<mailto:xorg-request@lists.freedesktop.org?subject=subscribe>
-Sender: xorg-bounces@lists.freedesktop.org
-Errors-To: xorg-bounces@lists.freedesktop.org
-X-Virus-Scanned: by amavisd-new at Relay1.suse.de
-X-Spam-Status: No, hits=-1.7 tagged_above=-20.0 required=5.0 tests=BAYES_20,
- IS_MAILMAN_LIST
-X-Spam-Level: 
-Status: RO
-Content-Length: 657
-Lines: 13
-
-Colin Guthrie wrote:
-> Deron Johnson wrote:
->> Does anybody know of a version of VNC which is based on Xorg 6.9 or
->> greater? For example, Tight VNC is based on an ancient version (XFree86).
-> 
-> I recently updated the Mandriva VNC patch for Xorg 1.1.99.903, but I've
-> not tested it at all. It compiles up fine tho'.
-> 
-> http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/x11-server/current/SOURCES/0018-vnc-support.txt?view=log
-
-I should also state that the previous revision is for Xorg 1.1.1
-
-Col.
-
-_______________________________________________
-xorg mailing list
-xorg@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/xorg
-
--- a/xorg-server-1.4-vnc-fix.patch
+++ b/xorg-server-1.4-vnc-fix.patch
@ -0,0 +1,22 @@
+diff -u -r -x .deps xorg-server-1.4.old/hw/xfree86/vnc/vncint.h xorg-server-1.4/hw/xfree86/vnc/vncint.h
+--- xorg-server-1.4.old/hw/xfree86/vnc/vncint.h	2007-10-19 01:11:08.000000000 +0000
+++ xorg-server-1.4/hw/xfree86/vnc/vncint.h	2007-10-19 01:22:20.000000000 +0000
+@@ -22,7 +22,7 @@
+ #ifndef _VNC_H_
+ #define _VNC_H_
+ 
+-#include <xorg/xf86Cursor.h>
+#include <../ramdac/xf86Cursor.h>
+ /*#include <xf86CursorPriv.h>*/
+ 
+ extern int vncScreenPrivateIndex;
+diff -u -r -x .deps xorg-server-1.4.old/xcliplist/cliplistmod.c xorg-server-1.4/xcliplist/cliplistmod.c
+--- xorg-server-1.4.old/xcliplist/cliplistmod.c	2007-10-19 01:11:10.000000000 +0000
+++ xorg-server-1.4/xcliplist/cliplistmod.c	2007-10-19 01:13:04.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-#include "xorg/xf86Module.h"
+#include "../hw/xfree86/common/xf86Module.h"
+ 
+ extern Bool noTestExtensions;
+ 
--- a/xorg-server-1.4-vnc.patch
+++ b/xorg-server-1.4-vnc.patch
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 19 04:03:57 CEST 2007 - sndirsch@suse.de
+
+- updated xf4vnc patch; still disabled due to problematic vnc module
+
 -------------------------------------------------------------------
 Tue Oct  9 19:07:57 CEST 2007 - sndirsch@suse.de

--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        7
+Release:        12
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@ -41,9 +41,6 @@ Source4:        xorgcfg.tar.bz2
 %if %suse_version > 1010
 Source5:        modprobe.nvidia
 %endif
-%if %vnc
-Source6:        0018-vnc-support.txt.mbox
-%endif
 Source7:        xorg-docs-1.4.tar.bz2
 Source8:        xorg.conf.man-070818.tar
 Source9:        ia64Pci.h
@ -74,8 +71,8 @@ Patch32:        acpi_events.diff
 Patch34:        p_pci-off-by-one.diff.ia64
 Patch36:        libdrm.diff
 %if %vnc
-Patch39:        0018-vnc-support.txt
-Patch40:        0018-vnc-support.txt.diff
+Patch39:        xorg-server-1.4-vnc.patch
+Patch40:        xorg-server-1.4-vnc-fix.patch
 %endif
 Patch41:        loadmod-bug197195.diff
 Patch42:        bug227111-ddc_screensize.diff
@ -183,7 +180,8 @@ popd
 %patch36 -p0
 %if %vnc
 %patch39 -p1
-%patch40 -p0
+%patch40 -p1
+chmod 755 hw/vnc/symlink-vnc.sh
 %endif
 %patch41 -p1
 %patch42 -p0
@ -219,11 +217,9 @@ autoreconf -fi
 %endif
 %if %vnc
 %ifnarch s390 s390x
-            --enable-xorg-vnc \
            --enable-xcliplist \
 %endif
-            --enable-xdmx-vnc \
-            --enable-xvnc \
+            --enable-vnc \
 %endif
            --prefix=/usr \
 	    --sysconfdir=/etc \
@ -314,11 +310,11 @@ rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
 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
+#%ifarch s390 s390x
+#rm $RPM_BUILD_ROOT/mfb.h
+#%endif
+#%endif

 %clean
 rm -rf "$RPM_BUILD_ROOT"
@ -497,11 +493,11 @@ exit 0
 /usr/%{_lib}/X11/*
 /usr/%{_lib}/xorg/modules/
 %{_mandir}/man4/*
-%{_mandir}/man5/*
 %endif
 /usr/%{_lib}/pkgconfig/*.pc
 /usr/%{_lib}/xserver/
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_mandir}/man7/*
 %ifnarch s390 s390x
 /var/X11R6/bin/X
@ -529,6 +525,8 @@ exit 0
 /usr/bin/Xvnc
 %endif
 %changelog
+* Fri Oct 19 2007 - sndirsch@suse.de
+- updated xf4vnc patch; still disabled due to problematic vnc module
 * Tue Oct 09 2007 - sndirsch@suse.de
 - preferred_mode-fix.diff
  * more reasonable patch (Bug #329724)