summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/tightvnc/Manifest36
-rw-r--r--net-misc/tightvnc/files/0121_all_4.2.99.3-build-libs-with-pic.patch22
-rw-r--r--net-misc/tightvnc/files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch48
-rw-r--r--net-misc/tightvnc/files/0180_amd64_4.2.99.4-glx-nopic.patch11
-rw-r--r--net-misc/tightvnc/files/digest-tightvnc-4.0_beta200310316
-rw-r--r--net-misc/tightvnc/files/tight.tar.bz2bin0 -> 9058 bytes
-rw-r--r--net-misc/tightvnc/files/tightvnc.patch.bz2bin0 -> 16268 bytes
-rw-r--r--net-misc/tightvnc/files/x86.patch39
-rw-r--r--net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild7
-rw-r--r--net-misc/tightvnc/tightvnc-4.0_beta20031031.ebuild83
10 files changed, 233 insertions, 19 deletions
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index ad93a3c50223..8b36e5ecd5ff 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,26 +1,30 @@
-MD5 5ef6fe1a63065e2cb0b7975423ba7f40 ChangeLog 3060
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 6436cd0c83384349f6106e6150d72964 tightvnc-1.2.3-r2.ebuild 1230
+MD5 aabc422807dc831faa049e754fe2a782 tightvnc-1.2.9.ebuild 1618
MD5 f59a2d623ee3214e0abbf2038d657f26 tightvnc-1.2.6.ebuild 1330
-MD5 9aa1200bb5192b165843c3251df387ef tightvnc-1.2.7.ebuild 1550
MD5 e3d97376c0f029056522d630552f86f6 tightvnc-1.2.8.ebuild 1614
-MD5 d9ec1866bd0734b3965d1bcd225f05f2 tightvnc-1.2.9-r1.ebuild 1967
-MD5 aabc422807dc831faa049e754fe2a782 tightvnc-1.2.9.ebuild 1618
-MD5 d5e7aea97ef8e22bbf73a329ea4fe5cc tightvnc-4.0_beta20031031.ebuild 1215
-MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
-MD5 9138c55d41bebf73ee177ef75fee2cd1 files/digest-tightvnc-1.2.3-r2 76
+MD5 59d214387f66f4b538c45acc7702c815 tightvnc-4.0_beta20031031.ebuild 2811
+MD5 0af676ef68f9298d1c40f713bfe69645 tightvnc-1.2.9-r1.ebuild 1967
+MD5 6436cd0c83384349f6106e6150d72964 tightvnc-1.2.3-r2.ebuild 1230
+MD5 9aa1200bb5192b165843c3251df387ef tightvnc-1.2.7.ebuild 1550
+MD5 2bd3fad10c24758b9147b93c65094792 ChangeLog 3280
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031031 367
MD5 451572c22930322934ee8f6a857f9630 files/digest-tightvnc-1.2.6 76
MD5 0fc7f73784063287c23b1945458e85b3 files/digest-tightvnc-1.2.7 76
MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9 76
-MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
-MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
-MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
-MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.9-gentoo.diff 657
-MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
+MD5 da10d05f6a76bdc27a59276c0acde9d9 files/0180_amd64_4.2.99.4-glx-nopic.patch 364
+MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
+MD5 55068075897cef6ddd710f410ba25c21 files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
MD5 6d664eb489cd0aa90b5adbbb956987a4 files/tightvnc.patch.bz2 16268
-MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
-MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031031 367
+MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
+MD5 19c42aff4dfa179a0b028316e845e14f files/0121_all_4.2.99.3-build-libs-with-pic.patch 949
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
+MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
+MD5 26245c32cb730e80df02c71470b05b8a files/tight.tar.bz2 9058
+MD5 9138c55d41bebf73ee177ef75fee2cd1 files/digest-tightvnc-1.2.3-r2 76
+MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
+MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
diff --git a/net-misc/tightvnc/files/0121_all_4.2.99.3-build-libs-with-pic.patch b/net-misc/tightvnc/files/0121_all_4.2.99.3-build-libs-with-pic.patch
new file mode 100644
index 000000000000..a900c48b6e18
--- /dev/null
+++ b/net-misc/tightvnc/files/0121_all_4.2.99.3-build-libs-with-pic.patch
@@ -0,0 +1,22 @@
+--- XFree86-4.2.99.3/xc/lib/Xau/Imakefile.build-libs-with-pic 2001-01-17 14:42:24.000000000 -0500
++++ XFree86-4.2.99.3/xc/lib/Xau/Imakefile 2003-01-09 11:25:46.000000000 -0500
+@@ -37,6 +37,8 @@ SRCS = AuDispose.c AuFileName.c AuGetAdd
+ OBJS = AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
+ AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
+
++#define IncludeNormalLibInSharedObject
++
+ #include <Library.tmpl>
+
+ DependTarget()
+--- XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/parser/Imakefile.build-libs-with-pic 2002-05-31 14:46:02.000000000 -0400
++++ XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/parser/Imakefile 2003-01-09 11:25:51.000000000 -0500
+@@ -36,6 +36,8 @@ CONFIG_DEFINES = -DXCONFIGDIR=\"$(XCONFI
+ -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
+ -DXVERSION="$(XVERS)"
+
++#define IncludeNormalLibInSharedObject
++
+ #include <Library.tmpl>
+
+ SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
diff --git a/net-misc/tightvnc/files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch b/net-misc/tightvnc/files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
new file mode 100644
index 000000000000..d3090f01b9e8
--- /dev/null
+++ b/net-misc/tightvnc/files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
@@ -0,0 +1,48 @@
+--- xc/lib/Xau/Imakefile.IncludeSharedObjectInNormalLib 2001-01-17 14:42:24.000000000 -0500
++++ xc/lib/Xau/Imakefile 2003-01-29 02:25:49.000000000 -0500
+@@ -37,6 +37,8 @@
+ OBJS = AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
+ AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
+
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+
+ DependTarget()
+--- xc/lib/xkbfile/Imakefile.IncludeSharedObjectInNormalLib 2001-08-27 13:40:59.000000000 -0400
++++ xc/lib/xkbfile/Imakefile 2003-01-29 02:25:49.000000000 -0500
+@@ -34,6 +34,8 @@
+
+ ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
+
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+
+ DependTarget()
+--- xc/lib/xkbui/Imakefile.IncludeSharedObjectInNormalLib 1999-03-13 22:21:21.000000000 -0500
++++ xc/lib/xkbui/Imakefile 2003-01-29 02:25:49.000000000 -0500
+@@ -15,6 +15,8 @@
+ HEADERS = XKBui.h
+ INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile
+
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+
+ DependTarget()
+--- xc/programs/Xserver/hw/xfree86/parser/Imakefile.IncludeSharedObjectInNormalLib 2003-01-29 02:41:13.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/parser/Imakefile 2003-01-29 02:41:53.000000000 -0500
+@@ -36,9 +36,11 @@
+ -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
+ -DXVERSION="$(XVERS)"
+
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+
+-SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
++SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) $(PICFLAGS))
+
+ NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)
+
diff --git a/net-misc/tightvnc/files/0180_amd64_4.2.99.4-glx-nopic.patch b/net-misc/tightvnc/files/0180_amd64_4.2.99.4-glx-nopic.patch
new file mode 100644
index 000000000000..5b8950d71710
--- /dev/null
+++ b/net-misc/tightvnc/files/0180_amd64_4.2.99.4-glx-nopic.patch
@@ -0,0 +1,11 @@
+--- xc/config/cf/linux.cf.x86_64-glx-nopic 2003-01-29 00:45:16.000000000 -0500
++++ xc/config/cf/linux.cf 2003-01-29 00:45:57.000000000 -0500
+@@ -319,7 +319,7 @@
+ * This improves performance.
+ */
+ #if BuildXF86DRI
+-# if defined(i386Architecture)
++# if defined(i386Architecture) || defined(x86_64Architecture)
+ # define BuildLibGlxWithoutPIC YES
+ # endif
+ #endif
diff --git a/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031031 b/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031031
new file mode 100644
index 000000000000..09fcdd1cd33f
--- /dev/null
+++ b/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031031
@@ -0,0 +1,6 @@
+MD5 0eed650932d0e9fb14ed87eb6c7d419e vnc-4.0b4-unixsrc.tar.gz 467831
+MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622
+MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239
+MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363
+MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
+MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
diff --git a/net-misc/tightvnc/files/tight.tar.bz2 b/net-misc/tightvnc/files/tight.tar.bz2
new file mode 100644
index 000000000000..835ad5c2bd25
--- /dev/null
+++ b/net-misc/tightvnc/files/tight.tar.bz2
Binary files differ
diff --git a/net-misc/tightvnc/files/tightvnc.patch.bz2 b/net-misc/tightvnc/files/tightvnc.patch.bz2
new file mode 100644
index 000000000000..6388e0638be0
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc.patch.bz2
Binary files differ
diff --git a/net-misc/tightvnc/files/x86.patch b/net-misc/tightvnc/files/x86.patch
new file mode 100644
index 000000000000..e3f753aa5cb4
--- /dev/null
+++ b/net-misc/tightvnc/files/x86.patch
@@ -0,0 +1,39 @@
+--- vnc_unixsrc/Xvnc/config/cf/Imake.cf.x86_64 2003-03-04 15:33:20.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/Imake.cf 2003-03-04 15:35:06.000000000 +0100
+@@ -579,6 +579,10 @@
+ # define PowerPCArchitecture
+ # undef __powerpc__
+ # endif
++# ifdef __x86_64__
++# define x86_64Architecture
++# undef __x86_64__
++# endif
+ #endif /* linux */
+
+ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
+--- vnc_unixsrc/Xvnc/config/cf/linux.cf.x86_64 2003-03-04 15:30:01.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2003-03-04 15:37:07.000000000 +0100
+@@ -43,7 +43,7 @@
+ #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
+ defined(SparcArchitecture) || defined(ArmArchitecure) || \
+ defined(i386Architecture) || defined(s390Architecture) || \
+- defined(s390xArchitecture)
++ defined(s390xArchitecture) || defined(x86_64Architecture)
+ #define DefaultLinuxCLibMajorVersion 6
+ #else
+ #define DefaultLinuxCLibMajorVersion 5
+@@ -290,6 +290,14 @@
+ #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+ #endif /* PowerPCArchitecture */
+
++#ifdef x86_64Architecture
++#define DefaultCCOptions -fsigned-char
++#define OptimizedCDebugFlags -O2
++#define LinuxMachineDefines -D__x86_64__
++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
++#endif /* x86_64PCArchitecture */
++
+ #ifdef ArmArchitecture
+ #define DefaultCCOptions -fsigned-char
+ #define OptimizedCDebugFlags -O2
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
index 339954bd6749..27f59653432b 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.2 2003/09/18 09:00:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.3 2003/11/03 13:21:53 aliz Exp $
inherit eutils
@@ -30,18 +30,19 @@ src_unpack() {
epatch ${FILESDIR}/${P}-gentoo.diff
epatch ${FILESDIR}/${P}-gentoo.security.patch
epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+ epatch ${FILESDIR}/x86.patch
}
src_compile() {
xmkmf -a || die "xmkmf failed"
- make CDEBUGFLAGS="$CFLAGS" World || die "make World failed"
+ make CDEBUGFLAGS="$CFLAGS -m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib/gcc-lib/i386-pc-linux-gnu/3.2.3 -L/emul/linux/x86/usr/lib -L/emul/linux/x86/usr/X11R6/lib" World || die "make World failed"
cd Xvnc && ./configure || die "Configure failed."
if use tcpd; then
make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$CFLAGS" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
else
- make CDEBUGFLAGS="$CFLAGS"
+ make CDEBUGFLAGS="$CFLAGS -m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib/gcc-lib/i386-pc-linux-gnu/3.2.3 -L/emul/linux/x86/usr/lib -L/emul/linux/x86/usr/X11R6/lib"
fi
}
diff --git a/net-misc/tightvnc/tightvnc-4.0_beta20031031.ebuild b/net-misc/tightvnc/tightvnc-4.0_beta20031031.ebuild
new file mode 100644
index 000000000000..20d809d00000
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-4.0_beta20031031.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031031.ebuild,v 1.1 2003/11/03 13:21:53 aliz Exp $
+
+inherit eutils
+IUSE="java tcpd"
+
+BASE_PV="4.3.0"
+MY_SV="${BASE_PV//\.}"
+SRC_PATH="mirror://xfree/${BASE_PV}/source"
+S="${WORKDIR}/vnc-4.0b4-unixsrc"
+DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
+SRC_URI="http://www.realvnc.com/dist/vnc-4.0b4-unixsrc.tar.gz
+ ${SRC_PATH}/X${MY_SV}src-1.tgz
+ ${SRC_PATH}/X${MY_SV}src-2.tgz
+ ${SRC_PATH}/X${MY_SV}src-3.tgz
+ ${SRC_PATH}/X${MY_SV}src-4.tgz
+ ${SRC_PATH}/X${MY_SV}src-5.tgz"
+
+HOMEPAGE="http://www.tightvnc.com/"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=x11-base/xfree-4.2.1
+ ~media-libs/jpeg-6b
+ sys-libs/zlib
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+ !net-misc/vnc"
+
+RDEPEND="${DEPEND}
+ dev-lang/perl
+ java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
+
+src_unpack() {
+ mkdir -p ${S}
+ cd ${S}
+ unpack X${MY_SV}src-{1,2,3,4,5}.tgz
+
+ cd ${WORKDIR}
+ unpack vnc-4.0b4-unixsrc.tar.gz
+
+ cd ${S}
+ tar -jxf ${FILESDIR}/tight.tar.bz2
+ epatch ${FILESDIR}/tightvnc.patch.bz2
+
+ cd ${S}/xc
+ epatch ../xc.patch
+ epatch ${FILESDIR}/0121_all_4.2.99.3-build-libs-with-pic.patch
+ epatch ${FILESDIR}/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
+ epatch ${FILESDIR}/0180_amd64_4.2.99.4-glx-nopic.patch
+
+
+ echo "#define InstallManPages NO" >>config/cf/vnc.def
+ echo "#define OptimizedCDebugFlags ${CFLAGS} -fPIC" >> config/cf/vnc.def
+ echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} -fPIC" >> config/cf/vnc.def
+ echo "#define ExtraLibraries -ljpeg" >> config/cf/vnc.def
+
+# echo "#define PositionIndependentCFlags -fpic" >>config/cf/vnc.def
+# echo "#define PositionIndependentCplusplusFlags -fpic" >>config/cf/vnc.def
+ echo "#define IncludeSharedObjectInNormalLib" >>config/cf/vnc.def
+
+ cd ${S}/rfb
+# sed -i 's:#include <stdio.h>:#include <stdio.h>\n#include "jpeglib.h":g' TightEncoder.h
+ sed -i 's:#include "jpeg/jpeglib.h":#include "jpeglib.h":g' TightEncoder.h
+
+ sed -i 's:#include <rfb/TightEncoder.h>:#include <rfb/TightEncoder.h>\nextern "C" {\n#include <jpeglib.h>\n}:g' TightEncoder.cxx
+}
+src_compile() {
+# econf --with-installed-zlib
+ econf --with-installed-zlib --with-installed-jpeg
+# make CXXFLAGS="${CXXFLAGS} -DNEED_SHORT_EXTERNAL_NAMES -fPIC" CFLAGS="${CFLAGS} -fPIC -DNEED_SHORT_EXTERNAL_NAMES" || die
+ make CXXFLAGS="${CXXFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" || die
+
+ cd ${S}/xc
+ make World || die
+}
+
+src_install() {
+ mkdir -p ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions
+ ./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions
+}