Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libvncserver-0.9.15

Browse Source
This commit is contained in:
uglyside
2025-02-09 11:13:22 +03:00
parent 3bd54e904f
commit a898f35198
4 changed files with 42 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/misc/libvncserver/actions.py
+13 -23
View File
@@ -2,34 +2,24 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Licensed under the GNU General Public License, version 3. # 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 cmaketools, mesontools, pisitools
from pisi.actionsapi import pisitools
from pisi.actionsapi import cmaketools
from pisi.actionsapi import get
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(): def setup():
#autotools.autoreconf("-vif") cmaketools.configure(i)
#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 \
")
def build(): def build():
cmaketools.make() mesontools.build()
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) mesontools.install()
#pisitools.remove("/usr/bin/linuxvnc")
pisitools.dodoc("AUTHORS", "COPYING")
server/misc/libvncserver/files/krfb-crash-1.patch
-32
View File
@@ -1,32 +0,0 @@
From d0a76539835d11c0f4723499f8be4bc9c7724eb9 Mon Sep 17 00:00:00 2001
From: Rajesh Sahoo <rajesh.sahoo@lge.com>
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
server/misc/libvncserver/files/krfb-crash-2.patch
-25
View File
@@ -1,25 +0,0 @@
From 15c4f144a3783d9f1f2c976acf9f4d85988fd466 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
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);
server/misc/libvncserver/pspec.xml
+29 -18
View File
@@ -1,47 +1,48 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>libvncserver</Name> <Name>libvncserver</Name>
<Homepage>http://libvncserver.sourceforge.net/</Homepage> <Homepage>https://libvnc.github.io/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>GPLv2</License> <License>GPLv2</License>
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Library for creating VNC (Virtual Network Computing) servers</Summary> <Summary>A library for easy implementation of a VNC server.</Summary>
<Description>libvncserver provides a C library to create VNC servers.</Description> <Description>The cross-platform C libraries that allow you to easily implement VNC server or client functionality in your program.</Description>
<Archive sha1sum="61a71b08f2ef3a441ca5828e77aa641d6ce593e2" type="targz">https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.14.tar.gz</Archive> <Archive sha1sum="bde1b5a7f15cf0da105aa65408241d2582a338c0" type="targz">https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.15.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gnutls-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>lzo-devel</Dependency>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>lzo-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>gnutls-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1">krfb-crash-1.patch</Patch> --> <!-- <Patch level="1"></Patch> -->
<!-- <Patch level="1">krfb-crash-2.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
<Package> <Package>
<Name>libvncserver</Name> <Name>libvncserver</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>lzo</Dependency>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>libpng</Dependency> <Dependency>libpng</Dependency>
<Dependency>libgcrypt</Dependency>
<Dependency>gnutls</Dependency> <Dependency>gnutls</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>openssl</Dependency> <Dependency>openssl</Dependency>
<Dependency>lzo</Dependency> <Dependency>libgcrypt</Dependency>
<Dependency>libjpeg-turbo</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/*-config</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
</Files> </Files>
</Package> </Package>
@@ -50,19 +51,29 @@
<Summary>Development files for libvncserver</Summary> <Summary>Development files for libvncserver</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">libvncserver</Dependency> <Dependency release="current">libvncserver</Dependency>
<Dependency>lzo-devel</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>libpng-devel</Dependency> <Dependency>libpng-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>gnutls-devel</Dependency> <Dependency>gnutls-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency> <Dependency>libjpeg-turbo-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="9">
<Date>2025-02-09</Date>
<Version>0.9.15</Version>
<Comment>Version bump.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="8"> <Update release="8">
<Date>2024-12-22</Date> <Date>2024-12-22</Date>
<Version>0.9.14</Version> <Version>0.9.14</Version>