rpms/vnc/devel vnc-render.patch,1.15,1.16 vnc.spec,1.161,1.162

[fedora-cvs-commits at redhat.com]

Author: atkac

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

Modified Files:
	vnc-render.patch vnc.spec 
Log Message:
enabled render extensions on ppc+ppc64 only by default


vnc-render.patch:
 Imakefile        |    2 -
 Xvnc/xvnc.cc     |   50 +++++++++++++++++++++++++++++++++++++++++++++++-
 module/Imakefile |    2 -
 vncHooks.cc      |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 108 insertions(+), 3 deletions(-)

Index: vnc-render.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vnc-render.patch	5 Dec 2006 14:48:50 -0000	1.15
+++ vnc-render.patch	13 Dec 2006 11:36:17 -0000	1.16
@@ -5,7 +5,7 @@
  static char needswap = 0;
  static int lastScreen = -1;
 +#ifdef RENDER
-+#if (defined(__ppc64__) || defined(__powerpc64__))
++#if (defined(__ppc__) || defined(__powerpc__))
 +static Bool Render = TRUE;
 +#else
 +static Bool Render = FALSE;
@@ -19,7 +19,7 @@
      ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
      ErrorF("-pixdepths list-of-int support given pixmap depths\n");
 +#ifdef RENDER
-+#if (defined(__ppc64__) || defined(__powerpc64__))
++#if (defined(__ppc__) || defined(__powerpc__))
 +    ErrorF("+/-render             turn on/off RENDER extension support"
 +          "(default on)\n");
 +#else


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- vnc.spec	11 Dec 2006 12:18:24 -0000	1.161
+++ vnc.spec	13 Dec 2006 11:36:17 -0000	1.162
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.2
-Release:   8%{?dist}
+Release:   8.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
@@ -62,7 +62,7 @@
 BuildRequires: libstdc++-devel, gcc-c++, libselinux-devel
 
 %ifarch %{ix86} x86_64 ppc ia64 alpha sparc sparc64
-%define with_glx        1
+%define with_glx        0
 BuildRequires: mesa-libGL-devel >= 6.5.1, mesa-source >= 6.5.1, libdrm-devel
 %endif
 %ifarch ppc64 s390 s390x
@@ -295,6 +295,10 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Wed Dec 13 2006 Adam Tkac <atkac redhat com> 4.1.2-8.1.fc7
+- changed __ppc64__ to __ppc__ in vnc-render.patch
+  all powerpc has render enabled by default, other archs no
+
 * Mon Dec 11 2006 Adam Tkac <atkac redhat com> 4.1.2-8.fc7
 - fixed building against mesa-6.5.2