rpms/vnc/F-7 vnc-s390.patch,1.3,1.4 vnc.spec,1.173,1.174

[Adam Tkac (atkac)]

Author: atkac

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

Modified Files:
	vnc-s390.patch vnc.spec 
Log Message:
- updated s390 patch to latest Xorg


vnc-s390.patch:

Index: vnc-s390.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc-s390.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vnc-s390.patch	2 Mar 2007 15:33:54 -0000	1.3
+++ vnc-s390.patch	8 Jun 2007 09:23:51 -0000	1.4
@@ -1,6 +1,6 @@
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am.s390	2007-03-01 12:22:04.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am	2007-03-01 12:34:20.000000000 +0100
-@@ -38,7 +38,8 @@
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am.s390	2007-06-06 15:00:23.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am	2007-06-06 15:00:26.000000000 +0200
+@@ -38,7 +38,8 @@ libint10_la_SOURCES = \
  endif
  
  if INT10_STUB
@@ -10,9 +10,9 @@
  libint10_la_SOURCES = stub.c xf86int10module.c
  endif
  
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h.s390	2007-03-01 12:22:04.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h	2007-03-01 12:22:04.000000000 +0100
-@@ -1353,6 +1353,15 @@
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h.s390	2007-06-06 15:00:24.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h	2007-06-06 15:00:26.000000000 +0200
+@@ -1353,6 +1353,15 @@ do {									\
      : "0" (_beg), "r" (_end), "r" (_flg));				\
  } while (0)
  
@@ -28,9 +28,9 @@
  #   else /* ix86 */
  
  #    define ldq_u(p)	(*((unsigned long  *)(p)))
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c.s390	2007-03-01 12:22:04.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c	2007-03-01 12:22:04.000000000 +0100
-@@ -2089,6 +2089,7 @@
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c.s390	2007-06-06 15:00:24.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c	2007-06-06 15:00:26.000000000 +0200
+@@ -2089,6 +2089,7 @@ xf86GetClocks(ScrnInfoPtr pScrn, int num
  	      void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg,
  	      int maskval, int knownclkindex, int knownclkvalue)
  {
@@ -38,7 +38,7 @@
      register int status = vertsyncreg;
      unsigned long i, cnt, rcnt, sync;
  
-@@ -2182,6 +2183,7 @@
+@@ -2182,6 +2183,7 @@ finish:
  
      /* Restore registers that were written on */
      (*ClockFunc)(pScrn, CLK_REG_RESTORE);
@@ -46,36 +46,26 @@
  }
  
  _X_EXPORT void
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c.s390	2007-03-01 12:22:04.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c	2007-03-01 12:29:36.000000000 +0100
-@@ -62,7 +62,8 @@
- #elif !defined(__powerpc__) && \
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c.s390	2007-06-06 15:00:24.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c	2007-06-06 15:03:10.000000000 +0200
+@@ -63,7 +63,8 @@ static Bool ExtendedEnabled = FALSE;
        !defined(__mc68000__) && \
        !defined(__sparc__) && \
--      !defined(__mips__)
-+      !defined(__mips__) && \
-+      !defined(__s390__)
+       !defined(__mips__) && \
+-      !defined(__arm__)
++      !defined(__arm__) && \
++      !defined(__s390)
  
  /*
   * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
-@@ -567,7 +568,7 @@
- #endif
- 	}
- 	close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__)
-         if (ioperm(0, 1024, 1) || iopl(3)) {
-                 if (errno == ENODEV)
-                         ErrorF("xf86EnableIOPorts: no I/O ports found\n");
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c.s390	2007-03-01 12:22:04.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c	2007-03-01 12:22:04.000000000 +0100
-@@ -35,7 +35,9 @@
- #if !defined(__sparc__) && \
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c.s390	2007-06-06 15:00:24.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c	2007-06-06 15:03:45.000000000 +0200
+@@ -36,7 +36,8 @@ xf86SlowBcopy(unsigned char *src, unsign
      !defined(__powerpc__) && \
      !defined(__mips__) && \
--    !defined(__ia64__)
-+    !defined(__ia64__) && \
-+    !defined(__s390__) && \
+     !defined(__ia64__) && \
+-    !defined(__arm__)
++    !defined(__arm__) && \
 +    !defined(__s390x__)
  	outb(0x80, 0x00);
  #endif


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- vnc.spec	8 Jun 2007 08:53:40 -0000	1.173
+++ vnc.spec	8 Jun 2007 09:23:51 -0000	1.174
@@ -317,6 +317,7 @@
 %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
+- updated s390 patch to latest Xorg
 
 * Mon Apr 23 2007 Adam Tkac <atkac redhat com> 4.1.2-17.fc7
 - removed patch to #188169 because patching this bug could do