pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/tigervnc Import tigervnc-1.3.1 as net/tigervnc, pa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a77e8361029
branches:  trunk
changeset: 646446:0a77e8361029
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 08 19:42:09 2015 +0000

description:
Import tigervnc-1.3.1 as net/tigervnc, packaged for wip by myself
and mwdavies, who added the Xvnc build.

TigerVNC is a high-performance, platform-neutral implementation of
VNC (Virtual Network Computing), a client/server application that
allows users to launch and interact with graphical applications on
remote machines. TigerVNC provides the levels of performance
necessary to run 3D and video applications, and it attempts to
maintain a common look and feel and re-use components, where
possible, across the various platforms that it supports. TigerVNC
also provides extensions for advanced authentication methods and
TLS encryption.

diffstat:

 net/tigervnc/DESCR                                            |   9 +
 net/tigervnc/Makefile                                         |  85 +++++++++
 net/tigervnc/PLIST                                            |  22 ++
 net/tigervnc/distinfo                                         |  15 +
 net/tigervnc/patches/patch-CMakeLists.txt                     |  21 ++
 net/tigervnc/patches/patch-media_CMakeLists.txt               |  15 +
 net/tigervnc/patches/patch-unix_vncserver                     |  40 ++++
 net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc    |  97 +++++++++++
 net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am    |  21 ++
 net/tigervnc/patches/patch-unix_xserver_hw_vnc_vncHooks.cc    |  67 +++++++
 net/tigervnc/patches/patch-unix_xserver_hw_vnc_xorg-version.h |  16 +
 11 files changed, 408 insertions(+), 0 deletions(-)

diffs (truncated from 452 to 300 lines):

diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/DESCR        Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,9 @@
+TigerVNC is a high-performance, platform-neutral implementation of
+VNC (Virtual Network Computing), a client/server application that
+allows users to launch and interact with graphical applications on
+remote machines. TigerVNC provides the levels of performance
+necessary to run 3D and video applications, and it attempts to
+maintain a common look and feel and re-use components, where
+possible, across the various platforms that it supports. TigerVNC
+also provides extensions for advanced authentication methods and
+TLS encryption.
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/Makefile     Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile,v 1.1 2015/02/08 19:42:09 wiz Exp $
+
+DISTNAME=      tigervnc-1.3.1
+CATEGORIES=    net
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tigervnc/}
+XORG_SERVER_FILE=      xorg-server-1.12.4
+SITES.${XORG_SERVER_FILE}.tar.bz2=     ${MASTER_SITE_XORG:=xserver/}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://tigervnc.org/
+COMMENT=       High-performance, platform-neutral VNC client/server
+LICENSE=       gnu-gpl-v2
+
+BUILD_DEPENDS+=        xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
+BUILD_DEPENDS+=        font-util-[0-9]*:../../fonts/font-util
+BUILD_DEPENDS+=        tradcpp-[0-9]*:../../devel/tradcpp
+
+USE_CMAKE=     yes
+USE_LIBTOOL=   yes
+USE_LANGUAGES= c c++
+USE_TOOLS+=    msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash
+BUILD_DIRS=    . unix/xserver
+INSTALL_DIRS=  . unix/xserver/hw/vnc
+
+CONFIGURE_ENV+=        ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
+OVERRIDE_GNU_CONFIG_SCRIPTS= yes
+LIBTOOL_OVERRIDE=unix/xserver/libtool
+
+SUBST_CLASSES+=                hpath
+SUBST_STAGE.hpath=     pre-configure
+SUBST_MESSAGE.hpath=   fixing hardcoded paths
+SUBST_FILES.hpath=      unix/vncserver
+SUBST_SED.hpath+=      -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
+SUBST_VARS.hpath+=     PREFIX X11BASE
+
+REPLACE_PERL+= unix/vncserver
+
+post-extract:
+       cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2
+       cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
+
+post-patch:
+       cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver112.patch
+
+XORG_CONFIGURE_ARGS+=  --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
+XORG_CONFIGURE_ARGS+=  --disable-wayland --disable-present --disable-dri3
+XORG_CONFIGURE_ARGS+=  --disable-static --disable-xinerama --without-dtrace
+XORG_CONFIGURE_ARGS+=  --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
+XORG_CONFIGURE_ARGS+=  --disable-unit-tests --disable-devel-docs --disable-selective-werror
+XORG_CONFIGURE_ARGS+=  --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
+
+pre-configure:
+       cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \
+       ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH}  \
+               ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS}   \
+                       ./configure ${XORG_CONFIGURE_ARGS}
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/xcmiscproto/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
+.include "../../x11/bigreqsproto/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/dri2proto/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/resourceproto/buildlink3.mk"
+.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/PLIST        Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,22 @@
+@comment $NetBSD: PLIST,v 1.1 2015/02/08 19:42:09 wiz Exp $
+bin/Xvnc
+bin/vncconfig
+bin/vncpasswd
+bin/vncserver
+bin/vncviewer
+bin/x0vncserver
+lib/xorg/modules/extensions/libvnc.la
+man/man1/Xvnc.1
+man/man1/vncconfig.1
+man/man1/vncpasswd.1
+man/man1/vncserver.1
+man/man1/vncviewer.1
+man/man1/x0vncserver.1
+share/doc/${PKGNAME}/LICENCE.TXT
+share/doc/${PKGNAME}/README.txt
+share/locale/de/LC_MESSAGES/tigervnc.mo
+share/locale/fr/LC_MESSAGES/tigervnc.mo
+share/locale/pl/LC_MESSAGES/tigervnc.mo
+share/locale/ru/LC_MESSAGES/tigervnc.mo
+share/locale/sk/LC_MESSAGES/tigervnc.mo
+share/locale/sv/LC_MESSAGES/tigervnc.mo
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/distinfo     Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.1 2015/02/08 19:42:09 wiz Exp $
+
+SHA1 (tigervnc-1.3.1.tar.gz) = 308ec9a9a627d20406eebfaeac4f3d4398278cc1
+RMD160 (tigervnc-1.3.1.tar.gz) = 522cbd74cfd0293dbc82f4a570dc5beb206c9ed8
+Size (tigervnc-1.3.1.tar.gz) = 6888105 bytes
+SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
+RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
+Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes
+SHA1 (patch-CMakeLists.txt) = c5d2bd4b0f56977c8cd3c4b0a46359c765ada200
+SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
+SHA1 (patch-unix_vncserver) = 8baacca2d1083f330781caff7da2ac996af91aa4
+SHA1 (patch-unix_xserver_hw_vnc_InputXKB.cc) = 440067e4995b7e1a0580bd106eb63740f400cb2c
+SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 7644bbf5a111ec765d45d057a430ce07ece9e90b
+SHA1 (patch-unix_xserver_hw_vnc_vncHooks.cc) = aa247443fe39279e3f6c75067dd644546d01420a
+SHA1 (patch-unix_xserver_hw_vnc_xorg-version.h) = 77dadfc369dc07dc7a2eb115be9e3ab5234f0270
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/patches/patch-CMakeLists.txt Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/02/08 19:42:09 wiz Exp $
+
+--- CMakeLists.txt.orig        2014-08-14 09:25:26.000000000 +0000
++++ CMakeLists.txt
+@@ -26,7 +26,7 @@ set(RCVERSION 1,3,1,0)
+ # Installation paths
+ set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
+ set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
+-set(MAN_DIR "${DATA_DIR}/man")
++set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/man")
+ set(LOCALE_DIR "${DATA_DIR}/locale")
+ set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
+ 
+@@ -269,6 +269,7 @@ if(UNIX AND NOT APPLE)
+   if(X11_Xcursor_FOUND)
+     set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB})
+   endif()
++  set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng -ljpeg)
+ endif()
+ 
+ if(FLTK_FOUND)
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/patches/patch-media_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/patches/patch-media_CMakeLists.txt   Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-media_CMakeLists.txt,v 1.1 2015/02/08 19:42:09 wiz Exp $
+
+Don't find "convert" if it happens to be installed.
+
+--- media/CMakeLists.txt.orig  2013-02-19 09:02:25.000000000 +0000
++++ media/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(ICON_FILES
+   ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png
+   ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png)
+ 
+-find_program(CONVERT_EXECUTABLE convert)
++# find_program(CONVERT_EXECUTABLE convert)
+ 
+ if(CONVERT_EXECUTABLE)
+   add_custom_target(icons DEPENDS ${ICON_FILES})
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/patches/patch-unix_vncserver
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/patches/patch-unix_vncserver Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-unix_vncserver,v 1.1 2015/02/08 19:42:09 wiz Exp $
+
+--- unix/vncserver.orig        2014-08-14 09:28:16.000000000 +0000
++++ unix/vncserver
+@@ -88,6 +88,8 @@ if (-d "/etc/X11/fontpath.d") {
+ }
+ 
+ @fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
++if (! -l "@PREFIX@/share/fonts/X11") {push(@fontpaths, '@PREFIX@/share/fonts/X11');}
++if (! -l "@X11BASE@/lib/X11/fonts") {push(@fontpaths, '@X11BASE@/lib/X11/fonts');}
+ if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
+ if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
+ if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');}
+@@ -337,7 +339,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber"
+ }
+ $ENV{VNCDESKTOP}= $desktopName;
+ 
+-system($exedir."vncconfig -iconic >> " . &quotedString($desktopLog) . " 2>&1 &");
++system($exedir."vncconfig -nowin >> " . &quotedString($desktopLog) . " 2>&1 &");
+ 
+ if ($opt{'-fg'}) {
+     system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1");
+@@ -414,7 +416,7 @@ sub CheckDisplayNumber
+ 
+     socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
+     eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
+-    if (!bind(S, pack('S n x12', $AF_INET, 6000 + $n))) {
++    if (!bind(S, sockaddr_in(6000 + $n, &INADDR_ANY))) {
+       close(S);
+       return 0;
+     }
+@@ -422,7 +424,7 @@ sub CheckDisplayNumber
+ 
+     socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
+     eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
+-    if (!bind(S, pack('S n x12', $AF_INET, 5900 + $n))) {
++    if (!bind(S, sockaddr_in(5900 + $n, &INADDR_ANY))) {
+       close(S);
+       return 0;
+     }
diff -r 1aeef5d828cf -r 0a77e8361029 net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tigervnc/patches/patch-unix_xserver_hw_vnc_InputXKB.cc        Sun Feb 08 19:42:09 2015 +0000
@@ -0,0 +1,97 @@
+$NetBSD: patch-unix_xserver_hw_vnc_InputXKB.cc,v 1.1 2015/02/08 19:42:09 wiz Exp $
+
+--- unix/xserver/hw/vnc/InputXKB.cc.orig       2013-05-30 14:53:40.000000000 +0000
++++ unix/xserver/hw/vnc/InputXKB.cc
+@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
+ 
+ unsigned InputDevice::getKeyboardState(void)
+ {
+-      DeviceIntPtr master;
+-
+-      master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
+-      return XkbStateFieldFromRec(&master->key->xkbInfo->state);
++      return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
+ }
+ 
+ unsigned InputDevice::getLevelThreeMask(void)
+@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
+                       return 0;
+       }
+ 
+-      xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++      xkb = keyboardDev->master->key->xkbInfo->desc;
+ 
+       act = XkbKeyActionPtr(xkb, keycode, state);
+       if (act == NULL)
+@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
+       if (state & ShiftMask)
+               return 0;
+ 
+-      xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++      xkb = keyboardDev->master->key->xkbInfo->desc;
+       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+               XkbAction *act;
+               unsigned char mask;
+@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
+       if (!(state & ShiftMask))
+               return keys;
+ 
+-      master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++      master = keyboardDev->master;
+       xkb = master->key->xkbInfo->desc;
+       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+               XkbAction *act;
+@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
+                       return 0;
+       }
+ 
+-      xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++      xkb = keyboardDev->master->key->xkbInfo->desc;
+ 
+       act = XkbKeyActionPtr(xkb, keycode, state);
+       if (act == NULL)
+@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
+       if (!(state & mask))
+               return keys;
+ 
+-      master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++      master = keyboardDev->master;
+       xkb = master->key->xkbInfo->desc;
+       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+               XkbAction *act;



Home | Main Index | Thread Index | Old Index