diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2011-01-17 21:03:31 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-01-17 21:03:31 +0000 |
commit | e1da87d5862008cfe7764bf24fbc24409606a2e0 (patch) | |
tree | 6c3c03209f45f83d99ef7cbdce2c0a83d0ba6622 /app-emulation/virtualbox/files | |
parent | Removed vnc USE flag (diff) | |
download | historical-e1da87d5862008cfe7764bf24fbc24409606a2e0.tar.gz historical-e1da87d5862008cfe7764bf24fbc24409606a2e0.tar.bz2 historical-e1da87d5862008cfe7764bf24fbc24409606a2e0.zip |
Removed vnc-patch as well
Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/virtualbox/files')
-rw-r--r-- | app-emulation/virtualbox/files/virtualbox-4-vnc.patch | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/app-emulation/virtualbox/files/virtualbox-4-vnc.patch b/app-emulation/virtualbox/files/virtualbox-4-vnc.patch deleted file mode 100644 index 1546ff206e1b..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-4-vnc.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -88,6 +88,7 @@ - WITH_OPENGL=1 - WITH_HARDENING=1 - WITH_VDE=0 -+WITH_VNC=0 - WITH_DOCS=1 - BUILD_LIBXML2= - BUILD_LIBXSLT= -@@ -123,6 +124,8 @@ - MESA="-lGL" - INCZ="" - LIBZ="-lz" -+INCVNCSERVER="" -+LIBVNCSERVER="-lvncserver" - CXX_FLAGS="" - if [ "$OS" = "freebsd" ]; then - INCCURL="-I/usr/local/include" -@@ -956,6 +959,47 @@ - } - - # -+# Check for libvncserver, needed for VNC -+# -+check_vncserver() -+{ -+ test_header libvncserver -+ cat > $ODIR.tmp_src.cc <<EOF -+#include <cstdio> -+#include <rfb/rfbconfig.h> -+ -+extern "C" int main() -+{ -+ const char* v=LIBVNCSERVER_VERSION; -+ unsigned int major = 0, minor = 0, micro = 0; -+ -+ for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; -+ if (*v == '.') v++; -+ for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; -+ if (*v == '.') v++; -+ for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; -+ -+ printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); -+ if (major*10000 + minor*100 + micro >= 907) -+ { -+ printf(", OK.\n"); -+ return 0; -+ } -+ else -+ { -+ printf(", expected version 0.9.7 or higher\n"); -+ return 1; -+ } -+} -+EOF -+ if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then -+ if test_execute; then -+ cnf_append "VBOX_WITH_VNC" "1" -+ fi -+ fi -+} -+ -+# - # Check for libcurl, needed by S3 - # - check_curl() -@@ -2116,6 +2160,7 @@ - [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" - [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" - [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" -+[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" - [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" - cat << EOF - --disable-hardening don't be strict about /dev/vboxdrv access -@@ -2280,6 +2325,9 @@ - --enable-webservice) - [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 - ;; -+ --enable-vnc) -+ WITH_VNC=1 -+ ;; - --disable-hardening) - WITH_HARDENING=0 - ;; -@@ -2553,6 +2601,15 @@ - cnf_append "VBOX_WITH_DOCS_PACKING" "" - fi - -+# VNC server support -+if [ $OSE -ge 1 ]; then -+ if [ $WITH_VNC = 1 ]; then -+ check_vncserver -+ else -+ cnf_append "VBOX_WITH_VNC" "" -+ fi -+fi -+ - # success! - echo - echo "Successfully generated '$CNF' and '$ENV'." |