rpms/tightvnc/devel xserver16.patch, NONE, 1.1 tightvnc.spec, 1.9, 1.10 tightvnc-xorg-version.patch, 1.2, NONE

Fri Feb 27 14:19:26 UTC 2009

Author: atkac

Update of /cvs/pkgs/rpms/tightvnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18525

Modified Files:
	tightvnc.spec 
Added Files:
	xserver16.patch 
Removed Files:
	tightvnc-xorg-version.patch 
Log Message:
- updated xserver16.patch
- tightvnc-xorg-version.patch has been removed


xserver16.patch:

--- NEW FILE xserver16.patch ---
diff -up xserver/configure.ac.vnc xserver/configure.ac
--- xserver/configure.ac.vnc	2009-02-25 11:45:20.000000000 +0100
+++ xserver/configure.ac	2009-02-25 11:49:37.000000000 +0100
@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
 AC_INIT([xorg-server], 1.5.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
-AM_MAINTAINER_MODE
 
 RELEASE_DATE="2009-2-17"
 
@@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
 AC_CONFIG_HEADERS(include/kdrive-config.h)
 
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_AS
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -1195,6 +1195,9 @@ if test "x$XVFB" = xyes; then
 	AC_SUBST([XVFB_SYS_LIBS])
 fi
 
+dnl Xvnc DDX
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"])
 
 dnl Xnest DDX
 
@@ -1230,6 +1233,8 @@ xorg_bus_linuxpci=no
 xorg_bus_bsdpci=no
 xorg_bus_sparc=no
 
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+
 if test "x$XORG" = xyes; then
 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
@@ -1417,7 +1422,6 @@ if test "x$XORG" = xyes; then
 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
 	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
@@ -1871,6 +1875,7 @@ hw/dmx/input/Makefile
 hw/dmx/glxProxy/Makefile
 hw/dmx/Makefile
 hw/vfb/Makefile
+hw/vnc/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xquartz/Makefile
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
--- xserver/hw/Makefile.am.vnc	2009-02-25 11:45:20.000000000 +0100
+++ xserver/hw/Makefile.am	2009-02-25 11:45:37.000000000 +0100
@@ -33,7 +33,8 @@ SUBDIRS =			\
 	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)		\
 	$(KDRIVE_SUBDIRS)	\
-	$(XQUARTZ_SUBDIRS)
+	$(XQUARTZ_SUBDIRS)	\
+	vnc
 
 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
 
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
--- xserver/mi/miinitext.c.vnc	2009-02-25 11:45:21.000000000 +0100
+++ xserver/mi/miinitext.c	2009-02-25 11:45:37.000000000 +0100
@@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
 extern void CompositeExtensionInit(INITARGS);
 #endif
 extern void GEExtensionInit(INITARGS);
+extern void vncExtensionInit(INITARGS);
 
 /* The following is only a small first step towards run-time
  * configurable extensions.
@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[])
 	GlxPushProvider(&__glXDRISWRastProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #endif
+    vncExtensionInit();
 }
 
 #else /* XFree86LOADER */


Index: tightvnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/tightvnc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tightvnc.spec	25 Feb 2009 20:42:55 -0000	1.9
+++ tightvnc.spec	27 Feb 2009 14:18:56 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:		tightvnc
 Version:	1.5.0
-Release:	0.13.%{releasetag}%{?dist}
+Release:	0.14.%{releasetag}%{?dist}
 Summary:	A TightVNC remote display system
 
 Group:		User Interface/Desktops
@@ -52,7 +52,7 @@
 Patch6:		tightvnc-newfbsize.patch
 Patch7:		tightvnc-rh212985.patch
 Patch8:		tightvnc-viewer-reparent.patch
-Patch9:		tightvnc-xorg-version.patch 
+Patch9:		xserver16.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -96,10 +96,8 @@
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-patch -p1 --fuzz=0 < ../xserver16.patch
 popd
 
-%patch9 -p1 -b .version
 
 %patch0 -p1 -b .102434
 %patch1 -p1 -b .bounds
@@ -110,6 +108,9 @@
 %patch6 -p1 -b .newfbsize
 %patch7 -p1 -b .rh212985
 %patch8 -p1 -b .viewer-reparent
+pushd unix/xserver
+%patch9 -p1 -b .vnc
+popd
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -242,6 +243,10 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Fri Feb 27 2009 Adam Tkac <atkac redhat com> 1.5.0-0.14.20090204svn3586
+- updated xserver16.patch
+- tightvnc-xorg-version.patch has been removed
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-0.13.20090204svn3586
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- tightvnc-xorg-version.patch DELETED ---


