NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/freerdp: drop gstreamer 0.10.x support

Browse Source 
With the upcoming removal of gstreamer 0.10, the logic for building freerdp
with support for it must go as well.

As there is now a single option for gstreamer (1.x) support, convert the
gstreamer support choice to a normal option for simplicity.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Peter Korsgaard 2020-02-07 15:50:23 +01:00 committed by Yann E. MORIN
parent ceb23e88c9
commit 545ffdc185
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Config.in.legacy
View File

@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2020.02"
config BR2_PACKAGE_FREERDP_GSTREAMER
bool "freerdp gstreamer 0.10.x support removed"
select BR2_LEGACY
help
Gstreamer 0.10.x is no longer available in Buildroot, so
neither is the support in freerdp.
config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER
bool "opencv3 gstreamer 0.10.x support removed"
select BR2_LEGACY

24
package/freerdp/Config.in
View File

@ -28,36 +28,18 @@ config BR2_PACKAGE_FREERDP
if BR2_PACKAGE_FREERDP
choice
bool "gstreamer support"
depends on BR2_PACKAGE_XORG7 # xlib-libxrandr
depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1
config BR2_PACKAGE_FREERDP_GSTREAMER1
bool "gstreamer-1.x"
bool "gstreamer support"
depends on BR2_PACKAGE_GSTREAMER1
depends on BR2_PACKAGE_XORG7 # xlib-libxrandr
# gstreamer-1.x dependencies already dependencies of FreeRDP
select BR2_PACKAGE_GST1_PLUGINS_BASE
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
select BR2_PACKAGE_XLIB_LIBXRANDR
config BR2_PACKAGE_FREERDP_GSTREAMER
bool "gstreamer-0.x"
depends on BR2_PACKAGE_GSTREAMER
# gstreamer-0.x dependencies already dependencies of FreeRDP
select BR2_PACKAGE_GST_PLUGINS_BASE
select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_LIBXML2
config BR2_PACKAGE_FREERDP_GSTREAMER_NO
bool "none"
endchoice
comment "gstreamer support needs X.Org"
depends on !BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1
depends on BR2_PACKAGE_GSTREAMER1
config BR2_PACKAGE_FREERDP_SERVER
bool "server"

9
package/freerdp/freerdp.mk
View File

@ -12,14 +12,7 @@ FREERDP_LICENSE_FILES = LICENSE
FREERDP_INSTALL_STAGING = YES
FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev
ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y)
FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON
FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2
else
FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF
endif
FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev -DWITH_GSTREAMER_0_10=OFF
ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER1),y)
FREERDP_CONF_OPTS += -DWITH_GSTREAMER_1_0=ON