rpms/vnc/devel vnc-modular-xorg.patch,1.2,1.3 vnc.spec,1.105,1.106
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 1 12:05:41 UTC 2005
Author: twaugh
Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17261
Modified Files:
vnc-modular-xorg.patch vnc.spec
Log Message:
* Thu Dec 1 2005 Tim Waugh <twaugh at redhat.com>
- Actually initialise the vnc extension in Xvnc.
vnc-modular-xorg.patch:
vncinstall | 6 +-
xc/programs/Xserver/vnc/Xvnc/xvnc.cc | 9 ---
xorg-server-0.99.3/configure.ac | 1
xorg-server-0.99.3/hw/Makefile.am | 3 +
xorg-server-0.99.3/hw/vnc/Makefile.am | 77 ++++++++++++++++++++++++++++++++++
xorg-server-0.99.3/mi/miinitext.c | 6 ++
6 files changed, 92 insertions(+), 10 deletions(-)
Index: vnc-modular-xorg.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-modular-xorg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnc-modular-xorg.patch 1 Dec 2005 09:00:18 -0000 1.2
+++ vnc-modular-xorg.patch 1 Dec 2005 12:05:29 -0000 1.3
@@ -3,53 +3,53 @@
@@ -0,0 +1,77 @@
+noinst_LTLIBRARIES = libvnccommon.la
+libvnccommon_la_SOURCES = \
-+ RegionHelper.h \
-+ vncExtInit.cc \
-+ vncExtInit.h \
-+ vncHooks.cc \
-+ vncHooks.h \
-+ XserverDesktop.cc \
-+ XserverDesktop.h
++ RegionHelper.h \
++ vncExtInit.cc \
++ vncExtInit.h \
++ vncHooks.cc \
++ vncHooks.h \
++ XserverDesktop.cc \
++ XserverDesktop.h
+
+libvnccommon_la_CXXFLAGS = \
-+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
-+ -DGC_HAS_COMPOSITE_CLIP \
-+ -DVNC_USE_FB \
-+ -I/usr/include/X11 \
-+ -I../../../../common \
-+ -I../../../vncconfig
++ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
++ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
++ -DGC_HAS_COMPOSITE_CLIP \
++ -DVNC_USE_FB \
++ -I/usr/include/X11 \
++ -I../../../../common \
++ -I../../../vncconfig
+
+bin_PROGRAMS = Xvnc
+
+Xvnc_SOURCES = \
-+ xvnc.cc \
-+ $(top_srcdir)/Xext/dpmsstubs.c \
-+ $(top_srcdir)/Xi/stubs.c \
-+ $(top_srcdir)/mi/miinitext.c \
-+ $(top_srcdir)/fb/fbcmap.c
-+
-+Xvnc_LDADD = $(XORG_CORE_LIBS) \
-+ $(XORG_LIBS) \
-+ $(XSERVER_LIBS) \
-+ ../../fb/libfb.la \
-+ ../../mi/libminimi.la \
-+ ../../render/librender.la \
-+ ../../xkb/libxkbstubs.la \
-+ libvnccommon.la \
-+ ../../../../common/rfb/librfb.a \
-+ ../../../../common/rdr/librdr.a \
-+ ../../../../common/network/libnetwork.a
++ xvnc.cc \
++ $(top_srcdir)/Xext/dpmsstubs.c \
++ $(top_srcdir)/Xi/stubs.c \
++ $(top_srcdir)/mi/miinitext.c \
++ $(top_srcdir)/fb/fbcmap.c
++
++Xvnc_LDADD = $(XORG_CORE_LIBS) \
++ $(XORG_LIBS) \
++ $(XSERVER_LIBS) \
++ ../../fb/libfb.la \
++ ../../mi/libminimi.la \
++ ../../render/librender.la \
++ ../../xkb/libxkbstubs.la \
++ libvnccommon.la \
++ ../../../../common/rfb/librfb.a \
++ ../../../../common/rdr/librdr.a \
++ ../../../../common/network/libnetwork.a
+
+Xvnc_CFLAGS = \
-+ -DNO_HW_ONLY_EXTS \
-+ -DNO_MODULE_EXTS \
-+ -DXFree86Server
-+
-+Xvnc_CXXFLAGS = $(Xvnc_CFLAGS) \
-+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
-+ -DVNC_USE_FB \
++ -DNO_HW_ONLY_EXTS \
++ -DNO_MODULE_EXTS \
++ -DXFree86Server -DVNCEXT
++
++Xvnc_CXXFLAGS = $(Xvnc_CFLAGS) \
++ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
++ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
++ -DVNC_USE_FB \
+ -I../../../../common \
+ -I../../../vncconfig \
+ -I../../mi \
@@ -61,20 +61,20 @@
+libvnc_ladir = $(moduledir)/extensions
+libvnc_la_SOURCES = xf86vncModule.cc
+libvnc_la_LIBADD = \
-+ libvnccommon.la \
-+ ../../../../common/rfb/librfb.a \
-+ ../../../../common/rdr/librdr.a \
-+ ../../../../common/network/libnetwork.a
++ libvnccommon.la \
++ ../../../../common/rfb/librfb.a \
++ ../../../../common/rdr/librdr.a \
++ ../../../../common/network/libnetwork.a
+libvnc_la_CXXFLAGS = \
-+ -I../../../../common \
-+ -I$(top_srcdir)/hw/xfree86/common \
-+ -I$(top_srcdir)/hw/xfree86/os-support \
-+ -I$(top_srcdir)/hw/xfree86/os-support/bus \
-+ -DXFree86Module -DXFree86LOADER -DIN_MODULE
-+
-+AM_CXXFLAGS = $(CFLAGS) \
-+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-+ -DVENDOR_STRING="\"$(VENDOR_STRING)\""
++ -I../../../../common \
++ -I$(top_srcdir)/hw/xfree86/common \
++ -I$(top_srcdir)/hw/xfree86/os-support \
++ -I$(top_srcdir)/hw/xfree86/os-support/bus \
++ -DXFree86Module -DXFree86LOADER -DIN_MODULE
++
++AM_CXXFLAGS = $(CFLAGS) \
++ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
++ -DVENDOR_STRING="\"$(VENDOR_STRING)\""
+
+# Man page
+include $(top_srcdir)/cpprules.in
@@ -169,3 +169,25 @@
+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
+@@ -284,6 +284,9 @@
+ #ifdef MITMISC
+ extern void MITMiscExtensionInit(INITARGS);
+ #endif
++#ifdef VNCEXT
++extern void vncExtensionInit(INITARGS);
++#endif
+ #ifdef XIDLE
+ extern void XIdleExtensionInit(INITARGS);
+ #endif
+@@ -567,6 +570,9 @@
+ #ifdef MITMISC
+ if (!noMITMiscExtension) MITMiscExtensionInit();
+ #endif
++#ifdef VNCEXT
++ vncExtensionInit();
++#endif
+ #ifdef XIDLE
+ if (!noXIdleExtension) XIdleExtensionInit();
+ #endif
Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- vnc.spec 1 Dec 2005 11:37:45 -0000 1.105
+++ vnc.spec 1 Dec 2005 12:05:29 -0000 1.106
@@ -246,6 +246,7 @@
%changelog
* Thu Dec 1 2005 Tim Waugh <twaugh at redhat.com>
+- Actually initialise the vnc extension in Xvnc.
- Disable lbx.
* Thu Dec 1 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-24
More information about the fedora-cvs-commits
mailing list