automatic version update by autodist [release 3.15.0-1mamba;Mon Apr 14 2025]

This commit is contained in:
2025-04-25 14:28:16 +02:00
parent a74dd082d8
commit 6a1d032c19
4 changed files with 135 additions and 204 deletions

View File

@ -1,35 +0,0 @@
diff -ru freerdp-1.0.1/channels/drdynvc/audin/pulse/CMakeLists.txt freerdp-1.0.1-c10866db/channels/drdynvc/audin/pulse/CMakeLists.txt
--- freerdp-1.0.1/channels/drdynvc/audin/pulse/CMakeLists.txt 2012-02-10 03:01:42.000000000 +0100
+++ freerdp-1.0.1-c10866db/channels/drdynvc/audin/pulse/CMakeLists.txt 2012-09-30 19:56:14.000000000 +0200
@@ -28,7 +28,7 @@
set_target_properties(audin_pulse PROPERTIES PREFIX "")
target_link_libraries(audin_pulse freerdp-utils)
-target_link_libraries(audin_pulse ${PULSE_LIBRARIES})
+target_link_libraries(audin_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS audin_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
diff -ru freerdp-1.0.1/channels/drdynvc/tsmf/pulse/CMakeLists.txt freerdp-1.0.1-c10866db/channels/drdynvc/tsmf/pulse/CMakeLists.txt
--- freerdp-1.0.1/channels/drdynvc/tsmf/pulse/CMakeLists.txt 2012-02-10 03:01:42.000000000 +0100
+++ freerdp-1.0.1-c10866db/channels/drdynvc/tsmf/pulse/CMakeLists.txt 2012-09-30 19:56:43.000000000 +0200
@@ -28,7 +28,7 @@
set_target_properties(tsmf_pulse PROPERTIES PREFIX "")
target_link_libraries(tsmf_pulse freerdp-utils)
-target_link_libraries(tsmf_pulse ${PULSE_LIBRARIES})
+target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS tsmf_pulse DESTINATION ${FREERDP_PLUGIN_PATH})
diff -ru freerdp-1.0.1/channels/rdpsnd/pulse/CMakeLists.txt freerdp-1.0.1-c10866db/channels/rdpsnd/pulse/CMakeLists.txt
--- freerdp-1.0.1/channels/rdpsnd/pulse/CMakeLists.txt 2012-02-10 03:01:42.000000000 +0100
+++ freerdp-1.0.1-c10866db/channels/rdpsnd/pulse/CMakeLists.txt 2012-09-30 19:57:14.000000000 +0200
@@ -28,6 +28,6 @@
set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "")
target_link_libraries(rdpsnd_pulse freerdp-utils)
-target_link_libraries(rdpsnd_pulse ${PULSE_LIBRARIES})
+target_link_libraries(rdpsnd_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS rdpsnd_pulse DESTINATION ${FREERDP_PLUGIN_PATH})

View File

