Skip to content

Commit e51ae9a

Browse files
jens-mausCopilot
andcommitted
freerdp3: align CMake opts and add RDPECAM
Drop/rename obsolete FreeRDP2-era CMake flags for the FreeRDP 3.30.0 package wiring, and add a dedicated BR2_PACKAGE_FREERDP3_RDPECAM toggle that enables CHANNEL_RDPECAM and CHANNEL_RDPECAM_CLIENT with libv4l/libusb dependencies. Enable it in generic-x86_64 config. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 1b10fd9 commit e51ae9a

3 files changed

Lines changed: 29 additions & 7 deletions

File tree

buildroot-external/configs/generic-x86_64.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ BR2_PACKAGE_LIBKRB5=y
3737
BR2_PACKAGE_LIBNSS=y
3838
BR2_PACKAGE_CUPS=y
3939
BR2_PACKAGE_LIBV4L_UTILS=y
40+
BR2_PACKAGE_LIBV4L=y
4041
BR2_TARGET_ROOTFS_INITRAMFS=y
4142

4243
# select/deselect webkiosk/thinroot applications
4344
BR2_PACKAGE_QUTSELECT=y
4445
BR2_PACKAGE_THINLINC_NIGHTLY=y
4546
BR2_PACKAGE_FREERDP3=y
47+
BR2_PACKAGE_FREERDP3_RDPECAM=y
4648
# BR2_PACKAGE_FREERDP3_CLIENT_WL is not set
4749
BR2_PACKAGE_VIRT_VIEWER=y
4850
BR2_PACKAGE_WEBKITGTK=y

buildroot-external/package/freerdp3/Config.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,19 @@ config BR2_PACKAGE_FREERDP3_CLIENT_WL
6666
depends on BR2_PACKAGE_WAYLAND
6767
select BR2_PACKAGE_LIBXKBCOMMON
6868

69+
config BR2_PACKAGE_FREERDP3_RDPECAM
70+
bool "RDPECAM camera redirection"
71+
default y
72+
depends on BR2_PACKAGE_LIBUSB
73+
depends on BR2_PACKAGE_LIBV4L
74+
help
75+
Enable [MS-RDPECAM] camera redirection support for FreeRDP3.
76+
77+
This enables the rdpecam channel and the rdpecam client module.
78+
79+
comment "RDPECAM camera redirection needs libusb and libv4l"
80+
depends on !BR2_PACKAGE_LIBUSB || !BR2_PACKAGE_LIBV4L
81+
6982
endif
7083

7184
comment "freerdp3 needs a toolchain w/ wchar, dynamic library, threads, C++"

buildroot-external/package/freerdp3/freerdp3.mk

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ FREERDP3_INSTALL_STAGING = YES
1414

1515
FREERDP3_CONF_OPTS = \
1616
-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -Wno-incompatible-pointer-types" \
17-
-DWITH_MANPAGES=OFF -Wno-dev -DWITH_GSTREAMER_0_10=OFF
17+
-DWITH_MANPAGES=OFF -Wno-dev
1818

1919
ifeq ($(BR2_PACKAGE_FREERDP3_GSTREAMER1),y)
2020
FREERDP3_CONF_OPTS += -DWITH_GSTREAMER_1_0=ON
@@ -65,10 +65,10 @@ endif
6565

6666
# For the systemd journal
6767
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
68-
FREERDP3_CONF_OPTS += -DWITH_LIBSYSTEMD=ON
68+
FREERDP3_CONF_OPTS += -DWITH_SYSTEMD=ON
6969
FREERDP3_DEPENDENCIES += systemd
7070
else
71-
FREERDP3_CONF_OPTS += -DWITH_LIBSYSTEMD=OFF
71+
FREERDP3_CONF_OPTS += -DWITH_SYSTEMD=OFF
7272
endif
7373

7474
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
@@ -83,10 +83,6 @@ else
8383
FREERDP3_CONF_OPTS += -DWITH_SSE2=OFF
8484
endif
8585

86-
ifeq ($(BR2_arm)$(BR2_armeb),y)
87-
FREERDP3_CONF_OPTS += -DARM_FP_ABI=$(GCC_TARGET_FLOAT_ABI)
88-
endif
89-
9086
#---------------------------------------
9187
# Enabling server and/or client
9288

@@ -214,6 +210,17 @@ else
214210
FREERDP3_CONF_OPTS += -DWITH_WAYLAND=OFF
215211
endif
216212

213+
ifeq ($(BR2_PACKAGE_FREERDP3_RDPECAM),y)
214+
FREERDP3_CONF_OPTS += \
215+
-DCHANNEL_RDPECAM=ON \
216+
-DCHANNEL_RDPECAM_CLIENT=ON
217+
FREERDP3_DEPENDENCIES += libv4l
218+
else
219+
FREERDP3_CONF_OPTS += \
220+
-DCHANNEL_RDPECAM=OFF \
221+
-DCHANNEL_RDPECAM_CLIENT=OFF
222+
endif
223+
217224
#---------------------------------------
218225
# Post-install hooks to cleanup and install missing stuff
219226

0 commit comments

Comments
 (0)