haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

freerdp, bump version (#10364)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-04-26 11:21:37 +02:00
committed by GitHub
parent 3b73f22653
commit fed64248d6
3 changed files with 88 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
net-misc/freerdp/freerdp-2.9.0.recipe → net-misc/freerdp/freerdp-2.11.7.recipe
View File

@@ -6,24 +6,27 @@ liberate your computing experience."
HOMEPAGE="https://freerdp.com"
COPYRIGHT="FreeRDP team"
LICENSE="Apache v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/FreeRDP/FreeRDP/releases/download/$portVersion/freerdp-$portVersion.tar.gz"
CHECKSUM_SHA256="fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7"
CHECKSUM_SHA256="5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3"
SOURCE_DIR="freerdp-$portVersion"
PATCHES="freerdp-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
freerdp$secondaryArchSuffix = $portVersion
cmd:FreeRDP$secondaryArchSuffix = $portVersion
cmd:winpr_hash$secondaryArchSuffix = $portVersion
cmd:winpr_makecert$secondaryArchSuffix = $portVersion
lib:libfreerdp2$secondaryArchSuffix = $portVersion
lib:libfreerdp_client2$secondaryArchSuffix = $portVersion
lib:libwinpr2$secondaryArchSuffix = $portVersion
lib:libwinpr_tools2$secondaryArchSuffix = $portVersion
lib:libfreerdp2$secondaryArchSuffix = $libVersionCompat
lib:libfreerdp_client2$secondaryArchSuffix = $libVersionCompat
lib:libwinpr2$secondaryArchSuffix = $libVersionCompat
lib:libwinpr_tools2$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -39,10 +42,10 @@ REQUIRES="
PROVIDES_devel="
freerdp${secondaryArchSuffix}_devel = $portVersion
devel:libfreerdp2$secondaryArchSuffix = $portVersion
devel:libfreerdp_client2$secondaryArchSuffix = $portVersion
devel:libwinpr2$secondaryArchSuffix = $portVersion
devel:libwinpr_tools2$secondaryArchSuffix = $portVersion
devel:libfreerdp2$secondaryArchSuffix = $libVersionCompat
devel:libfreerdp_client2$secondaryArchSuffix = $libVersionCompat
devel:libwinpr2$secondaryArchSuffix = $libVersionCompat
devel:libwinpr_tools2$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
freerdp$secondaryArchSuffix == $portVersion base
@@ -51,7 +54,7 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libavcodec$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix >= 59
devel:libavformat$secondaryArchSuffix
devel:libavutil$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
@@ -84,7 +87,10 @@ BUILD()
-DWITH_PULSE=OFF \
-DWITH_MEDIA_KIT=ON \
-DCHANNEL_URBDRC=OFF \
-DBUILD_SHARED_LIBS=ON
-DWITH_LIBSYSTEMD=OFF \
-DWITH_X11=OFF \
-DWITH_PCSC=OFF \
-DBUILD_SHARED_LIBS=ON -Wno-dev
make $jobArgs
}
@@ -92,19 +98,15 @@ INSTALL()
{
cd build
make install
mkdir -p $includeDir
cp -f client/Haiku/FreeRDP $binDir
ln -s $binDir/FreeRDP $binDir/freerdp
mv $prefix/include/* $includeDir
rm -rf $prefix/include
fixPkgconfig
prepareInstalledDevelLibs \
libfreerdp-client2 \
libfreerdp2 \
libwinpr-tools2 \
libwinpr2
fixPkgconfig
packageEntries devel \
$developDir \

1263
net-misc/freerdp/patches/freerdp-2.0.0~git.patchset
View File

File diff suppressed because it is too large Load Diff

75
net-misc/freerdp/patches/freerdp-2.9.0.patchset → net-misc/freerdp/patches/freerdp-2.11.7.patchset
View File

@@ -1,11 +1,11 @@
From 199d9d71562cd34eb6b3c8a4324649e90cef1c5e Mon Sep 17 00:00:00 2001
From 06019703b0cb76e612006d14d31a7d366a93849c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 24 Dec 2022 21:11:16 +1000
Subject: Add Haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 811cd39..4766a94 100644
index 67f3437..a48a4b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -599,6 +599,16 @@ if(OPENBSD)
@@ -508,10 +508,10 @@ index 0000000..f286916
+
+#endif // FREERDP_RDPSND_MEDIAKIT_RINGBUFFER_H
diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c
index f624058..0bc3a6c 100644
index 3de4cbc..1024841 100644
--- a/channels/rdpsnd/client/rdpsnd_main.c
+++ b/channels/rdpsnd/client/rdpsnd_main.c
@@ -995,6 +995,9 @@ static UINT rdpsnd_process_connect(rdpsndPlugin* rdpsnd)
@@ -1015,6 +1015,9 @@ static UINT rdpsnd_process_connect(rdpsndPlugin* rdpsnd)
#if defined(WITH_ALSA)
{ "alsa", "default" },
#endif
@@ -2152,7 +2152,7 @@ index 0000000..00e0c83
+
+
diff --git a/config.h.in b/config.h.in
index 650d5ad..ddb0f0b 100644
index 9644ab9..2140e2e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -67,6 +67,7 @@
@@ -2443,5 +2443,68 @@ index 6b0c950..f94f8f9 100644
+Libs.private: -ldl -lnetwork -lm -lpthread
Cflags: -I${includedir}
--
2.37.3
2.43.2
From a48b688eb7b7e40b50d598f7ee6c44e1f99d78be Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 20 Apr 2024 11:53:38 +0200
Subject: Fix headers installation paths, fix cmake configuration paths for
includeDir
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a48a4b2..40c705f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ endif()
message(STATUS "Git Revision ${GIT_REVISION}")
-set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/")
+set(FREERDP_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/freerdp${FREERDP_VERSION_MAJOR}/")
# Compatibility options
if(DEFINED STATIC_CHANNELS)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index a020dc5..4f9f35a 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -19,7 +19,7 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)
-set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
+set(FREERDP_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
file(GLOB FREERDP_HEADERS "freerdp/*.h")
install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 748582b..5f85a04 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -238,7 +238,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
- set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
+ set(WINPR_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/winpr${WINPR_VERSION_MAJOR}")
configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}
diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt
index 452383d..577f604 100644
--- a/winpr/include/CMakeLists.txt
+++ b/winpr/include/CMakeLists.txt
@@ -17,7 +17,7 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
+set(WINPR_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/winpr${WINPR_VERSION_MAJOR}/winpr)
file(GLOB WINPR_HEADERS "winpr/*.h")
install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
--
2.43.2