diff --git a/server/misc/libvncserver/actions.py b/server/misc/libvncserver/actions.py index cab0903f41..ace6486a8d 100644 --- a/server/misc/libvncserver/actions.py +++ b/server/misc/libvncserver/actions.py @@ -2,34 +2,24 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import cmaketools -from pisi.actionsapi import get +from pisi.actionsapi import cmaketools, mesontools, pisitools -WorkDir = "libvncserver-LibVNCServer-%s" % get.srcVERSION() +i = ''.join([ + ' -DCMAKE_BUILD_TYPE=Release', + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -DWITH_{QT,WEBSOCKETS,GTK,XCB,SASL,SDL,SYSTEMD,FFMPEG}=OFF', + ' -Bbuild -G Ninja -L ' + ]) def setup(): - #autotools.autoreconf("-vif") - #autotools.configure("--disable-static \ - #--disable-dependency-tracking \ - #--with-24bpp \ - #--with-zlib \ - #--with-jpeg") - - #pisitools.dosed("libtool", " -shared ", " -shared -Wl,--as-needed") - - cmaketools.configure("-DWITH_FFMPEG=OFF \ - -DWITH_SASL=OFF \ - -DWITH_SDL=OFF \ - -DWITH_SYSTEMD=OFF \ - ") + cmaketools.configure(i) def build(): - cmaketools.make() + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - #pisitools.remove("/usr/bin/linuxvnc") + mesontools.install() + + pisitools.dodoc("AUTHORS", "COPYING") diff --git a/server/misc/libvncserver/files/krfb-crash-1.patch b/server/misc/libvncserver/files/krfb-crash-1.patch deleted file mode 100644 index 7192b6f6f2..0000000000 --- a/server/misc/libvncserver/files/krfb-crash-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d0a76539835d11c0f4723499f8be4bc9c7724eb9 Mon Sep 17 00:00:00 2001 -From: Rajesh Sahoo -Date: Tue, 11 Jun 2019 15:13:04 +0530 -Subject: [PATCH] avoid pthread_join if backgroundLoop is FALSE - -client_thread is created depending upon backgroundLoop, but joining -without checking for same condition. so we are trying to join a garbage -thread_id. ---- - libvncserver/main.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/main.c b/libvncserver/main.c -index d3cd9b1e..772fb18f 100644 ---- a/libvncserver/main.c -+++ b/libvncserver/main.c -@@ -1112,6 +1112,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) { - } - - #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD -+ if(currentCl->screen->backgroundLoop) { - /* - Notify the thread. This simply writes a NULL byte to the notify pipe in order to get past the select() - in clientInput(), the loop in there will then break because the rfbCloseClient() above has set -@@ -1120,6 +1121,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) { - write(currentCl->pipe_notify_client_thread[1], "\x00", 1); - /* And wait for it to finish. */ - pthread_join(currentCl->client_thread, NULL); -+ } - #else - rfbClientConnectionGone(currentCl); - #endif diff --git a/server/misc/libvncserver/files/krfb-crash-2.patch b/server/misc/libvncserver/files/krfb-crash-2.patch deleted file mode 100644 index b8edd35e2f..0000000000 --- a/server/misc/libvncserver/files/krfb-crash-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 15c4f144a3783d9f1f2c976acf9f4d85988fd466 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Sun, 5 Jan 2020 19:56:57 +0100 -Subject: [PATCH] rfbShutdownServer: Call rfbClientConnectionGone if no - backgroundLoop - -Otherwise the servers that don't use rfbRunEventLoop don't get -notified of client disconnections ---- - libvncserver/main.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/main.c b/libvncserver/main.c -index b51f0ab6..738a501d 100644 ---- a/libvncserver/main.c -+++ b/libvncserver/main.c -@@ -1152,6 +1152,8 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) { - write(currentCl->pipe_notify_client_thread[1], "\x00", 1); - /* And wait for it to finish. */ - pthread_join(currentCl->client_thread, NULL); -+ } else { -+ rfbClientConnectionGone(currentCl); - } - #else - rfbClientConnectionGone(currentCl); diff --git a/server/misc/libvncserver/pspec.xml b/server/misc/libvncserver/pspec.xml index d8f25dcb84..f586c4e690 100644 --- a/server/misc/libvncserver/pspec.xml +++ b/server/misc/libvncserver/pspec.xml @@ -1,47 +1,48 @@ - + libvncserver - http://libvncserver.sourceforge.net/ + https://libvnc.github.io/ PisiLinux Community admins@pisilinux.org GPLv2 app:console - Library for creating VNC (Virtual Network Computing) servers - libvncserver provides a C library to create VNC servers. - https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.14.tar.gz + A library for easy implementation of a VNC server. + The cross-platform C libraries that allow you to easily implement VNC server or client functionality in your program. + https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.15.tar.gz - gnutls-devel - libjpeg-turbo-devel - libgcrypt-devel - libpng-devel - openssl-devel - lzo-devel cmake + ninja + lzo-devel + zlib-devel + libpng-devel + gnutls-devel + openssl-devel + libgcrypt-devel + libjpeg-turbo-devel - - + libvncserver + lzo zlib libpng - libgcrypt gnutls - libjpeg-turbo openssl - lzo + libgcrypt + libjpeg-turbo - /usr/bin/*-config /usr/lib + /usr/share @@ -50,19 +51,29 @@ Development files for libvncserver libvncserver + lzo-devel zlib-devel libpng-devel - libgcrypt-devel gnutls-devel + openssl-devel + libgcrypt-devel libjpeg-turbo-devel /usr/include + /usr/lib/cmake /usr/lib/pkgconfig + + 2025-02-09 + 0.9.15 + Version bump. + İdris Kalp + idriskalp@gmail.com + 2024-12-22 0.9.14