diff options
Diffstat (limited to 'net-misc/vnc/files/vnc-4.1/vnc-modular-xorg.patch')
| -rw-r--r-- | net-misc/vnc/files/vnc-4.1/vnc-modular-xorg.patch | 203 |
1 files changed, 0 insertions, 203 deletions
diff --git a/net-misc/vnc/files/vnc-4.1/vnc-modular-xorg.patch b/net-misc/vnc/files/vnc-4.1/vnc-modular-xorg.patch deleted file mode 100644 index 78cb11a..0000000 --- a/net-misc/vnc/files/vnc-4.1/vnc-modular-xorg.patch +++ /dev/null @@ -1,203 +0,0 @@ ---- 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 \ -+ 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 -+ -+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 \ -+ ../../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 \ -+ ../../../../common/network/libnetwork.a \ -+ ../../../../common/Xregion/libXregion.a -+ -+Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \ -+ -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 \ -+ -I ../../render \ -+ -I/usr/include/X11 -+ -+libvnc_la_LTLIBRARIES = libvnc.la -+libvnc_la_LDFLAGS = -module -avoid-version -+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 \ -+ ../../../../common/Xregion/libXregion.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)\"" -+ -+# Man page -+include $(top_srcdir)/cpprules.in ---- 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 - -+XVNC_SUBDIRS = vnc -+ - # need to add darwin support here - - SUBDIRS = \ -@@ -25,6 +27,7 @@ - $(XWIN_SUBDIRS) \ - $(XVFB_SUBDIRS) \ - $(XNEST_SUBDIRS) \ -+ $(XVNC_SUBDIRS) \ - $(DMX_SUBDIRS) - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin ---- 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 - hw/darwin/Makefile -+hw/vnc/Makefile - Xprint/Makefile - Xprint/doc/Makefile - Xprint/pcl/Makefile ---- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-11-29 12:52:42.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-11-29 15:31:54.000000000 +0000 -@@ -36,8 +36,6 @@ - extern "C" { - #define class c_class - #define public c_public --#define xor c_xor --#define and c_and - #ifdef WIN32 - #include <X11/Xwinsock.h> - #endif -@@ -72,11 +70,8 @@ - #include "inputstr.h" - #include "keysym.h" - extern int defaultColorVisualClass; -- extern char buildtime[]; - #undef class - #undef public --#undef xor --#undef and - #ifndef VNC_USE_FB - extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int); - extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int); -@@ -221,7 +216,7 @@ - - void ddxUseMsg() - { -- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); -+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); - ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, - VENDOR_STRING); - ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); -@@ -927,7 +922,7 @@ - - void InitOutput(ScreenInfo *screenInfo, int argc, char **argv) - { -- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); -+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); - ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, - VENDOR_STRING); - wellKnownSocketsCreated = true; ---- vnc-4_1_1-unixsrc/unix/vncinstall.modular-xorg 2005-11-29 16:26:20.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/vncinstall 2005-11-29 16:27:46.000000000 +0000 -@@ -56,7 +56,7 @@ - fi - fi - --for f in xc/programs/Xserver/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ -+for f in xorg-server-*/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ - vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do - if [ ! -f $f ]; then - echo "Couldn't find $f" -@@ -85,7 +85,7 @@ - - done - --vncModule=xc/programs/Xserver/vnc/module/vnc.so --if [ -f "$vncModule" -a -d "$moduledst" ]; then -+vncModule=xorg-server-*/hw/vnc/.libs/libvnc.so -+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-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); - #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 |