pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
tigervnc: same as net/tigervnc, but based on xserver 1.18
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Wed Apr 28 12:02:00 2021 +0200
Changeset: 8530a252390a3caea81f750e53b62bced0e260e2
Modified Files:
Makefile
Added Files:
tigervnc/DESCR
tigervnc/Makefile
tigervnc/PLIST
tigervnc/distinfo
tigervnc/patches/patch-CMakeLists.txt
tigervnc/patches/patch-media_CMakeLists.txt
tigervnc/patches/patch-unix_vncserver
tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
tigervnc/patches/patch-unix_xserver_hw_vnc_vncModule.c
Log Message:
tigervnc: same as net/tigervnc, but based on xserver 1.18
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8530a252390a3caea81f750e53b62bced0e260e2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
tigervnc/DESCR | 9 ++
tigervnc/Makefile | 97 ++++++++++++++++++++++
tigervnc/PLIST | 47 +++++++++++
tigervnc/distinfo | 15 ++++
tigervnc/patches/patch-CMakeLists.txt | 21 +++++
tigervnc/patches/patch-media_CMakeLists.txt | 15 ++++
tigervnc/patches/patch-unix_vncserver | 31 +++++++
.../patches/patch-unix_xserver_hw_vnc_Makefile.am | 22 +++++
.../patches/patch-unix_xserver_hw_vnc_vncModule.c | 22 +++++
10 files changed, 280 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 9c0b30400f..8744783396 100644
--- a/Makefile
+++ b/Makefile
@@ -5500,6 +5500,7 @@ SUBDIR+= thepeg
SUBDIR+= threadingbuildingblocks
SUBDIR+= thrift
SUBDIR+= thunderbird68-enigmail
+SUBDIR+= tigervnc
SUBDIR+= tilda
SUBDIR+= tilix
SUBDIR+= timewarrior
diff --git a/tigervnc/DESCR b/tigervnc/DESCR
new file mode 100644
index 0000000000..a6ebac432a
--- /dev/null
+++ b/tigervnc/DESCR
@@ -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 --git a/tigervnc/Makefile b/tigervnc/Makefile
new file mode 100644
index 0000000000..b237084f69
--- /dev/null
+++ b/tigervnc/Makefile
@@ -0,0 +1,97 @@
+# $NetBSD: Makefile,v 1.37 2021/04/21 13:25:14 adam Exp $
+
+DISTNAME= tigervnc-1.9.0
+PKGREVISION= 8
+CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+XORG_SERVER_FILE= xorg-server-1.18.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= https://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
+
+DEPENDS+= mcookie-[0-9]*:../../x11/mcookie
+
+USE_CMAKE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash
+BUILD_DIRS= . unix/xserver
+INSTALL_DIRS= . unix/xserver/hw/vnc
+
+LDFLAGS+= ${BUILDLINK_LDADD.gettext}
+
+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 <../xserver118.patch
+
+XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
+XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr
+XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace
+XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
+XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic
+XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
+XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following:
+XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb
+XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin
+.endif
+
+pre-configure:
+ cd ${WRKSRC}/unix/xserver && \
+ ${PKGSRC_SETENV} ACLOCAL_PATH=${X11BASE}/share/aclocal \
+ 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/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/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/libdrm/buildlink3.mk"
+BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.3
+.include "../../x11/fltk13/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/tigervnc/PLIST b/tigervnc/PLIST
new file mode 100644
index 0000000000..bcb24a6acb
--- /dev/null
+++ b/tigervnc/PLIST
@@ -0,0 +1,47 @@
+@comment $NetBSD: PLIST,v 1.7 2020/04/17 11:37:24 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/applications/vncviewer.desktop
+share/doc/${PKGNAME}/LICENCE.TXT
+share/doc/${PKGNAME}/README.rst
+share/icons/hicolor/16x16/apps/tigervnc.png
+share/icons/hicolor/22x22/apps/tigervnc.png
+share/icons/hicolor/24x24/apps/tigervnc.png
+share/icons/hicolor/32x32/apps/tigervnc.png
+share/icons/hicolor/48x48/apps/tigervnc.png
+share/icons/hicolor/scalable/apps/tigervnc.svg
+share/locale/bg/LC_MESSAGES/tigervnc.mo
+share/locale/cs/LC_MESSAGES/tigervnc.mo
+share/locale/da/LC_MESSAGES/tigervnc.mo
+share/locale/de/LC_MESSAGES/tigervnc.mo
+share/locale/el/LC_MESSAGES/tigervnc.mo
+share/locale/eo/LC_MESSAGES/tigervnc.mo
+share/locale/es/LC_MESSAGES/tigervnc.mo
+share/locale/fi/LC_MESSAGES/tigervnc.mo
+share/locale/fr/LC_MESSAGES/tigervnc.mo
+share/locale/fur/LC_MESSAGES/tigervnc.mo
+share/locale/hu/LC_MESSAGES/tigervnc.mo
+share/locale/id/LC_MESSAGES/tigervnc.mo
+share/locale/it/LC_MESSAGES/tigervnc.mo
+share/locale/nl/LC_MESSAGES/tigervnc.mo
+share/locale/pl/LC_MESSAGES/tigervnc.mo
+share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
+share/locale/ru/LC_MESSAGES/tigervnc.mo
+share/locale/sk/LC_MESSAGES/tigervnc.mo
+share/locale/sr/LC_MESSAGES/tigervnc.mo
+share/locale/sv/LC_MESSAGES/tigervnc.mo
+share/locale/tr/LC_MESSAGES/tigervnc.mo
+share/locale/uk/LC_MESSAGES/tigervnc.mo
+share/locale/vi/LC_MESSAGES/tigervnc.mo
+share/locale/zh_CN/LC_MESSAGES/tigervnc.mo
diff --git a/tigervnc/distinfo b/tigervnc/distinfo
new file mode 100644
index 0000000000..6e28de2cd8
--- /dev/null
+++ b/tigervnc/distinfo
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.17 2020/04/17 11:37:24 wiz Exp $
+
+SHA1 (tigervnc-1.9.0.tar.gz) = c56656c596fb863bb2c4b67fb62b4165011d181f
+RMD160 (tigervnc-1.9.0.tar.gz) = 990e872addf459432584c176b3565504e994899e
+SHA512 (tigervnc-1.9.0.tar.gz) = 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
+Size (tigervnc-1.9.0.tar.gz) = 1506520 bytes
+SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52
+RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f
+SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
+Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes
+SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9
+SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
+SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0
+SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 29b33e6d94a070bb0a55a264cd1c4e120c9b1b3c
+SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 77aff6c2bb19e6936302c783b72d581e7d6388f5
diff --git a/tigervnc/patches/patch-CMakeLists.txt b/tigervnc/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..89d0ec631a
--- /dev/null
+++ b/tigervnc/patches/patch-CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2016/04/21 12:47:58 jperkin Exp $
+
+--- CMakeLists.txt.orig 2015-07-11 13:00:36.000000000 +0000
++++ CMakeLists.txt
+@@ -26,7 +26,7 @@ set(RCVERSION 1,5,0,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_MANDIR}")
+ set(LOCALE_DIR "${DATA_DIR}/locale")
+ set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
+
+@@ -268,6 +268,7 @@ else()
+ if(NOT APPLE)
+ add_subdirectory(unix)
+ endif()
++ set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng -ljpeg)
+ endif()
+
+ if(ENABLE_NLS)
diff --git a/tigervnc/patches/patch-media_CMakeLists.txt b/tigervnc/patches/patch-media_CMakeLists.txt
new file mode 100644
index 0000000000..ec8db41200
--- /dev/null
+++ b/tigervnc/patches/patch-media_CMakeLists.txt
@@ -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 --git a/tigervnc/patches/patch-unix_vncserver b/tigervnc/patches/patch-unix_vncserver
new file mode 100644
index 0000000000..152a13b1f1
--- /dev/null
+++ b/tigervnc/patches/patch-unix_vncserver
@@ -0,0 +1,31 @@
+$NetBSD: patch-unix_vncserver,v 1.2 2016/02/19 10:14:48 wiz Exp $
+
+--- unix/vncserver.orig 2015-12-24 20:18:02.000000000 +0000
++++ unix/vncserver
+@@ -101,6 +101,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');}
+@@ -485,7 +487,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;
+ }
+@@ -493,7 +495,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 --git a/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am b/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
new file mode 100644
index 0000000000..8a91415d93
--- /dev/null
+++ b/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.4 2018/08/17 12:36:05 wiz Exp $
+
+--- unix/xserver/hw/vnc/Makefile.am.orig 2018-07-16 14:08:55.000000000 +0000
++++ unix/xserver/hw/vnc/Makefile.am
+@@ -9,6 +9,9 @@ XREGION_LIB=$(TIGERVNC_BUILDDIR)/common/
+ UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la
+ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
+
++# Hack to get the C headers to work when included from C++ code
++AM_CXXFLAGS = -fpermissive
++
+ noinst_LTLIBRARIES = libvnccommon.la
+
+ HDRS = vncExtInit.h vncHooks.h \
+@@ -68,6 +71,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
+
+ libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
+
+-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
++libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
+
+ EXTRA_DIST = Xvnc.man
diff --git a/tigervnc/patches/patch-unix_xserver_hw_vnc_vncModule.c b/tigervnc/patches/patch-unix_xserver_hw_vnc_vncModule.c
new file mode 100644
index 0000000000..384676c4ae
--- /dev/null
+++ b/tigervnc/patches/patch-unix_xserver_hw_vnc_vncModule.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-unix_xserver_hw_vnc_vncModule.c,v 1.2 2018/08/17 12:36:05 wiz Exp $
+
+--- unix/xserver/hw/vnc/vncModule.c.orig 2018-07-16 14:08:55.000000000 +0000
++++ unix/xserver/hw/vnc/vncModule.c
+@@ -39,7 +39,7 @@ typedef pointer XF86OptionPtr;
+ #include "XorgGlue.h"
+ #include "RandrGlue.h"
+
+-static void vncModuleInit(INITARGS);
++static void vncModuleInit(void);
+
+ static MODULESETUPPROTO(vncSetup);
+
+@@ -81,7 +81,7 @@ vncSetup(void * module, void * opts, int
+ return (void *)1;
+ }
+
+-static void vncModuleInit(INITARGS)
++static void vncModuleInit(void)
+ {
+ static char once = 0;
+
Home |
Main Index |
Thread Index |
Old Index