gst1-plugins-bad: cleanup of build options

Remove non-existing options:
 * --disable-wsap
 * --disable-direct3d
 * --disable-gsettings

Remove options that are already handled later in the .mk file, using
optional dependencies:
 * --disable-rtmp
 * --disable-hls
 * --disable-dash

Rename disable->strp to disable-srtp, which essentially fixes a typo.

Remove liveadder plugin - no longer a separate built option, it's been
merged into audiomixer. Config.in.legacy handling is added for the
removed option.

Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
[Thomas: add Config.in.legacy handling for the liveaddr plugin option,
tweaks to the commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Marcin Nowakowski 2016-06-24 08:12:21 +02:00 committed by Thomas Petazzoni
parent db35305a99
commit 5baa92b092
3 changed files with 9 additions and 18 deletions

View File

@ -145,6 +145,14 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2016.08" comment "Legacy options removed in 2016.08"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
bool "gst1-plugins-bad liveadder plugin removed"
select BR2_LEGACY
select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER
help
The functionality of the liveadder plugin of the
gst1-plugins-bad package has been merged into audiomixer.
config BR2_PACKAGE_LIBFSLVPUWRAP config BR2_PACKAGE_LIBFSLVPUWRAP
bool "libfslvpuwrap has been renamed to imx-vpuwrap" bool "libfslvpuwrap has been renamed to imx-vpuwrap"
select BR2_LEGACY select BR2_LEGACY

View File

@ -312,11 +312,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB
help help
Connects to a VNC server and decodes RFB stream Connects to a VNC server and decodes RFB stream
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
bool "liveadder"
help
Adds multiple live discontinuous streams
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI
bool "midi" bool "midi"
help help

View File

@ -17,9 +17,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
--disable-examples \ --disable-examples \
--disable-valgrind \ --disable-valgrind \
--disable-directsound \ --disable-directsound \
--disable-wsapi \
--disable-direct3d \ --disable-direct3d \
--disable-direct3d9 \
--disable-winks \ --disable-winks \
--disable-android_media \ --disable-android_media \
--disable-apple_media \ --disable-apple_media \
@ -35,7 +33,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
--disable-voamrwbenc \ --disable-voamrwbenc \
--disable-bs2b \ --disable-bs2b \
--disable-chromaprint \ --disable-chromaprint \
--disable-dash \
--disable-dc1394 \ --disable-dc1394 \
--disable-dts \ --disable-dts \
--disable-resindvd \ --disable-resindvd \
@ -47,7 +44,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
--disable-ladspa \ --disable-ladspa \
--disable-lv2 \ --disable-lv2 \
--disable-libde265 \ --disable-libde265 \
--disable-strp \ --disable-srtp \
--disable-linsys \ --disable-linsys \
--disable-modplug \ --disable-modplug \
--disable-mimic \ --disable-mimic \
@ -69,11 +66,8 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
--disable-vdpau \ --disable-vdpau \
--disable-schro \ --disable-schro \
--disable-zbar \ --disable-zbar \
--disable-rtmp \
--disable-spandsp \ --disable-spandsp \
--disable-gsettings \
--disable-sndio \ --disable-sndio \
--disable-hls \
--disable-gtk3 \ --disable-gtk3 \
--disable-qt --disable-qt
@ -376,12 +370,6 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb
endif endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-liveadder
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-liveadder
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi
else else