rpms/vnc/devel vnc-use-fb.patch, 1.3, 1.4 vnc.spec, 1.166, 1.167 vnc-build.patch, 1.1, NONE vnc-def.patch, 1.5, NONE vnc-opengl.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Feb 23 16:46:51 UTC 2007 

Author: atkac

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14351/vnc/devel

Modified Files:
	vnc-use-fb.patch vnc.spec 
Removed Files:
	vnc-build.patch vnc-def.patch vnc-opengl.patch 
Log Message:
- new colormap policy
- removed obsolete patches
- Xvnc now always use framebuffer (like Xvfb)


vnc-use-fb.patch:
 xvnc.cc |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletion(-)

Index: vnc-use-fb.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-use-fb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vnc-use-fb.patch	4 Mar 2005 16:42:49 -0000	1.3
+++ vnc-use-fb.patch	23 Feb 2007 16:46:48 -0000	1.4
@@ -1,105 +1,3 @@
---- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.use-fb	2005-02-28 12:59:09.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def	2005-03-04 16:13:19.000000000 +0000
-@@ -1,35 +0,0 @@
--#define BuildServersOnly YES
--#define BuildFonts NO
--#define BuildClients NO
--#define BuildDocs NO
--#define BuildPexExt NO
--#define BuildNls NO
--#define BuildXIE NO
--#define BuildGlxExt NO
--#define XnestServer NO
--#define XprtServer NO
--
--#ifdef SunArchitecture
--#define ProjectRoot /usr/openwin
--#define HasGcc2 YES
--#define BuildXKB NO
--#endif
--
--#define HasFreetype2 NO
--#define BuildVNCExt YES
--#define VNCExtDefines -DVNCEXT
--#define SiteExtensionDefines VNCExtDefines
--#define SiteExtensionDirs vnc
--
--#define VncUnixDir $(TOP)/..
--#define VncCommonDir VncUnixDir/../common
--#define VncExtLibs VncCommonDir/rfb/librfb.a \
--                   VncCommonDir/Xregion/libXregion.a \
--                   VncCommonDir/network/libnetwork.a \
--                   VncCommonDir/rdr/librdr.a
--
--#define SiteExtensionLibs vnc/LibraryTargetName(vnc) VncExtLibs
--
--#define	ServerTarget(server,subdirs,objects,libs,syslibs)		@@\
--CCLINK = $(CXXENVSETUP) $(CXX) @@\
--ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
---- /dev/null	2005-02-24 13:02:34.848875488 +0000
-+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in	2005-03-04 16:13:19.000000000 +0000
-@@ -0,0 +1,37 @@
-+#define BuildServersOnly YES
-+#define BuildFonts NO
-+#define BuildClients NO
-+#define BuildDocs NO
-+#define BuildPexExt NO
-+#define BuildNls NO
-+#define BuildXIE NO
-+#define BuildGlxExt NO
-+#define XnestServer NO
-+#define XprtServer NO
-+
-+#ifdef SunArchitecture
-+#define ProjectRoot /usr/openwin
-+#define HasGcc2 YES
-+#define BuildXKB NO
-+#endif
-+
-+#define HasFreetype2 NO
-+#define BuildVNCExt YES
-+#define VNCExtDefines -DVNCEXT
-+#define SiteExtensionDefines VNCExtDefines
-+#define SiteExtensionDirs vnc
-+
-+#define VncUseFb @USE_FB@
-+
-+#define VncUnixDir $(TOP)/..
-+#define VncCommonDir VncUnixDir/../common
-+#define VncExtLibs VncCommonDir/rfb/librfb.a \
-+                   VncCommonDir/Xregion/libXregion.a \
-+                   VncCommonDir/network/libnetwork.a \
-+                   VncCommonDir/rdr/librdr.a
-+
-+#define SiteExtensionLibs vnc/LibraryTargetName(vnc) VncExtLibs
-+
-+#define	ServerTarget(server,subdirs,objects,libs,syslibs)		@@\
-+CCLINK = $(CXXENVSETUP) $(CXX) @@\
-+ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
---- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile.use-fb	2004-12-01 17:27:58.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile	2005-03-04 16:13:19.000000000 +0000
-@@ -31,12 +31,19 @@
- OBJS1 = os2_stubs.o
- #endif
- 
-+#ifdef VncUseFb
-+FB_DEFINES = -DVNC_USE_FB
-+ FBINCLUDE = -I../../fb
-+#else
-+ FBINCLUDE = -I../../cfb
-+#endif
-+
- SRCSA =	xvnc.cc stubs.c $(SRCS1) miinitext.c $(SRCS2)
- 
- OBJSA =	xvnc.o stubs.o $(OBJS1) miinitext.o $(OBJS2)
- 
--INCLUDES = -I. -I.. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
--	   -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os  \
-+INCLUDES = -I. -I.. -I$(XBUILDINCDIR) -I$(FONTINCSRC) $(FB_DEFINES) \
-+	   $(FBINCLUDE) -I../../mfb -I../../mi -I../../include -I../../os  \
-            -I$(EXTINCSRC) -I$(XINCLUDESRC)  -I$(SERVERSRC)/render $(VNCINCLUDE)
- 
- DEFINES = $(OS_DEFINES) $(SHMDEF) $(MMAPDEF) \
 --- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.use-fb	2005-02-28 12:59:09.000000000 +0000
 +++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2005-03-04 16:13:19.000000000 +0000
 @@ -48,8 +48,12 @@
@@ -185,62 +83,3 @@
 +#endif
  
    miSetZeroLineBias(pScreen, pvfb->lineBias);
