diff --git a/package/rdesktop/rdesktop-8bit-colors.patch b/package/rdesktop/rdesktop-01-8bit-colors.patch similarity index 100% rename from package/rdesktop/rdesktop-8bit-colors.patch rename to package/rdesktop/rdesktop-01-8bit-colors.patch diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 94e02829d4..6829709fc8 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -4,11 +4,20 @@ # ################################################################################ -RDESKTOP_VERSION = 1.5.0 +RDESKTOP_VERSION = 1.8.2 RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION) -RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt -RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr -RDESKTOP_LICENSE = GPLv2+ with exceptions +RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \ + $(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \ + $(if $(BR2_PACKAGE_LIBAO),libao) \ + $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) +RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr --disable-credssp +RDESKTOP_LICENSE = GPLv3+ RDESKTOP_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_PCSC_LITE),y) +RDESKTOP_DEPENDENCIES += pcsc-lite +else +RDESKTOP_CONF_OPT += --disable-smartcard +endif + $(eval $(autotools-package))