rpms/vnc/devel vnc-fontpath.patch, 1.2, 1.3 vnc-modular-xorg.patch, 1.4, 1.5 vnc-s390.patch, 1.1, 1.2 vnc.spec, 1.119, 1.120
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 21 15:54:38 UTC 2005
Author: twaugh
Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16199
Modified Files:
vnc-fontpath.patch vnc-modular-xorg.patch vnc-s390.patch
vnc.spec
Log Message:
* Wed Dec 21 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-31
- Rebase on xorg-x11-server-1.0.0-2.
vnc-fontpath.patch:
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: vnc-fontpath.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-fontpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnc-fontpath.patch 29 Nov 2005 19:50:57 -0000 1.2
+++ vnc-fontpath.patch 21 Dec 2005 15:54:34 -0000 1.3
@@ -1,11 +1,14 @@
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/configure.ac.fontpath 2005-11-29 18:10:27.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/configure.ac 2005-11-29 18:10:37.000000000 +0000
-@@ -343,7 +343,7 @@
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac.fontpath 2005-12-21 11:14:58.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac 2005-12-21 11:16:56.000000000 +0000
+@@ -339,9 +339,9 @@
AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
[ MESA_SOURCE="$withval" ],
[ MESA_SOURCE="" ])
--FONTDIR="${libdir}/X11/fonts"
-+FONTDIR="${datadir}/X11/fonts"
+-AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
++AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${datadir}/X11/fonts)]),
+ [ FONTDIR="$withval" ],
+- [ FONTDIR="${libdir}/X11/fonts" ])
++ [ FONTDIR="${datadir}/X11/fonts" ])
DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
[ FONTPATH="$withval" ],
vnc-modular-xorg.patch:
vncinstall | 6 +-
xc/programs/Xserver/vnc/Xvnc/xvnc.cc | 9 ---
xorg-server-1.0.0/configure.ac | 1
xorg-server-1.0.0/hw/Makefile.am | 3 +
xorg-server-1.0.0/hw/vnc/Makefile.am | 85 +++++++++++++++++++++++++++++++++++
xorg-server-1.0.0/mi/miinitext.c | 6 ++
6 files changed, 100 insertions(+), 10 deletions(-)
Index: vnc-modular-xorg.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-modular-xorg.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vnc-modular-xorg.patch 6 Dec 2005 16:24:01 -0000 1.4
+++ vnc-modular-xorg.patch 21 Dec 2005 15:54:34 -0000 1.5
@@ -1,6 +1,6 @@
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/vnc/Makefile.am 2005-11-25 16:07:03.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/vnc/Makefile.am 2005-11-30 19:48:03.000000000 +0000
-@@ -0,0 +1,78 @@
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/vnc/Makefile.am 2005-11-25 16:07:03.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/vnc/Makefile.am 2005-11-30 19:48:03.000000000 +0000
+@@ -0,0 +1,85 @@
+noinst_LTLIBRARIES = libvnccommon.la
+libvnccommon_la_SOURCES = \
+ RegionHelper.h \
@@ -37,6 +37,13 @@
+ ../../render/librender.la \
+ ../../xkb/libxkbstubs.la \
+ ../../dbe/libdbe.la \
++ ../../Xext/libXext.la \
++ ../../XTrap/libxtrap.la \
++ ../../record/librecord.la \
++ ../xfree86/os-support/libxorgos.la \
++ ../../os./libos.la \
++ ../xfree86/common/libcommon.a \
++ -lX11
+ libvnccommon.la \
+ ../../../../common/rfb/librfb.a \
+ ../../../../common/rdr/librdr.a \
@@ -79,8 +86,8 @@
+
+# Man page
+include $(top_srcdir)/cpprules.in
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/Makefile.am.vnc 2005-11-25 16:01:56.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/Makefile.am 2005-11-25 16:02:41.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/Makefile.am.vnc 2005-11-25 16:01:56.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/Makefile.am 2005-11-25 16:02:41.000000000 +0000
@@ -18,6 +18,8 @@
XWIN_SUBDIRS = xwin
endif
@@ -98,8 +105,8 @@
$(DMX_SUBDIRS)
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/configure.ac.modular-xorg 2005-11-28 08:16:21.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/configure.ac 2005-11-28 08:16:38.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac.modular-xorg 2005-11-28 08:16:21.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac 2005-11-28 08:16:38.000000000 +0000
@@ -1347,6 +1347,7 @@
hw/xnest/Makefile
hw/xwin/Makefile
@@ -170,8 +177,8 @@
+if [ -f $vncModule -a -d "$moduledst" ]; then
if cmp -s $vncModule $moduledst/`basename $vncModule`; then
echo "`basename $vncModule` hasn't changed"
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/mi/miinitext.c.modular-xorg 2005-12-01 11:45:11.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/mi/miinitext.c 2005-12-01 11:47:17.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/mi/miinitext.c.modular-xorg 2005-12-01 11:45:11.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/mi/miinitext.c 2005-12-01 11:47:17.000000000 +0000
@@ -284,6 +284,9 @@
#ifdef MITMISC
extern void MITMiscExtensionInit(INITARGS);
vnc-s390.patch:
common/compiler.h | 9 +++++++++
common/xf86Bus.c | 2 +-
common/xf86Helper.c | 2 ++
int10/Makefile.am | 3 ++-
os-support/linux/lnx_video.c | 20 +++++++++++---------
os-support/misc/SlowBcopy.c | 4 +++-
6 files changed, 28 insertions(+), 12 deletions(-)
Index: vnc-s390.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-s390.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vnc-s390.patch 1 Dec 2005 17:54:08 -0000 1.1
+++ vnc-s390.patch 21 Dec 2005 15:54:34 -0000 1.2
@@ -1,52 +1,5 @@
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/common/xf86Bus.c.s390 2005-07-03 04:53:42.000000000 -0400
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/common/xf86Bus.c 2005-12-01 11:51:38.000000000 -0500
-@@ -3078,7 +3078,7 @@
- CheckGenericGA()
- {
- /* This needs to be changed for multiple domains */
--#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__)
-+#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__s390__) && !defined(__s390x)
- IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
- CARD8 CurrentValue, TestValue;
-
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/common/xf86Helper.c.s390 2005-07-03 04:53:42.000000000 -0400
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/common/xf86Helper.c 2005-12-01 11:51:38.000000000 -0500
-@@ -2069,6 +2069,7 @@
- void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg,
- int maskval, int knownclkindex, int knownclkvalue)
- {
-+#if !defined(__s390__) && !defined(__s390x__)
- register int status = vertsyncreg;
- unsigned long i, cnt, rcnt, sync;
-
-@@ -2162,6 +2163,7 @@
-
- /* Restore registers that were written on */
- (*ClockFunc)(pScrn, CLK_REG_RESTORE);
-+#endif /* !defined(__s390__) && !defined(__s390x__) */
- }
-
- void
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/common/compiler.h.s390 2005-12-01 12:16:32.000000000 -0500
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/common/compiler.h 2005-12-01 12:27:26.000000000 -0500
-@@ -1355,6 +1355,15 @@
- : "0" (_beg), "r" (_end), "r" (_flg)); \
- } while (0)
-
-+# elif defined(__s390__) || defined(__s390x__)
-+
-+#define inb(x) (0)
-+#define inw(x) (0)
-+#define inl(x) (0)
-+#define outb(x,y) (0)
-+#define outw(x,y) (0)
-+#define outl(x,y) (0)
-+
- # else /* ix86 */
-
- # define ldq_u(p) (*((unsigned long *)(p)))
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/os-support/linux/lnx_video.c.s390 2005-09-19 14:38:26.000000000 -0400
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/os-support/linux/lnx_video.c 2005-12-01 12:35:49.000000000 -0500
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/linux/lnx_video.c.s390 2005-09-19 19:38:26.000000000 +0100
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/linux/lnx_video.c 2005-12-21 12:29:17.000000000 +0000
@@ -64,7 +64,9 @@
#elif !defined(__powerpc__) && \
!defined(__mc68000__) && \
@@ -124,8 +77,8 @@
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/os-support/misc/SlowBcopy.c.s390 2005-12-01 12:09:59.000000000 -0500
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/os-support/misc/SlowBcopy.c 2005-12-01 12:13:30.000000000 -0500
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/misc/SlowBcopy.c.s390 2005-07-03 08:01:34.000000000 +0100
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/misc/SlowBcopy.c 2005-12-21 12:29:17.000000000 +0000
@@ -36,7 +36,9 @@
#if !defined(__sparc__) && \
!defined(__powerpc__) && \
@@ -137,15 +90,62 @@
outb(0x80, 0x00);
#endif
}
---- vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/int10/Makefile.am.s390 2005-10-01 02:19:02.000000000 -0400
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-0.99.3/hw/xfree86/int10/Makefile.am 2005-12-01 11:51:38.000000000 -0500
-@@ -25,7 +25,8 @@
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/int10/Makefile.am.s390 2005-12-02 06:02:41.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/int10/Makefile.am 2005-12-21 12:29:46.000000000 +0000
+@@ -27,7 +27,8 @@
endif
if INT10_STUB
--AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
-+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) -I../common \
-+ -I../os-support -I ../os-support/bus
+-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
++AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) \
++ -I../common -I../os-support -I../os-support/bus
libint10_la_SOURCES = stub.c xf86int10module.c
endif
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Bus.c.s390 2005-07-03 09:53:42.000000000 +0100
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Bus.c 2005-12-21 12:29:17.000000000 +0000
+@@ -3078,7 +3078,7 @@
+ CheckGenericGA()
+ {
+ /* This needs to be changed for multiple domains */
+-#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__)
++#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__s390__) && !defined(__s390x)
+ IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
+ CARD8 CurrentValue, TestValue;
+
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Helper.c.s390 2005-07-03 09:53:42.000000000 +0100
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Helper.c 2005-12-21 12:29:17.000000000 +0000
+@@ -2069,6 +2069,7 @@
+ void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg,
+ int maskval, int knownclkindex, int knownclkvalue)
+ {
++#if !defined(__s390__) && !defined(__s390x__)
+ register int status = vertsyncreg;
+ unsigned long i, cnt, rcnt, sync;
+
+@@ -2162,6 +2163,7 @@
+
+ /* Restore registers that were written on */
+ (*ClockFunc)(pScrn, CLK_REG_RESTORE);
++#endif /* !defined(__s390__) && !defined(__s390x__) */
+ }
+
+ void
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/compiler.h.s390 2005-11-08 06:33:28.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/compiler.h 2005-12-21 12:29:17.000000000 +0000
+@@ -1355,6 +1355,15 @@
+ : "0" (_beg), "r" (_end), "r" (_flg)); \
+ } while (0)
+
++# elif defined(__s390__) || defined(__s390x__)
++
++#define inb(x) (0)
++#define inw(x) (0)
++#define inl(x) (0)
++#define outb(x,y) (0)
++#define outw(x,y) (0)
++#define outl(x,y) (0)
++
+ # else /* ix86 */
+
+ # define ldq_u(p) (*((unsigned long *)(p)))
Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vnc.spec 9 Dec 2005 22:43:46 -0000 1.119
+++ vnc.spec 21 Dec 2005 15:54:34 -0000 1.120
@@ -1,11 +1,11 @@
-%define xorg_version 0.99.3-9
+%define xorg_version 1.0.0-2
%define vnc_version 4_1_1
%define java_vnc_version 4_1
Summary: A remote display system.
Name: vnc
Version: 4.1.1
-Release: 30.1
+Release: 31
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
@@ -46,6 +46,7 @@
BuildRequires: libXdmcp-devel, libxkbfile-devel, libXfont-devel
BuildRequires: xorg-x11-proto-devel, liblbxutil-devel, libXext-devel
BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros
+BuildRequires: libXt-devel
Prereq: /sbin/chkconfig /sbin/service
Prereq: gtk2 >= 2.6
Requires: /sbin/runuser
@@ -87,8 +88,10 @@
%patch10 -p1 -b .def
%patch11 -p1 -b .modular-xorg
%patch12 -p1 -b .nohttpd
-%patch13 -p1 -b .fontpath
-%patch14 -p1 -b .s390
+pushd unix/xorg-server-*
+%patch13 -p3 -b .fontpath
+%patch14 -p3 -b .s390
+popd
%patch15 -p1 -b .viewer-reparent
%patch16 -p1 -b .64bit
%patch17 -p1 -b .select
@@ -252,6 +255,9 @@
%{_libdir}/xorg/modules
%changelog
+* Wed Dec 21 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-31
+- Rebase on xorg-x11-server-1.0.0-2.
+
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
More information about the fedora-cvs-commits
mailing list