- 
---- vnc-4_1-unixsrc/unix/configure.in.use-fb	2005-01-11 16:37:17.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/configure.in	2005-03-04 16:13:19.000000000 +0000
-@@ -65,6 +65,18 @@
- AC_SUBST(ZLIB_INCLUDE)
- AC_SUBST(ZLIB_LIB)
- 
-+AC_ARG_WITH(fb,
-+[  --with-fb               use the new 'fb' framebuffer implementation])
-+if test "$with_installed_zlib" = yes; then
-+  echo "using 'fb' framebuffer"
-+  USE_FB=YES
-+else
-+  echo "using 'mfb' and 'cfb' framebuffer"
-+  USE_FB=NO
-+fi
-+
-+AC_SUBST(USE_FB)
-+
- BOILERPLATE=boilerplate.mk
- 
- if (sh -c "make --version" 2>/dev/null | grep GNU 2>&1 >/dev/null); then
-@@ -79,4 +91,5 @@
-           vncviewer/Makefile:common.mk:vncviewer/Makefile.in:$BOILERPLATE \
-           vncconfig/Makefile:common.mk:vncconfig/Makefile.in:$BOILERPLATE \
-           vncpasswd/Makefile:common.mk:vncpasswd/Makefile.in:$BOILERPLATE \
-+          xc/config/cf/vnc.def \
- )
---- vnc-4_1-unixsrc/unix/xc.patch.use-fb	2004-12-01 11:33:15.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/xc.patch	2005-03-04 16:19:31.000000000 +0000
-@@ -2,7 +2,7 @@
- --- xc/programs/Xserver/Imakefile	Fri Jun  6 11:14:39 2003
- ***************
- *** 409,412 ****
----- 409,429 ----
-+--- 409,435 ----
-   #endif
-   #endif /* XsunServer */
- + XCOMM
-@@ -13,12 +13,18 @@
- + CFB16DIR = cfb16
- + CFB24DIR = cfb24
- + CFB32DIR = cfb32
-++ FBDIR = fb
- + XVNCDDXDIR = vnc/Xvnc
-++ #if VncUseFb
-++ XVNCDIRS = $(STDDIRS) $(FBDIR) $(XVNCDDXDIR) $(DEPDIRS)
-++ XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs
-++ #else
- + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
- + 	    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
- + 	    $(XVNCDDXDIR) $(DEPDIRS)
--+ XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
- + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) CFBLibs PostFbLibs
-++ #endif
-++ XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
- + XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS)
- + ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \
- + 	$(LIBCWRAPPER) $(XVNCLIBS) $(LOADABLEEXTS),$(XVNCSYSLIBS))


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- vnc.spec	16 Feb 2007 15:33:59 -0000	1.166
+++ vnc.spec	23 Feb 2007 16:46:48 -0000	1.167
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.2
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -21,11 +21,8 @@
 Patch3:    vnc-xclients.patch
 Patch4:    vnc-idle.patch
 Patch5:    vnc-via.patch
-Patch6:    vnc-build.patch
-#Patch7:    vnc-fPIC.patch
 Patch8:    vnc-restart.patch
 Patch9:    vnc-vncpasswd.patch
-Patch10:   vnc-def.patch
 Patch11:   vnc-modular-xorg.patch
 Patch12:   vnc-nohttpd.patch
 Patch13:   vnc-fontpath.patch
@@ -35,7 +32,6 @@
 Patch17:   vnc-select.patch
 #Patch18:   vnc-null-interface.patch
 Patch19:   vnc-ppc64.patch
-Patch20:   vnc-opengl.patch
 Patch21:   vnc-newfbsize.patch
 Patch22:   vnc-188169.patch
 Patch23:   vnc-210617.patch
@@ -48,6 +44,7 @@
 Patch30:   vnc-render-sigfault.patch
 Patch31:   vnc-autotools.patch
 Patch32:   vnc-autotools-compile.patch
+Patch33:   vnc-always_use_fb.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -113,11 +110,8 @@
 %patch3 -p1 -b .xclients
 %patch4 -p1 -b .idle
 %patch5 -p1 -b .via
-%patch6 -p1 -b .build
-#%patch7 -p1 -b .fPIC
 %patch8 -p1 -b .restart
 %patch9 -p1 -b .vncpasswd
-%patch10 -p1 -b .def
 %patch11 -p1 -b .modular-xorg
 %patch12 -p1 -b .nohttpd
 pushd unix/xorg-server-*
@@ -129,7 +123,6 @@
 %patch17 -p1 -b .select
 #patch18 -p1 -b .null-interface
 %patch19 -p1 -b .ppc64
-%patch20 -p1 -b .opengl
 %patch21 -p1 -b .newfbsize
 %patch22 -p1 -b .fix
 %patch23 -p1 -b .ipv6
@@ -143,6 +136,7 @@
 %patch30 -p1 -b .render-sigfault
 %patch31 -p1 -b .autotools
 %patch32 -p1 -b .autotools-compile
+%patch33 -p1 -b .always_use_fb
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -337,6 +331,11 @@
 %{_libdir}/librfb.so*
 
 %changelog
+* Fri Feb 23 2007 Adam Tkac <atkac redhat com> 4.1.2-12.fc7
+- new colormap policy in Xvnc
+- Xvnc now always use framebuffer (like Xvfb)
+- obsolete patches have been removed
+
 * Wed Feb 16 2007 Adam Tkac <atkac redhat com> 4.1.2-11.fc7
 - major build-process changes in vnc
     - vnc is now completely built by autotools


--- vnc-build.patch DELETED ---


--- vnc-def.patch DELETED ---


--- vnc-opengl.patch DELETED ---

More information about the fedora-cvs-commits mailing list