rpms/vnc/F-7 vnc-24bit.patch,NONE,1.1 vnc.spec,1.172,1.173

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16314

Modified Files:
	vnc.spec 
Added Files:
	vnc-24bit.patch 
Log Message:
- Xvnc could server 24bit depth correctly (#242277)
- handle RENDER initialision more gracefully


vnc-24bit.patch:

--- NEW FILE vnc-24bit.patch ---
--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.24bit	2007-06-07 17:27:46.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2007-06-07 17:29:01.000000000 +0200
@@ -762,7 +762,7 @@ static Bool vfbScreenInit(int index, Scr
 
   miSetPixmapDepths();
 
-  switch (pvfb->bitsPerPixel)
+  switch (pvfb->depth)
   {
   case 8:
       miSetVisualTypesAndMasks (8, 1 << PseudoColor, 8, PseudoColor, 0, 0, 0);
@@ -771,6 +771,9 @@ static Bool vfbScreenInit(int index, Scr
   case 16:
         miSetVisualTypesAndMasks (16, 1 << TrueColor, 8, TrueColor, 0xf800, 0x07e0, 0x001f);
     break;
+  case 24:
+	miSetVisualTypesAndMasks (24, 1 << TrueColor, 8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff);
+    break;
   case 32:
         miSetVisualTypesAndMasks (32, 1 << TrueColor , 8, TrueColor, 0xff000000, 0x00ff0000, 0x0000ff00);
     break;
@@ -778,15 +781,17 @@ static Bool vfbScreenInit(int index, Scr
     return FALSE;
   }
 
-  if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
-                    dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel))
-      return FALSE;
+  ret =fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
+                    dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel);
 
 #ifdef RENDER
   if (ret && Render)
       fbPictureInit(pScreen, 0, 0);
 #endif /* RENDER */
 
+  if (!ret)
+      return FALSE;
+
   pScreen->InstallColormap = vfbInstallColormap;
   pScreen->UninstallColormap = vfbUninstallColormap;
   pScreen->ListInstalledColormaps = vfbListInstalledColormaps;


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- vnc.spec	23 Apr 2007 14:47:47 -0000	1.172
+++ vnc.spec	8 Jun 2007 08:53:40 -0000	1.173
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   17%{?dist}
+Release:   17.1%{?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
@@ -37,6 +37,7 @@
 Patch33:   vnc-always_use_fb.patch
 Patch34:   vnc-vsnprintf.patch
 Patch35:   vnc-module_crash.patch
+Patch36:   vnc-24bit.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -115,6 +116,7 @@
 %patch33 -p1 -b .always_use_fb
 %patch34 -p1 -b .vsnprintf
 %patch35 -p1 -b .module_crash
+%patch36 -p1 -b .24bit
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -313,6 +315,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Fri Jun 08 2007 Adam Tkac <atkac redhat com> 4.1.2-17.1.fc7
+- Xvnc now has 24bit support (#242277) and correct RENDER initialization
+
 * Mon Apr 23 2007 Adam Tkac <atkac redhat com> 4.1.2-17.fc7
 - removed patch to #188169 because patching this bug could do
   more things bad than good