$ git diff --patch-with-stat --summary 2b0dcd023572712f76b4065154388a451e8ff47f..b63215663151d55e575f0dc288e70fe641bdb632
.abf.yml | 2 +-
freerdp.spec | 49 +++++++++++++++++++++++++++++++++++--------------
openssl3.patch | 44 --------------------------------------------
3 files changed, 36 insertions(+), 59 deletions(-)
delete mode 100644 openssl3.patch
diff --git a/.abf.yml b/.abf.yml
index b174f4a..358b701 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- FreeRDP-2.10.0.tar.gz: b9d730d133473c8b366213fb3ab62a0319501eb4
+ FreeRDP-3.14.0.tar.gz: a362c39e75c8cb1286c7f7b61178d530698d365d
diff --git a/freerdp.spec b/freerdp.spec
index 4ca6ce4..b0fbebb 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -1,14 +1,18 @@
+%global optflags %{optflags} -Wno-incompatible-function-pointer-types
%global optflags %{optflags} -O2
+%global __requires_exclude ^.*cmake.*$
# "fix" underlinking:
%define _disable_ld_no_undefined 1
-%define up_name freerdp2
+%define up_name freerdp3
-%define winpr_major 2
+%define winpr_major 3
%define uwac_major 0
-%define major 2
-%define libname %mklibname %{name} %{major}
+%define major 3
+%define rdtk_major 0
+
+%define libname %mklibname %{name}
%define develname %mklibname %{name} -d
%define oname FreeRDP
@@ -29,14 +33,13 @@
%bcond_with x264
Name: freerdp
-Version: 2.10.0
+Version: 3.14.0
Release: 1
Summary: A free remote desktop protocol client
License: Apache License
Group: Networking/Remote access
-Url: http://www.freerdp.com/
+Url: https://www.freerdp.com/
Source0: https://github.com/FreeRDP/FreeRDP/archive/%{tarballver}/%{oname}-%{tarballver}.tar.gz
-#Patch0: openssl3.patch
BuildRequires: cmake
BuildRequires: ninja
BuildRequires: docbook-style-xsl
@@ -56,6 +59,7 @@ BuildRequires: pkgconfig(alsa)
%if %{with faac}
BuildRequires: pkgconfig(faad2)
%endif
+BuildRequires: pkgconfig(fuse3)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-base-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
@@ -64,11 +68,13 @@ BuildRequires: pkgconfig(gstreamer-fft-1.0)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(icu-i18n)
+BuildRequires: cmake(json-c)
%if %{with gss}
BuildRequires: pkgconfig(krb5) >= 1.13
%endif
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpcsclite)
+BuildRequires: pkgconfig(libpkcs11-helper-1)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(libva)
@@ -77,10 +83,14 @@ BuildRequires: pkgconfig(openh264)
%if %{with openssl}
BuildRequires: pkgconfig(openssl)
%endif
+BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(sdl2)
+BuildRequires: pkgconfig(SDL2_ttf)
BuildRequires: pkgconfig(sox)
BuildRequires: pkgconfig(soxr)
BuildRequires: pkgconfig(systemd)
+#BuildRequires: (cmake(uriparser) and uriparser-devel)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-scanner)
%if %{with x264}
@@ -104,8 +114,9 @@ FreeRDP is a fork of the rdesktop project.
%doc ChangeLog README.md
%license LICENSE
%{_bindir}/*
-%{_libdir}/%{name}*/
+%doc %{_mandir}/man1/sdl-freerdp.1.*
%doc %{_mandir}/man1/xfreerdp.1.*
+%doc %{_mandir}/man1/freerdp-proxy.1.*
%doc %{_mandir}/man1/freerdp-shadow-cli.1.*
%doc %{_mandir}/man1/winpr-hash.1.*
%doc %{_mandir}/man1/winpr-makecert.1.*
@@ -119,14 +130,17 @@ Summary: Main library for %{name}
Group: System/Libraries
# ease for update
Conflicts: %{mklibname freerdp 1} < 1.2.0-5
+Conflicts: %{mklibname freerdp 2} < 2.11.5-1
%description -n %{libname}
Shared libraries for %{name}.
%files -n %{libname}
+%{_libdir}/%{name}*/
%{_libdir}/lib*%{name}*.so.%{major}*
%{_libdir}/libwinpr*.so.%{winpr_major}*
-%{_libdir}/libuwac*.so.%{uwac_major}*
+#{_libdir}/libuwac*.so.%{uwac_major}*
+%{_libdir}/librdtk*.so.%{rdtk_major}*
#----------------------------------------------------
@@ -143,13 +157,16 @@ Development files and headers for %{name}.
%{_libdir}/*.so
%{_includedir}/%{up_name}/
%{_includedir}/winpr*/
-%{_includedir}/uwac*/
+%{_includedir}/rdtk*/
+#{_includedir}/uwac*/
%{_libdir}/pkgconfig/%{name}*.pc
%{_libdir}/pkgconfig/winpr*.pc
-%{_libdir}/pkgconfig/uwac*.pc
+#{_libdir}/pkgconfig/uwac*.pc
+%{_libdir}/pkgconfig/rdtk*.pc
%{_libdir}/cmake/FreeRDP*/
%{_libdir}/cmake/WinPR*/
-%{_libdir}/cmake/uwac*/
+%{_libdir}/cmake/rdtk*/
+#{_libdir}/cmake/uwac*/
#----------------------------------------------------
@@ -172,6 +189,7 @@ Development files and headers for %{name}.
-DWITH_GSSAPI:BOOL=%{?_with_gss:ON}%{?!_with_gss:OFF} \
-DWITH_GSTREAMER_1_0:BOOL=ON -DWITH_GSTREAMER_0_10:BOOL=OFF \
-DGSTREAMER_1_0_INCLUDE_DIRS=%{_includedir}/gstreamer-1.0 \
+ -DWITH_JSONC_REQUIRED=ON \
-DWITH_ICU:BOOL=ON \
-DWITH_IPP:BOOL=OFF \
-DWITH_JPEG:BOOL=ON \
@@ -183,15 +201,18 @@ Development files and headers for %{name}.
-DWITH_MBEDTLS:BOOL=%{?with_mbedtls:ON}%{?!with_mbedtls:OFF} \
-DWITH_PCSC:BOOL=ON \
-DWITH_PULSE:BOOL=ON \
+ -DWITH_SAMPLE:BOOL=OFF \
-DWITH_SERVER:BOOL=ON -DWITH_SERVER_INTERFACE:BOOL=ON \
-DWITH_SHADOW_X11:BOOL=ON -DWITH_SHADOW_MAC:BOOL=ON \
-DWITH_SOXR:BOOL=ON \
%ifarch %{x86_64}
- -DWITH_SSE2:BOOL=ON \
+ -DWITH_SIMD:BOOL=ON \
%else
- -DWITH_SSE2:BOOL=OFF \
+ -DWITH_SIMD:BOOL=OFF \
%endif
+ -DUWAC_FORCE_STATIC_BUILD=ON \
-DWITH_WAYLAND:BOOL=ON \
+ -DWITH_WEBVIEW:BOOL=OFF \
-DWITH_VAAPI:BOOL=ON \
-DWITH_X264:BOOL=%{?with_x264:ON}%{?!with_x264:OFF} \
-DWITH_X11:BOOL=ON \
diff --git a/openssl3.patch b/openssl3.patch
deleted file mode 100644
index 0513359..0000000
--- a/openssl3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 3a85903..f564317 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -242,23 +242,12 @@ static BOOL winpr_enable_fips(DWORD flags)
- WLog_ERR(TAG, "Openssl fips mode not available on openssl versions less than 1.0.1!");
- return FALSE;
- #else
-- WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
--
-- if (FIPS_mode() != 1)
-- {
-- if (FIPS_mode_set(1))
-- WLog_INFO(TAG, "Openssl fips mode ENabled!");
-- else
-- {
-- WLog_ERR(TAG, "Openssl fips mode ENable failed!");
-- return FALSE;
-- }
-- }
--
-+ WLog_ERR(TAG, "Openssl fips mode not available on openssl versions less than 1.0.1!");
-+ return FALSE;
- #endif
- }
-
-- return TRUE;
-+ return FALSE;
- }
-
- static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVOID* context)
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index f564317..14f85e1 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -346,7 +346,7 @@ BOOL winpr_FIPSMode(void)
- #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- return FALSE;
- #else
-- return (FIPS_mode() == 1);
-+ return FALSE;
- #endif
- }
-