@ -1,72 +0,0 @@
--- freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c.orig 2013-01-02 22:46:59.000000000 +0100
+++ freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-09-26 18:29:52.693695785 +0200
@@ -39,7 +39,7 @@
ITSMFDecoder iface;
int media_type;
- enum CodecID codec_id;
+ enum AVCodecID codec_id;
AVCodecContext* codec_context;
AVCodec* codec;
AVFrame* frame;
@@ -54,7 +54,7 @@
{
TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- mdecoder->codec_context = avcodec_alloc_context();
+ mdecoder->codec_context = avcodec_alloc_context3(NULL);
if (!mdecoder->codec_context)
{
DEBUG_WARN("avcodec_alloc_context failed.");
@@ -88,16 +88,6 @@
mdecoder->codec_context->channels = media_type->Channels;
mdecoder->codec_context->block_align = media_type->BlockAlign;
-#ifdef AV_CPU_FLAG_SSE2
- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
-#else
-#if LIBAVCODEC_VERSION_MAJOR < 53
- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
-#else
- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
-#endif
-#endif
-
return true;
}
@@ -174,7 +164,7 @@
{
TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
+ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
{
DEBUG_WARN("avcodec_open failed.");
return false;
@@ -337,7 +327,7 @@
#endif
if (mdecoder->decoded_size_max == 0)
- mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
+ mdecoder->decoded_size_max = 192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */ + 16;
mdecoder->decoded_data = xzalloc(mdecoder->decoded_size_max);
/* align the memory for SSE2 needs */
dst = (uint8*) (((uintptr_t)mdecoder->decoded_data + 15) & ~ 0x0F);
@@ -348,7 +338,7 @@
while (src_size > 0)
{
/* Ensure enough space for decoding */
- if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
+ if (mdecoder->decoded_size_max - mdecoder->decoded_size < 192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */)
{
mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
mdecoder->decoded_data = xrealloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
@@ -499,7 +489,6 @@
if (!initialized)
{
- avcodec_init();
avcodec_register_all();
initialized = true;
}

View File

@ -1,42 +0,0 @@
From aa2cb9aa5ff5562433598ba168a466e0752bca0e Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Tue, 14 Feb 2023 07:48:54 +0100
Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
---
channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 2 ++
libfreerdp/codec/h264_ffmpeg.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
index 339462d865f..beea80b7a1e 100644
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@@ -239,8 +239,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
}
}
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
+#endif
return TRUE;
}
diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c
index 8a23db2473c..896a333019b 100644
--- a/libfreerdp/codec/h264_ffmpeg.c
+++ b/libfreerdp/codec/h264_ffmpeg.c
@@ -615,10 +615,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
goto EXCEPTION;
}
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
{
sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
}
+#endif
#ifdef WITH_VAAPI

View File

@ -1,5 +1,5 @@
Name: freerdp
Version: 2.11.2
Version: 3.15.0
Release: 1mamba
Summary: A Remote Desktop Protocol Implementation
Group: Applications/Networking
@ -8,12 +8,12 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.freerdp.com/
Source0: https://github.com/FreeRDP/FreeRDP.git/%{version}/FreeRDP-%{version}.tar.bz2
Patch0: %{name}-1.0.1-fix_not_linked_with_libpulse.patch
Patch1: freerdp-1.0.2-ffmpeg-2.3.3.patch
Patch2: freerdp-2.10.0-ffmpeg-6.0.patch
License: Apache License 2.0
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libICE-devel
BuildRequires: libSDL2-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXcursor-devel
BuildRequires: libXdamage-devel
@ -26,26 +26,37 @@ BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libXv-devel
BuildRequires: libalsa-devel
BuildRequires: libavcodec-ffmpeg-devel
BuildRequires: libavutil-ffmpeg-devel
BuildRequires: libavcodec-devel
BuildRequires: libavdevice-devel
BuildRequires: libavfilter-devel
BuildRequires: libavformat-devel
BuildRequires: libavutil-devel
BuildRequires: libcups-devel
BuildRequires: libe2fs-devel
BuildRequires: libfuse3-devel
BuildRequires: libgcc
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libjson-c-devel
BuildRequires: libkrb5-devel
BuildRequires: libopenssl-devel
BuildRequires: libpam-devel
BuildRequires: libpulseaudio-devel
BuildRequires: libswresample-ffmpeg-devel
BuildRequires: libswscale-ffmpeg-devel
BuildRequires: libsystemd-devel
BuildRequires: libpostproc-devel
BuildRequires: libsdl2_ttf-devel
BuildRequires: libstdc++6-devel
BuildRequires: libswresample-devel
BuildRequires: libswscale-devel
BuildRequires: liburiparser-devel
BuildRequires: libusb-devel
BuildRequires: libwayland-devel
BuildRequires: libxkbcommon-devel
BuildRequires: libxkbfile-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRequires: cmake
BuildRequires: xmlto
BuildRequires: libxml2-utils
BuildRequires: docbook-utils
BuildRequires: libpkcs11-helper-devel
BuildRequires: libxml2-utils
BuildRequires: xmlto
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description
@ -79,15 +90,11 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
A set of plugins to the channel manager implementing the standard virtual channels extending RDP core functionality.
For instance, sounds, clipboard sync, disk/printer redirection, etc.
%debug_package
%prep
%setup -q -n FreeRDP-%{version}
#-D -T
#:<< _EOF
#%patch0 -p1
#%patch1 -p1
#%patch 2 -p1 -b .ffmpeg-6.0
%build
#:<< _EOF
@ -133,18 +140,24 @@ For instance, sounds, clipboard sync, disk/printer redirection, etc.
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_bindir}/freerdp-proxy
%{_bindir}/freerdp-shadow-cli
%{_bindir}/xfreerdp
%{_bindir}/sdl-freerdp
%{_bindir}/sfreerdp
%{_bindir}/sfreerdp-server
%{_bindir}/winpr-hash
%{_bindir}/winpr-makecert
%{_bindir}/wlfreerdp
%{_bindir}/xfreerdp
%dir %{_datadir}/FreeRDP
%dir %{_datadir}/FreeRDP/images
%{_datadir}/FreeRDP/images/*
%{_mandir}/man1/freerdp-shadow-cli.1*
%{_mandir}/man1/freerdp-proxy.1*
%{_mandir}/man1/sdl-freerdp.1*
%{_mandir}/man1/xfreerdp.*
%{_mandir}/man1/winpr-hash.1*
%{_mandir}/man1/winpr-makecert.1*
@ -153,57 +166,124 @@ For instance, sounds, clipboard sync, disk/printer redirection, etc.
%files -n lib%{name}
%defattr(-,root,root)
%{_libdir}/libfreerdp-client2.so.*
%{_libdir}/libfreerdp2.so.*
%{_libdir}/libfreerdp-server2.so.*
%{_libdir}/libfreerdp-shadow-subsystem2.so.*
%{_libdir}/libfreerdp-shadow2.so.*
%{_libdir}/libfreerdp-client%{MAJver}.so.*
%{_libdir}/libfreerdp%{MAJver}.so.*
%{_libdir}/libfreerdp-server%{MAJver}.so.*
%{_libdir}/libfreerdp-server-proxy%{MAJver}.so.*
%{_libdir}/libfreerdp-shadow-subsystem%{MAJver}.so.*
%{_libdir}/libfreerdp-shadow%{MAJver}.so.*
%{_libdir}/librdtk0.so.*
%{_libdir}/libuwac0.so.*
%{_libdir}/libwinpr-tools2.so.*
%{_libdir}/libwinpr2.so.*
%{_libdir}/libwinpr-tools%{MAJver}.so.*
%{_libdir}/libwinpr%{MAJver}.so.*
%dir %{_libdir}/freerdp%{MAJver}/proxy
%{_libdir}/freerdp%{MAJver}/proxy/proxy-*.so
%doc LICENSE
%files -n lib%{name}-devel
%defattr(-,root,root)
%dir %{_includedir}/freerdp2
%{_includedir}/freerdp2/*
%dir %{_includedir}/freerdp%{MAJver}
%{_includedir}/freerdp%{MAJver}/*
%dir %{_includedir}/rdtk0
%dir %{_includedir}/rdtk0/rdtk
%{_includedir}/rdtk0/rdtk/*
%dir %{_includedir}/uwac0/uwac
%{_includedir}/uwac0/uwac/*
%dir %{_includedir}/winpr2/winpr
%{_includedir}/winpr2/winpr/*
%{_libdir}/libfreerdp-client2.so
%{_libdir}/libfreerdp2.so
%dir %{_includedir}/winpr%{MAJver}/winpr
%{_includedir}/winpr%{MAJver}/winpr/*
%{_libdir}/libfreerdp-client%{MAJver}.so
%{_libdir}/libfreerdp%{MAJver}.so
%{_libdir}/libuwac0.so
%{_libdir}/libwinpr-tools2.so
%{_libdir}/libwinpr2.so
%{_libdir}/libfreerdp-server2.so
%{_libdir}/libfreerdp-shadow-subsystem2.so
%{_libdir}/libfreerdp-shadow2.so
%dir %{_libdir}/cmake/FreeRDP-Client2
%{_libdir}/cmake/FreeRDP-Client2/FreeRDP-Client*.cmake
%dir %{_libdir}/cmake/FreeRDP2
%{_libdir}/cmake/FreeRDP2/FreeRDP*.cmake
%dir %{_libdir}/cmake/WinPR2
%{_libdir}/cmake/WinPR2/WinPR*.cmake
%{_libdir}/libwinpr-tools%{MAJver}.so
%{_libdir}/libwinpr%{MAJver}.so
%{_libdir}/libfreerdp-server%{MAJver}.so
%{_libdir}/libfreerdp-server-proxy%{MAJver}.so
%{_libdir}/librdtk0.so
%{_libdir}/libfreerdp-shadow-subsystem%{MAJver}.so
%{_libdir}/libfreerdp-shadow%{MAJver}.so
%dir %{_libdir}/cmake/FreeRDP-Client%{MAJver}
%{_libdir}/cmake/FreeRDP-Client%{MAJver}/FreeRDP-Client*.cmake
%dir %{_libdir}/cmake/FreeRDP%{MAJver}
%{_libdir}/cmake/FreeRDP%{MAJver}/FreeRDP*.cmake
%dir %{_libdir}/cmake/WinPR%{MAJver}
%{_libdir}/cmake/WinPR%{MAJver}/WinPR*.cmake
%dir %{_libdir}/cmake/uwac0
%{_libdir}/cmake/uwac0/uwac*.cmake
%dir %{_libdir}/cmake/FreeRDP-Server2
%{_libdir}/cmake/FreeRDP-Server2/FreeRDP*.cmake
%dir %{_libdir}/cmake/FreeRDP-Shadow2
%{_libdir}/cmake/FreeRDP-Shadow2/FreeRDP*.cmake
%{_libdir}/pkgconfig/freerdp-client2.pc
%{_libdir}/pkgconfig/freerdp-server2.pc
%{_libdir}/pkgconfig/freerdp-shadow2.pc
%dir %{_libdir}/cmake/FreeRDP-Server%{MAJver}
%{_libdir}/cmake/FreeRDP-Server%{MAJver}/FreeRDP*.cmake
%dir %{_libdir}/cmake/FreeRDP-Shadow%{MAJver}
%{_libdir}/cmake/FreeRDP-Shadow%{MAJver}/FreeRDP*.cmake
%dir %{_libdir}/cmake/FreeRDP-Proxy3
%{_libdir}/cmake/FreeRDP-Proxy3/FreeRDP-*.cmake
%dir %{_libdir}/cmake/WinPR-tools3
%{_libdir}/cmake/WinPR-tools3/WinPR-*.cmake
%dir %{_libdir}/cmake/rdtk0
%{_libdir}/cmake/rdtk0/rdtk*.cmake
%{_libdir}/pkgconfig/freerdp-client%{MAJver}.pc
%{_libdir}/pkgconfig/freerdp-server%{MAJver}.pc
%{_libdir}/pkgconfig/freerdp-shadow%{MAJver}.pc
%{_libdir}/pkgconfig/uwac0.pc
%{_libdir}/pkgconfig/winpr-tools2.pc
%{_libdir}/pkgconfig/winpr2.pc
%{_libdir}/pkgconfig/freerdp2.pc
%{_libdir}/pkgconfig/winpr-tools%{MAJver}.pc
%{_libdir}/pkgconfig/winpr%{MAJver}.pc
%{_libdir}/pkgconfig/freerdp%{MAJver}.pc
%{_libdir}/pkgconfig/freerdp-server-proxy%{MAJver}.pc
%{_libdir}/pkgconfig/rdtk0.pc
#%files plugins
#%defattr(-,root,root)
##%{_libdir}/freerdp/*.so
%changelog
* Mon Apr 14 2025 Automatic Build System <autodist@openmamba.org> 3.15.0-1mamba
- automatic version update by autodist
* Wed Mar 26 2025 Automatic Build System <autodist@openmamba.org> 3.14.1-1mamba
- automatic version update by autodist
* Fri Mar 14 2025 Automatic Build System <autodist@openmamba.org> 3.14.0-1mamba
- automatic version update by autodist
* Sat Mar 08 2025 Automatic Build System <autodist@openmamba.org> 3.13.0-1mamba
- automatic version update by autodist
* Fri Feb 14 2025 Automatic Build System <autodist@openmamba.org> 3.12.0-1mamba
- automatic version update by autodist
* Fri Feb 07 2025 Automatic Build System <autodist@openmamba.org> 3.11.1-1mamba
- automatic version update by autodist
* Fri Feb 07 2025 Automatic Build System <autodist@openmamba.org> 3.11.0-1mamba
- automatic version update by autodist
* Thu Dec 19 2024 Automatic Build System <autodist@openmamba.org> 3.10.3-1mamba
- automatic version update by autodist
* Tue Dec 17 2024 Automatic Build System <autodist@openmamba.org> 3.10.2-1mamba
- automatic version update by autodist
* Mon Dec 16 2024 Automatic Build System <autodist@openmamba.org> 3.10.1-1mamba
- automatic version update by autodist
* Fri Dec 13 2024 Automatic Build System <autodist@openmamba.org> 3.10.0-1mamba
- automatic version update by autodist
* Tue Oct 22 2024 Automatic Build System <autodist@openmamba.org> 3.9.0-1mamba
- automatic version update by autodist
* Fri Aug 30 2024 Automatic Build System <autodist@openmamba.org> 3.8.0-1mamba
- automatic version update by autodist
* Fri Aug 09 2024 Automatic Build System <autodist@openmamba.org> 3.7.0-1mamba
- automatic version update by autodist
* Thu Jul 11 2024 Automatic Build System <autodist@openmamba.org> 3.6.3-1mamba
- automatic version update by autodist
* Thu Jul 04 2024 Automatic Build System <autodist@openmamba.org> 3.6.2-1mamba
- automatic version update by autodist
* Sun May 19 2024 Automatic Build System <autodist@openmamba.org> 3.5.1-1mamba
- automatic version update by autodist
* Thu Sep 21 2023 Automatic Build System <autodist@mambasoft.it> 2.11.2-1mamba
- automatic version update by autodist