862aeb7830
Commitee59023794(package/libvncserver: bump to version 0.9.12) changes the package from autotools to cmake and accidently inverted the threads logic. The reason this was not noticed is that the build system verifies if threads support works and otherwise disables it even when -DWITH_THREADS=ON is passed, E.G. for a nothread configuration: cmake ... -DWITH_THREADS=ON ... .. -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - not found Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit7b3c0b19d4) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
82 lines
2.1 KiB
Makefile
82 lines
2.1 KiB
Makefile
################################################################################
|
|
#
|
|
# libvncserver
|
|
#
|
|
################################################################################
|
|
|
|
LIBVNCSERVER_VERSION = 0.9.14
|
|
LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
|
|
LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive
|
|
LIBVNCSERVER_LICENSE = GPL-2.0+
|
|
LIBVNCSERVER_LICENSE_FILES = COPYING
|
|
LIBVNCSERVER_CPE_ID_VALID = YES
|
|
LIBVNCSERVER_INSTALL_STAGING = YES
|
|
LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo
|
|
LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON
|
|
|
|
# only used for examples
|
|
LIBVNCSERVER_CONF_OPTS += \
|
|
-DWITH_EXAMPLES=OFF \
|
|
-DWITH_FFMPEG=OFF \
|
|
-DWITH_GTK=OFF \
|
|
-DWITH_SDL=OFF \
|
|
-DWITH_TESTS=OFF
|
|
|
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=OFF
|
|
endif
|
|
|
|
# openssl supports needs NPTL thread support
|
|
ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),yy)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_OPENSSL=ON
|
|
LIBVNCSERVER_DEPENDENCIES += openssl
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_OPENSSL=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_GCRYPT=ON
|
|
LIBVNCSERVER_DEPENDENCIES += libgcrypt
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_GCRYPT=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_GNUTLS=ON
|
|
LIBVNCSERVER_DEPENDENCIES += gnutls
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_GNUTLS=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_JPEG),y)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_JPEG=ON
|
|
LIBVNCSERVER_DEPENDENCIES += jpeg
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_JPEG=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_PNG=ON
|
|
LIBVNCSERVER_DEPENDENCIES += libpng
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_PNG=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_SYSTEMD=ON
|
|
LIBVNCSERVER_DEPENDENCIES += systemd
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_SYSTEMD=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_ZLIB=ON
|
|
LIBVNCSERVER_DEPENDENCIES += zlib
|
|
else
|
|
LIBVNCSERVER_CONF_OPTS += -DWITH_ZLIB=OFF
|
|
endif
|
|
|
|
$(eval $(cmake-package))
|