Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (2e554ea5f833f8f1af01d3ba266ce764aae56c9e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (2e554ea5f833f8f1af01d3ba266ce764aae56c9e)
  • Date: Sat, 5 Jan 2008 09:05:10 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

x11/vnc/17_all_vnc-server-modular-xorg.patch | 180 +++++++++++
x11/vnc/43_all_vnc-autotools.patch | 418
+++++++++++++++++++++++++++
x11/vnc/44_all_vnc-server-autotools.patch | 26 +
x11/vnc/45_all_vnc-autotools-compile.patch | 11
x11/vnc/BUILD | 22 +
x11/vnc/CONFIGURE | 1
x11/vnc/DEPENDS | 10
x11/vnc/DETAILS | 9
x11/vnc/HISTORY | 13
x11/vnc/INSTALL | 25 +
x11/vnc/PRE_BUILD | 59 +++
x11/vnc/gcc-3.4.patch | 44 --
12 files changed, 764 insertions(+), 54 deletions(-)

New commits:
commit 2e554ea5f833f8f1af01d3ba266ce764aae56c9e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

vnc: 4.1.2
(disabled) server support #8752
-> bad link karma (no upstream support for newer xorg)

diff --git a/x11/vnc/17_all_vnc-server-modular-xorg.patch
b/x11/vnc/17_all_vnc-server-modular-xorg.patch
new file mode 100644
index 0000000..80f3ad1
--- /dev/null
+++ b/x11/vnc/17_all_vnc-server-modular-xorg.patch
@@ -0,0 +1,180 @@
+--- unix/xorg-x11-server-source/mi/miinitext.c.modular-xorg 2007-03-02
15:45:37.000000000 +0100
++++ unix/xorg-x11-server-source/mi/miinitext.c 2007-03-02 15:45:38.000000000
+0100
+@@ -283,6 +283,9 @@
+ #ifdef MITMISC
+ extern void MITMiscExtensionInit(INITARGS);
+ #endif
++#ifdef VNCEXT
++extern void vncExtensionInit(INITARGS);
++#endif
+ #ifdef XIDLE
+ extern void XIdleExtensionInit(INITARGS);
+ #endif
+@@ -561,6 +564,9 @@
+ #ifdef MITMISC
+ if (!noMITMiscExtension) MITMiscExtensionInit();
+ #endif
++#ifdef VNCEXT
++ vncExtensionInit();
++#endif
+ #ifdef XIDLE
+ if (!noXIdleExtension) XIdleExtensionInit();
+ #endif
+--- unix/xorg-x11-server-source/hw/Makefile.am.modular-xorg 2007-03-02
15:45:38.000000000 +0100
++++ unix/xorg-x11-server-source/hw/Makefile.am 2007-03-02 15:47:10.000000000
+0100
+@@ -30,6 +30,8 @@
+ XPRINT_SUBDIRS = xprint
+ endif
+
++XVNC_SUBDIRS = vnc
++
+ # need to add darwin support here
+
+ SUBDIRS = \
+@@ -39,6 +41,7 @@
+ $(XVFB_SUBDIRS) \
+ $(XNEST_SUBDIRS) \
+ $(DMX_SUBDIRS) \
++ $(XVNC_SUBDIRS) \
+ $(KDRIVE_SUBDIRS) \
+ $(XPRINT_SUBDIRS)
+
+--- /dev/null 2007-03-01 10:25:08.783929433 +0100
++++ unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-03-02
15:45:38.000000000 +0100
+@@ -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.la \
++ -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)\""
++
+--- unix/xorg-x11-server-source/configure.ac.modular-xorg 2007-03-02
15:45:38.000000000 +0100
++++ unix/xorg-x11-server-source/configure.ac 2007-03-02 15:45:38.000000000
+0100
+@@ -1793,6 +1793,7 @@
+ hw/xnest/Makefile
+ hw/xwin/Makefile
+ hw/darwin/Makefile
++hw/vnc/Makefile
+ hw/kdrive/Makefile
+ hw/kdrive/ati/Makefile
+ hw/kdrive/chips/Makefile
+--- unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02
15:45:38.000000000 +0100
++++ unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000
+0100
+@@ -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;
diff --git a/x11/vnc/43_all_vnc-autotools.patch
b/x11/vnc/43_all_vnc-autotools.patch
new file mode 100644
index 0000000..82657dc
--- /dev/null
+++ b/x11/vnc/43_all_vnc-autotools.patch
@@ -0,0 +1,418 @@
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ common/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,5 @@
++SUBDIRS = \
++ rdr \
++ network \
++ Xregion \
++ rfb
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ common/rfb/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,136 @@
++lib_LTLIBRARIES = librfb.la
++
++librfb_la_SOURCES = \
++ Blacklist.cxx \
++ Blacklist.h \
++ CConnection.cxx \
++ CConnection.h \
++ CMsgHandler.cxx \
++ CMsgHandler.h \
++ CMsgReader.cxx \
++ CMsgReader.h \
++ CMsgReaderV3.cxx \
++ CMsgReaderV3.h \
++ CMsgWriter.cxx \
++ CMsgWriter.h \
++ CMsgWriterV3.cxx \
++ CMsgWriterV3.h \
++ ColourCube.h \
++ ColourMap.h \
++ ComparingUpdateTracker.cxx \
++ ComparingUpdateTracker.h \
++ Configuration.cxx \
++ Configuration.h \
++ ConnParams.cxx \
++ ConnParams.h \
++ CSecurity.h \
++ CSecurityNone.h \
++ CSecurityVncAuth.cxx \
++ CSecurityVncAuth.h \
++ Cursor.cxx \
++ Cursor.h \
++ Decoder.cxx \
++ Decoder.h \
++ d3des.c \
++ d3des.h \
++ Encoder.cxx \
++ Encoder.h \
++ encodings.cxx \
++ encodings.h \
++ Exception.h \
++ hextileConstants.h \
++ hextileDecode.h \
++ HextileDecoder.cxx \
++ HextileDecoder.h \
++ hextileEncode.h \
++ HextileEncoder.cxx \
++ HextileEncoder.h \
++ Hostname.h \
++ HTTPServer.cxx \
++ HTTPServer.h \
++ ImageGetter.h \
++ InputHandler.h \
++ KeyRemapper.cxx \
++ KeyRemapper.h \
++ keysymdef.h \
++ Logger.cxx \
++ Logger_file.cxx \
++ Logger_file.h \
++ Logger.h \
++ Logger_stdio.cxx \
++ Logger_stdio.h \
++ LogWriter.cxx \
++ LogWriter.h \
++ msgTypes.h \
++ Password.cxx \
++ Password.h \
++ PixelBuffer.cxx \
++ PixelBuffer.h \
++ PixelFormat.cxx \
++ PixelFormat.h \
++ Pixel.h \
++ RawDecoder.cxx \
++ RawDecoder.h \
++ RawEncoder.cxx \
++ RawEncoder.h \
++ Rect.h \
++ Region.cxx \
++ Region.h \
++ rreDecode.h \
++ RREDecoder.cxx \
++ RREDecoder.h \
++ rreEncode.h \
++ RREEncoder.cxx \
++ RREEncoder.h \
++ SConnection.cxx \
++ SConnection.h \
++ SDesktop.h \
++ secTypes.cxx \
++ secTypes.h \
++ ServerCore.cxx \
++ ServerCore.h \
++ SMsgHandler.cxx \
++ SMsgHandler.h \
++ SMsgReader.cxx \
++ SMsgReader.h \
++ SMsgReaderV3.cxx \
++ SMsgReaderV3.h \
++ SMsgWriter.cxx \
++ SMsgWriter.h \
++ SMsgWriterV3.cxx \
++ SMsgWriterV3.h \
++ SSecurityFactoryStandard.cxx \
++ SSecurityFactoryStandard.h \
++ SSecurity.h \
++ SSecurityNone.h \
++ SSecurityVncAuth.cxx \
++ SSecurityVncAuth.h \
++ Threading.h \
++ Timer.cxx \
++ Timer.h \
++ TransImageGetter.cxx \
++ TransImageGetter.h \
++ transInitTempl.h \
++ transTempl.h \
++ TrueColourMap.h \
++ UpdateTracker.cxx \
++ UpdateTracker.h \
++ UserPasswdGetter.h \
++ util.cxx \
++ util.h \
++ VNCSConnectionST.cxx \
++ VNCSConnectionST.h \
++ VNCServer.h \
++ VNCServerST.cxx \
++ VNCServerST.h \
++ zrleDecode.h \
++ ZRLEDecoder.cxx \
++ ZRLEDecoder.h \
++ zrleEncode.h \
++ ZRLEEncoder.cxx \
++ ZRLEEncoder.h
++
++librfb_la_LIBADD = \
++ $(top_srcdir)/network/libnetwork.la \
++ $(top_srcdir)/rdr/librdr.la \
++ $(top_srcdir)/Xregion/libXregion.la
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ common/rdr/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,30 @@
++noinst_LTLIBRARIES = librdr.la
++
++librdr_la_SOURCES = \
++ Exception.cxx \
++ FdInStream.h \
++ FixedMemOutStream.h \
++ HexOutStream.cxx \
++ InStream.h \
++ OutStream.h \
++ SubstitutingInStream.h \
++ ZlibInStream.h \
++ Exception.h \
++ FdOutStream.cxx \
++ HexInStream.cxx \
++ HexOutStream.h \
++ MemInStream.h \
++ RandomStream.cxx \
++ types.h \
++ ZlibOutStream.cxx \
++ FdInStream.cxx \
++ FdOutStream.h \
++ HexInStream.h \
++ InStream.cxx \
++ MemOutStream.h \
++ RandomStream.h \
++ ZlibInStream.cxx \
++ ZlibOutStream.h
++
++librdr_la_LIBADD = \
++ -lz
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ common/configure.ac 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,42 @@
++# -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ(2.60)
++AC_INIT([vnc-libs], 4.1.2, [bugzilla.redhat.com])
++AC_CONFIG_HEADER([config.h])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++
++# Checks for programs.
++AC_PROG_CXX
++AC_PROG_CC
++AC_PROG_LIBTOOL
++
++# Checks for libraries.
++
++# Checks for header files.
++AC_HEADER_STDC
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h
stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_HEADER_STDBOOL
++AC_C_CONST
++AC_C_INLINE
++AC_TYPE_SIZE_T
++AC_HEADER_TIME
++AC_STRUCT_TM
++
++# Checks for library functions.
++AC_FUNC_ERROR_AT_LINE
++AC_FUNC_MEMCMP
++AC_FUNC_SELECT_ARGTYPES
++AC_TYPE_SIGNAL
++AC_FUNC_STRFTIME
++AC_FUNC_VPRINTF
++AC_CHECK_FUNCS([ftime gethostbyname getpass gettimeofday inet_ntoa memchr
memmove memset select socket strcasecmp strchr strerror strncasecmp])
++
++AC_CONFIG_FILES([Makefile
++ Xregion/Makefile
++ network/Makefile
++ rdr/Makefile
++ rfb/Makefile])
++AC_OUTPUT
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ common/Xregion/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,6 @@
++noinst_LTLIBRARIES = libXregion.la
++
++libXregion_la_SOURCES = \
++ Region.c \
++ region.h \
++ Xregion.h
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ common/network/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,6 @@
++noinst_LTLIBRARIES = libnetwork.la
++
++libnetwork_la_SOURCES = \
++ Socket.h \
++ TcpSocket.cxx \
++ TcpSocket.h
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,6 @@
++SUBDIRS = \
++ tx \
++ vncpasswd \
++ vncviewer \
++ vncconfig \
++ x0vncserver
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/tx/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,25 @@
++noinst_LTLIBRARIES = libtx.la
++
++libtx_la_SOURCES = \
++ TXButton.h \
++ TXDialog.h \
++ TXEntry.h \
++ TXCheckbox.h \
++ TXImage.cxx \
++ TXImage.h \
++ TXLabel.h \
++ TXMenu.cxx \
++ TXMenu.h \
++ TXMsgBox.h \
++ TXScrollbar.cxx \
++ TXScrollbar.h \
++ TXViewport.cxx \
++ TXViewport.h \
++ TXWindow.cxx \
++ TXWindow.h
++
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/../common/
++
++libtx_la_LIBADD = \
++ -lX11
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/vncpasswd/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,10 @@
++bin_PROGRAMS = vncpasswd
++
++vncpasswd_SOURCES = \
++ vncpasswd.cxx
++
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/../common
++
++vncpasswd_LDADD = \
++ $(top_srcdir)/../common/rfb/librfb.la
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/vncconfig/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,17 @@
++bin_PROGRAMS = vncconfig
++
++vncconfig_SOURCES = \
++ buildtime.c \
++ QueryConnectDialog.cxx \
++ QueryConnectDialog.h \
++ vncconfig.cxx \
++ vncExt.c \
++ vncExt.h
++
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/../common \
++ -I$(top_srcdir)/tx
++
++vncconfig_LDADD = \
++ $(top_srcdir)/../common/rfb/librfb.la \
++ $(top_srcdir)/tx/libtx.la
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/configure.ac 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,52 @@
++# -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ(2.60)
++AC_INIT([vnc], 4.1.2, [bugzilla.redhat.com])
++AC_CONFIG_SRCDIR([x0vncserver/buildtime.c])
++AC_CONFIG_HEADER([config.h])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++
++# Checks for programs.
++AC_PROG_CXX
++AC_PROG_CC
++AC_PROG_LIBTOOL
++
++# Checks for libraries.
++
++# Checks for header files.
++AC_PATH_X
++AC_HEADER_STDC
++AC_HEADER_SYS_WAIT
++AC_CHECK_HEADERS([fcntl.h stdlib.h string.h strings.h sys/time.h termios.h
unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_HEADER_STDBOOL
++AC_C_CONST
++AC_C_INLINE
++AC_C_RESTRICT
++AC_TYPE_SIZE_T
++AC_HEADER_TIME
++
++# Checks for library functions.
++AC_FUNC_ERROR_AT_LINE
++AC_FUNC_FORK
++AC_FUNC_LSTAT
++AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
++AC_FUNC_MALLOC
++AC_FUNC_MEMCMP
++AC_FUNC_REALLOC
++AC_FUNC_SELECT_ARGTYPES
++AC_TYPE_SIGNAL
++AC_FUNC_STAT
++AC_FUNC_VPRINTF
++AC_FUNC_WAIT3
++AC_CHECK_FUNCS([memset mkdir select setenv strchr strdup strerror strspn
strtol])
++
++AC_CONFIG_FILES([Makefile
++ tx/Makefile
++ vncconfig/Makefile
++ vncpasswd/Makefile
++ vncviewer/Makefile
++ x0vncserver/Makefile])
++AC_OUTPUT
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/vncviewer/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,24 @@
++bin_PROGRAMS = vncviewer
++
++vncviewer_SOURCES = \
++ AboutDialog.h \
++ buildtime.c \
++ CConn.cxx \
++ CConn.h \
++ DesktopWindow.cxx \
++ DesktopWindow.h \
++ InfoDialog.h \
++ OptionsDialog.h \
++ parameters.h \
++ PasswdDialog.h \
++ ServerDialog.h \
++ vncviewer.cxx
++
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/../common \
++ -I$(top_srcdir)/tx
++
++vncviewer_LDADD = \
++ $(top_srcdir)/../common/rfb/librfb.la \
++ $(top_srcdir)/tx/libtx.la \
++ -lXext
+--- /dev/null 2007-02-16 09:39:42.585819347 +0100
++++ unix/x0vncserver/Makefile.am 2007-02-16 09:51:11.000000000 +0100
+@@ -0,0 +1,20 @@
++bin_PROGRAMS = x0vncserver
++
++x0vncserver_SOURCES = \
++ buildtime.c \
++ Image.cxx \
++ Image.h \
++ x0vncserver.cxx \
++ $(top_srcdir)/vncconfig/QueryConnectDialog.h \
++ $(top_srcdir)/vncconfig/QueryConnectDialog.cxx
++
++AM_CPPFLAGS = \
++ -I$(top_srcdir)/../common \
++ -I$(top_srcdir)/vncconfig \
++ -I$(top_srcdir)/tx
++
++x0vncserver_LDADD = \
++ $(top_srcdir)/../common/rfb/librfb.la \
++ $(top_srcdir)/tx/libtx.la \
++ -lXext \
++ -lXtst
diff --git a/x11/vnc/44_all_vnc-server-autotools.patch
b/x11/vnc/44_all_vnc-server-autotools.patch
new file mode 100644
index 0000000..f16d7fc
--- /dev/null
+++ b/x11/vnc/44_all_vnc-server-autotools.patch
@@ -0,0 +1,26 @@
+--- unix/xorg-x11-server-source/hw/vnc/Makefile.am.autotools 2007-02-16
09:52:43.000000000 +0100
++++ unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-02-16
09:53:24.000000000 +0100
+@@ -42,10 +42,7 @@
+ ../xfree86/common/libcommon.la \
+ -lX11 \
+ libvnccommon.la \
+- ../../../../common/rfb/librfb.a \
+- ../../../../common/rdr/librdr.a \
+- ../../../../common/network/libnetwork.a \
+- ../../../../common/Xregion/libXregion.a
++ ../../../../common/rfb/librfb.la
+
+ Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \
+ -DNO_HW_ONLY_EXTS \
+@@ -68,10 +65,7 @@
+ 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
++ ../../../../common/rfb/librfb.la
+ libvnc_la_CXXFLAGS = \
+ -I../../../../common \
+ -I$(top_srcdir)/hw/xfree86/common \
\ No newline at end of file
diff --git a/x11/vnc/45_all_vnc-autotools-compile.patch
b/x11/vnc/45_all_vnc-autotools-compile.patch
new file mode 100644
index 0000000..8c03dd8
--- /dev/null
+++ b/x11/vnc/45_all_vnc-autotools-compile.patch
@@ -0,0 +1,11 @@
+--- common/network/TcpSocket.cxx.autotools-compile 2007-02-15
18:56:52.000000000 +0100
++++ common/network/TcpSocket.cxx 2007-02-15 18:57:21.000000000 +0100
+@@ -42,7 +42,7 @@
+ #include <rfb/LogWriter.h>
+
+ #ifndef VNC_SOCKLEN_T
+-#define VNC_SOCKLEN_T int
++#define VNC_SOCKLEN_T socklen_t
+ #endif
+
+ #ifndef INADDR_NONE
diff --git a/x11/vnc/BUILD b/x11/vnc/BUILD
index 2eb1f08..307ba0e 100755
--- a/x11/vnc/BUILD
+++ b/x11/vnc/BUILD
@@ -1,2 +1,20 @@
-patch -p1 < $SCRIPT_DIRECTORY/gcc-3.4.patch &&
-default_build
+echo doing common ----------------------------------- &&
+cd common &&
+default_build &&
+
+echo doing unix ----------------------------------- &&
+cd ../unix &&
+default_build &&
+
+# building Xvnc requires the whole X server be built #8752
+if [[ $VNC_SERVER == y ]]; then
+ echo doing the server ----------------------------------- &&
+ cd xorg-server &&
+ OPTS="$OPTS --enable-xorg --disable-xnest --disable-xvfb --disable-dmx" &&
+ OPTS="$OPTS --disable-xwin --disable-xephyr --disable-kdrive
--disable-xorgcfg" &&
+ OPTS="$OPTS --disable-xprint --disable-static --enable-composite
--enable-xtrap" &&
+ OPTS="$OPTS --enable-xcsecurity --disable-xevie --disable-dri" &&
+ default_build &&
+ cd ..
+fi &&
+cd ..
diff --git a/x11/vnc/CONFIGURE b/x11/vnc/CONFIGURE
new file mode 100755
index 0000000..38f6b29
--- /dev/null
+++ b/x11/vnc/CONFIGURE
@@ -0,0 +1 @@
+#config_query VNC_SERVER "Do you want to build the VNC server?" n
diff --git a/x11/vnc/DEPENDS b/x11/vnc/DEPENDS
index 24f1d75..be3f6a8 100755
--- a/x11/vnc/DEPENDS
+++ b/x11/vnc/DEPENDS
@@ -1,11 +1,17 @@
depends zlib '--with-installed-zlib' &&
-depends X11-LIBS &&
+depends X11-SERVER &&

. $GRIMOIRE/FUNCTIONS &&

-if check_if_xorg_modular_libs; then
+if check_if_xorg_modular_server; then
depends libice &&
depends libsm &&
depends libxext &&
depends libxtst
+fi &&
+
+if [[ $VNC_SERVER == y ]]; then
+ depends autoconf &&
+ depends automake &&
+ depends libtool
fi
diff --git a/x11/vnc/DETAILS b/x11/vnc/DETAILS
index d828565..3010283 100755
--- a/x11/vnc/DETAILS
+++ b/x11/vnc/DETAILS
@@ -1,9 +1,12 @@
SPELL=vnc
- VERSION=4.0
+ VERSION=4_1_2
SOURCE=$SPELL-${VERSION}-unixsrc.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}-unixsrc
- SOURCE_URL[0]=http://www.realvnc.com/dist/$SOURCE
-
SOURCE_HASH=sha512:06e91ee227356d8df52fcb44bdbe718bff498f6ecb053962fbe85b7547940bf1ae80c13b03f518c657b8e2a07fa60059ba5a305a9a4d7060292cde00d7232275
+ SOURCE_URL[0]=http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/$SOURCE
+
SOURCE_URL[1]=ftp://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/mirrors/$SOURCE
+ SOURCE_URL[2]=
ftp://ftp.man.szczecin.pl/pub/FreeBSD/ports/distfiles/xc/$SOURCE
+ SOURCE_URL[3]=http://download.sourcemage.org/distro/misc/$SOURCE
+
SOURCE_HASH=sha512:110ed71320d8b8224380b076c8041acaf13a06a33e0842763e3d9ec5599d8bb8d75b19c488c2a8fddf8cb2a4f5f53acc9111c97f07cbcb14a4f6a55b86e51555
WEB_SITE=http://www.realvnc.com/
ENTERED=20020112
LICENSE=GPL
diff --git a/x11/vnc/HISTORY b/x11/vnc/HISTORY
index 581c545..8548180 100644
--- a/x11/vnc/HISTORY
+++ b/x11/vnc/HISTORY
@@ -1,3 +1,16 @@
+2008-01-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gcc-3.4.patch: removed, obsolete
+ * DEPENDS: changed X11-LIBS to -SERVER
+ added auto* for the server
+ * *.patch: 4 patches from red hat
+ * BUILD, PRE_BUILD: build the server #8752 (supports only
xorg-modular)
+ * CONFIGURE: added to ask about building the server; DISABLED
+ * DETAILS: Fixed SOURCE_URL[0], realvnc uses a cgi script now
+ added some more mirrors
+ updated spell to 4.1.2
+ * INSTALL: changes for the new version's layout and server support
+ * PRE_BUILD: server support
+
2007-03-01 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: If using xorg-modular, depend on libice, libsm, libxext,
and libxtst
diff --git a/x11/vnc/INSTALL b/x11/vnc/INSTALL
index 02beea4..e0d7975 100755
--- a/x11/vnc/INSTALL
+++ b/x11/vnc/INSTALL
@@ -1,3 +1,22 @@
-./vncinstall /usr/bin /usr/share/man &&
-mkdir -p /usr/share/vnc/classes &&
-cp java/* /usr/share/vnc/classes
+if [[ $VNC_SERVER != y ]]; then
+ mkdir -p "$INSTALL_ROOT"/usr/share/vnc/classes &&
+ cp common/javabin/* "$INSTALL_ROOT"/usr/share/vnc/classes &&
+
+ cd unix &&
+ local module_dir="$INSTALL_ROOT"/usr/lib/xorg/modules/extensions &&
+ if check_if_xorg_modular_server; then
+ ./vncinstall "$INSTALL_ROOT"/usr/bin "$INSTALL_ROOT"/usr/share/man
"$module_dir"
+ else
+ ./vncinstall "$INSTALL_ROOT"/usr/bin "$INSTALL_ROOT"/usr/share/man
+ fi
+else
+ cd common &&
+ make install &&
+ cd .. &&
+
+ cd unix &&
+ make install &&
+
+ cd xorg-server/hw/vnc &&
+ make install
+fi
diff --git a/x11/vnc/PRE_BUILD b/x11/vnc/PRE_BUILD
new file mode 100755
index 0000000..13f1252
--- /dev/null
+++ b/x11/vnc/PRE_BUILD
@@ -0,0 +1,59 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ $VNC_SERVER == y ]]; then
+ . $GRIMOIRE/FUNCTIONS &&
+ # building Xvnc requires the X source tree #8752
+ if check_if_xorg_modular_server; then
+ if ! test -e $SOURCE_CACHE/xorg-server-$(installed_version
xorg-server)*; then
+ message -n "$PROBLEM_COLOR"
+ message "Missing installed xorg-server sources, VNC can not build!"
+ message "$DEFAULT_COLOR"
+ return 1
+ fi &&
+
+ # unpack xorg-server
+ cd unix &&
+ tar xf $SOURCE_CACHE/xorg-server-$(installed_version xorg-server)* &&
+ mv xorg-server-$(installed_version xorg-server)* xorg-server &&
+ ln -s xorg-server xorg-x11-server-source && # for patching convenience
+ mkdir xorg-server/hw/vnc &&
+ cd .. &&
+
+ # prepare the sources
+ patch -p0 -F3 < $SPELL_DIRECTORY/17_all_vnc-server-modular-xorg.patch &&
+ patch -p0 -F3 < $SPELL_DIRECTORY/43_*.patch &&
+ patch -p0 -F3 < $SPELL_DIRECTORY/44_*.patch &&
+ patch -p0 -F3 < $SPELL_DIRECTORY/45_*.patch &&
+
+ echo doing common ----------------------------------- &&
+ cd common &&
+ autoreconf --install --force &&
+ cd .. &&
+
+ cd unix &&
+ echo doing unix ----------------------------------- &&
+ autoreconf --install --force &&
+
+ # add the vnc code into the x tree and make it work
+ cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+ xc/programs/Xserver/Xvnc.man \
+ xc/programs/Xserver/vnc/*.{h,cc} \
+ xorg-server/hw/vnc &&
+ cp -a xorg-x11-server-source/{cfb/cfb.h,hw/vnc} &&
+ cp -a xorg-x11-server-source/{cfb/cfbmap.h,hw/vnc} &&
+ cp -a xorg-x11-server-source/{fb/fb.h,hw/vnc} &&
+ cp -a xorg-x11-server-source/{mfb/mfb.h,hw/vnc} &&
+ cp -a xorg-x11-server-source/{fb/fbrop.h,hw/vnc} &&
+ sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
+ xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h &&
+
+ echo doing the server ----------------------------------- &&
+ cd xorg-server &&
+ autoreconf --install --force &&
+ cd ../..
+ else
+ message "{PROBLEM_COLOR}Monolithic xorg for the VNC server is not
supported!$DEFAULT_COLOR"
+ return 1
+ fi
+fi
diff --git a/x11/vnc/gcc-3.4.patch b/x11/vnc/gcc-3.4.patch
deleted file mode 100644
index 76e8a47..0000000
--- a/x11/vnc/gcc-3.4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur vnc-4.0-unixsrc/rfb/HTTPServer.cxx
vnc-4.0-unixsrc-fixed/rfb/HTTPServer.cxx
---- vnc-4.0-unixsrc/rfb/HTTPServer.cxx 2004-04-30 18:25:02.000000000 +0200
-+++ vnc-4.0-unixsrc-fixed/rfb/HTTPServer.cxx 2004-06-30 16:19:40.671261545
+0200
-@@ -16,6 +16,7 @@
- * USA.
- */
-
-+#include <vector>
- #include <rfb/HTTPServer.h>
- #include <rfb/LogWriter.h>
- #include <rfb/util.h>
-diff -Nur vnc-4.0-unixsrc/rfb/VNCSConnectionST.cxx
vnc-4.0-unixsrc-fixed/rfb/VNCSConnectionST.cxx
---- vnc-4.0-unixsrc/rfb/VNCSConnectionST.cxx 2004-06-04 20:53:18.000000000
+0200
-+++ vnc-4.0-unixsrc-fixed/rfb/VNCSConnectionST.cxx 2004-06-30
16:19:56.885194991 +0200
-@@ -16,6 +16,7 @@
- * USA.
- */
-
-+#include <vector>
- #include <rfb/VNCSConnectionST.h>
- #include <rfb/LogWriter.h>
- #include <rfb/secTypes.h>
-diff -Nur vnc-4.0-unixsrc/rfb/VNCServerST.cxx
vnc-4.0-unixsrc-fixed/rfb/VNCServerST.cxx
---- vnc-4.0-unixsrc/rfb/VNCServerST.cxx 2004-06-04 20:53:18.000000000
+0200
-+++ vnc-4.0-unixsrc-fixed/rfb/VNCServerST.cxx 2004-06-30 16:20:10.135506166
+0200
-@@ -53,6 +53,7 @@
- // closingSockets for this purpose.
-
-
-+#include <vector>
- #include <rfb/ServerCore.h>
- #include <rfb/VNCServerST.h>
- #include <rfb/VNCSConnectionST.h>
-diff -Nur vnc-4.0-unixsrc/x0vncserver/x0vncserver.cxx
vnc-4.0-unixsrc-fixed/x0vncserver/x0vncserver.cxx
---- vnc-4.0-unixsrc/x0vncserver/x0vncserver.cxx 2004-06-11
18:22:21.000000000 +0200
-+++ vnc-4.0-unixsrc-fixed/x0vncserver/x0vncserver.cxx 2004-06-30
16:20:28.982104065 +0200
-@@ -15,6 +15,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-+#include <vector>
- #include <strings.h>
- #include <sys/time.h>
- #include <sys/types.h>



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (2e554ea5f833f8f1af01d3ba266ce764aae56c9e), Jaka Kranjc, 01/05/2008

Archive powered by MHonArc 2.6.24.

Top of Page