From c95e2fd83e6c27d8f3598022816d8496732365b2 Mon Sep 17 00:00:00 2001 From: iigs <2274777+iigs@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:12:16 +0000 Subject: [PATCH] freerdp: update to 2.11.7; switch to openssl 3.1 --- components/desktop/freerdp/Makefile | 12 +++++++----- components/desktop/freerdp/pkg5 | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/components/desktop/freerdp/Makefile b/components/desktop/freerdp/Makefile index 83a9d4f7fd..4fb3ce573e 100644 --- a/components/desktop/freerdp/Makefile +++ b/components/desktop/freerdp/Makefile @@ -16,17 +16,16 @@ BUILD_BITS= 64 BUILD_STYLE= cmake -USE_OPENSSL11= yes +OPENSSL_VERSION= 3.1 include ../../../make-rules/shared-macros.mk COMPONENT_NAME= freerdp -COMPONENT_VERSION= 2.10.0 -COMPONENT_REVISION= 3 +COMPONENT_VERSION= 2.11.7 COMPONENT_SUMMARY= Remote Desktop Viewer Client COMPONENT_PROJECT_URL= https://www.freerdp.com COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 +COMPONENT_ARCHIVE_HASH= sha256:5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 COMPONENT_ARCHIVE_URL= https://github.com/FreeRDP/FreeRDP/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_FMRI= desktop/remote-desktop/freerdp COMPONENT_CLASSIFICATION= Applications/Internet @@ -39,6 +38,9 @@ include $(WS_MAKE_RULES)/common.mk # https://github.com/FreeRDP/FreeRDP/issues/5504 CFLAGS += $(XPG6MODE) +CFLAGS += -I$(OPENSSL_INCDIR) +LDFLAGS += -L$(OPENSSL_LIBDIR) + ifeq ($(strip $(MACH)),i386) CMAKE_OPTIONS += -DWITH_SSE2=ON else @@ -101,13 +103,13 @@ COMPONENT_POST_INSTALL_ACTION = \ # Auto-generated dependencies REQUIRED_PACKAGES += $(ICU_LIBRARY_PKG) REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG) +REQUIRED_PACKAGES += $(OPENSSL_PKG) REQUIRED_PACKAGES += audio/lame REQUIRED_PACKAGES += image/library/libjpeg-turbo REQUIRED_PACKAGES += library/audio/pulseaudio REQUIRED_PACKAGES += library/desktop/cairo REQUIRED_PACKAGES += library/libusb-1 REQUIRED_PACKAGES += library/print/cups-libs -REQUIRED_PACKAGES += library/security/openssl-11 REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += system/library/math REQUIRED_PACKAGES += x11/library/libx11 diff --git a/components/desktop/freerdp/pkg5 b/components/desktop/freerdp/pkg5 index 494ada2438..fa85ead97e 100644 --- a/components/desktop/freerdp/pkg5 +++ b/components/desktop/freerdp/pkg5 @@ -5,10 +5,10 @@ "image/library/libjpeg8-turbo", "library/audio/pulseaudio", "library/desktop/cairo", - "library/icu-74", + "library/icu-75", "library/libusb-1", "library/print/cups-libs", - "library/security/openssl-11", + "library/security/openssl-31", "system/library", "system/library/math", "x11/library/libx11", -- 2.11.4.GIT