packages: rename FOO_CONF_OPT into FOO_CONF_OPTS

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

7 files changed, 376 insertions, 376 deletions

diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 5c4b7543b8..0deb985b73 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -73,6 +73,6 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
 GST_FFMPEG_CONF_EXTRA_OPT += --enable-pic
 endif
 
-GST_FFMPEG_CONF_OPT = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
+GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
 
 $(eval $(autotools-package))
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index 1ae65964ba..8d8b8b4820 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -28,9 +28,9 @@ GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11
-GST_FSL_PLUGINS_CONF_OPT += --enable-x11
+GST_FSL_PLUGINS_CONF_OPTS += --enable-x11
 else
-GST_FSL_PLUGINS_CONF_OPT += --disable-x11
+GST_FSL_PLUGINS_CONF_OPTS += --disable-x11
 endif
 
 # Autoreconf requires an m4 directory to exist
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index 337f7566ff..241399554c 100644
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BAD_VERSION = 0.10.23
 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 
-GST_PLUGINS_BAD_CONF_OPT = \
+GST_PLUGINS_BAD_CONF_OPTS = \
 		--disable-examples
 
 GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer
@@ -18,564 +18,564 @@ GST_PLUGINS_BAD_DEPENDENCIES += orc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
+GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-adpcmdec
+GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-adpcmenc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-adpcmenc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-aiff
+GST_PLUGINS_BAD_CONF_OPTS += --enable-aiff
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-aiff
+GST_PLUGINS_BAD_CONF_OPTS += --disable-aiff
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-asfmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-asfmux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-asfmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-asfmux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
+GST_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-audiovisualizers
+GST_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
+GST_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-autoconvert
+GST_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-bayer
+GST_PLUGINS_BAD_CONF_OPTS += --enable-bayer
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-bayer
+GST_PLUGINS_BAD_CONF_OPTS += --disable-bayer
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin
+GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
+GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
+GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin2
+GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-cdxaparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-cdxaparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
+GST_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+GST_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-colorspace
+GST_PLUGINS_BAD_CONF_OPTS += --enable-colorspace
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-colorspace
+GST_PLUGINS_BAD_CONF_OPTS += --disable-colorspace
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dataurisrc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dataurisrc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dccp
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dccp
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dccp
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dccp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-debugutils
+GST_PLUGINS_BAD_CONF_OPTS += --enable-debugutils
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-debugutils
+GST_PLUGINS_BAD_CONF_OPTS += --disable-debugutils
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-decklink
+GST_PLUGINS_BAD_CONF_OPTS += --enable-decklink
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-decklink
+GST_PLUGINS_BAD_CONF_OPTS += --disable-decklink
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dtmf
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dtmf
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dtmf
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dtmf
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvbsuboverlay
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvdspu
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvdspu
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-faceoverlay
+GST_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-faceoverlay
+GST_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-festival
+GST_PLUGINS_BAD_CONF_OPTS += --enable-festival
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-festival
+GST_PLUGINS_BAD_CONF_OPTS += --disable-festival
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-fieldanalysis
+GST_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
+GST_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-freeze
+GST_PLUGINS_BAD_CONF_OPTS += --enable-freeze
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-freeze
+GST_PLUGINS_BAD_CONF_OPTS += --disable-freeze
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-freeverb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-freeverb
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-freeverb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-freeverb
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-frei0r
+GST_PLUGINS_BAD_CONF_OPTS += --enable-frei0r
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-frei0r
+GST_PLUGINS_BAD_CONF_OPTS += --disable-frei0r
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-gaudieffects
+GST_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-gaudieffects
+GST_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-geometrictransform
+GST_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-geometrictransform
+GST_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-gsettings
+GST_PLUGINS_BAD_CONF_OPTS += --enable-gsettings
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-gsettings
+GST_PLUGINS_BAD_CONF_OPTS += --disable-gsettings
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-h264parse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-h264parse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-h264parse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-h264parse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-hdvparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-hls
+GST_PLUGINS_BAD_CONF_OPTS += --enable-hls
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-hls
+GST_PLUGINS_BAD_CONF_OPTS += --disable-hls
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-id3tag
+GST_PLUGINS_BAD_CONF_OPTS += --enable-id3tag
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-id3tag
+GST_PLUGINS_BAD_CONF_OPTS += --disable-id3tag
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-inter
+GST_PLUGINS_BAD_CONF_OPTS += --enable-inter
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-inter
+GST_PLUGINS_BAD_CONF_OPTS += --disable-inter
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-interlace
+GST_PLUGINS_BAD_CONF_OPTS += --enable-interlace
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-interlace
+GST_PLUGINS_BAD_CONF_OPTS += --disable-interlace
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-ivfparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
+GST_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-jp2kdecimator
+GST_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-jpegformat
+GST_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
+GST_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-legacyresample
+GST_PLUGINS_BAD_CONF_OPTS += --enable-legacyresample
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-legacyresample
+GST_PLUGINS_BAD_CONF_OPTS += --disable-legacyresample
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-librfb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-librfb
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-librfb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-librfb
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-linsys
+GST_PLUGINS_BAD_CONF_OPTS += --enable-linsys
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-linsys
+GST_PLUGINS_BAD_CONF_OPTS += --disable-linsys
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-liveadder
+GST_PLUGINS_BAD_CONF_OPTS += --enable-liveadder
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-liveadder
+GST_PLUGINS_BAD_CONF_OPTS += --disable-liveadder
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegdemux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegdemux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegpsmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsdemux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegtsdemux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegtsmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegvideoparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegvideoparse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegvideoparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegvideoparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mve
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mve
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mve
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mve
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mxf
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mxf
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mxf
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mxf
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-nsf
+GST_PLUGINS_BAD_CONF_OPTS += --enable-nsf
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-nsf
+GST_PLUGINS_BAD_CONF_OPTS += --disable-nsf
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-nuvdemux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-nuvdemux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-patchdetect
+GST_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-patchdetect
+GST_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-pcapparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-pcapparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-pnm
+GST_PLUGINS_BAD_CONF_OPTS += --enable-pnm
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-pnm
+GST_PLUGINS_BAD_CONF_OPTS += --disable-pnm
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rawparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rawparse
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rawparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rawparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-real
+GST_PLUGINS_BAD_CONF_OPTS += --enable-real
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-real
+GST_PLUGINS_BAD_CONF_OPTS += --disable-real
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-removesilence
+GST_PLUGINS_BAD_CONF_OPTS += --enable-removesilence
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-removesilence
+GST_PLUGINS_BAD_CONF_OPTS += --disable-removesilence
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpmux
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rtpmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpmux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rtpvp8
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpvp8
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rtpvp8
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpvp8
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-scaletempo
+GST_PLUGINS_BAD_CONF_OPTS += --enable-scaletempo
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-scaletempo
+GST_PLUGINS_BAD_CONF_OPTS += --disable-scaletempo
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-sdi
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sdi
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sdi
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sdi
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-sdp
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sdp
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sdp
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sdp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-segmentclip
+GST_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-segmentclip
+GST_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-siren
+GST_PLUGINS_BAD_CONF_OPTS += --enable-siren
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-siren
+GST_PLUGINS_BAD_CONF_OPTS += --disable-siren
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-smooth
+GST_PLUGINS_BAD_CONF_OPTS += --enable-smooth
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-smooth
+GST_PLUGINS_BAD_CONF_OPTS += --disable-smooth
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-speed
+GST_PLUGINS_BAD_CONF_OPTS += --enable-speed
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-speed
+GST_PLUGINS_BAD_CONF_OPTS += --disable-speed
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-subenc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-subenc
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-subenc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-subenc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-stereo
+GST_PLUGINS_BAD_CONF_OPTS += --enable-stereo
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-stereo
+GST_PLUGINS_BAD_CONF_OPTS += --disable-stereo
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-tta
+GST_PLUGINS_BAD_CONF_OPTS += --enable-tta
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-tta
+GST_PLUGINS_BAD_CONF_OPTS += --disable-tta
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videofilters
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videofilters
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videofilters
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videofilters
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videomaxrate
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videomaxrate
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videomaxrate
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videomaxrate
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videomeasure
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videoparsers
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videoparsers
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videosignal
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videosignal
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videosignal
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videosignal
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-vmnc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-vmnc
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-vmnc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-vmnc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-y4m
+GST_PLUGINS_BAD_CONF_OPTS += --enable-y4m
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-y4m
+GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m
 endif
 
 # plugins with deps
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-apexsink
+GST_PLUGINS_BAD_CONF_OPTS += --enable-apexsink
 GST_PLUGINS_BAD_DEPENDENCIES += openssl
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-apexsink
+GST_PLUGINS_BAD_CONF_OPTS += --disable-apexsink
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-bz2
+GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2
 GST_PLUGINS_BAD_DEPENDENCIES += bzip2
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-bz2
+GST_PLUGINS_BAD_CONF_OPTS += --disable-bz2
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
+GST_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio
 GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+GST_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-curl
+GST_PLUGINS_BAD_CONF_OPTS += --enable-curl
 GST_PLUGINS_BAD_DEPENDENCIES += libcurl
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-curl
+GST_PLUGINS_BAD_CONF_OPTS += --disable-curl
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-directfb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-directfb
 GST_PLUGINS_BAD_DEPENDENCIES += directfb
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-directfb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-directfb
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dvb
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dvb
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST_PLUGINS_BAD_CONF_OPTS += --enable-faad
 GST_PLUGINS_BAD_DEPENDENCIES += faad2
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-faad
+GST_PLUGINS_BAD_CONF_OPTS += --disable-faad
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-fbdev
+GST_PLUGINS_BAD_CONF_OPTS += --enable-fbdev
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-fbdev
+GST_PLUGINS_BAD_CONF_OPTS += --disable-fbdev
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-libmms
+GST_PLUGINS_BAD_CONF_OPTS += --enable-libmms
 GST_PLUGINS_BAD_DEPENDENCIES += libmms
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-libmms
+GST_PLUGINS_BAD_CONF_OPTS += --disable-libmms
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-musepack
+GST_PLUGINS_BAD_CONF_OPTS += --enable-musepack
 GST_PLUGINS_BAD_DEPENDENCIES += musepack
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-musepack
+GST_PLUGINS_BAD_CONF_OPTS += --disable-musepack
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-neon
+GST_PLUGINS_BAD_CONF_OPTS += --enable-neon
 GST_PLUGINS_BAD_DEPENDENCIES += neon
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-neon
+GST_PLUGINS_BAD_CONF_OPTS += --disable-neon
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-opus
+GST_PLUGINS_BAD_CONF_OPTS += --enable-opus
 GST_PLUGINS_BAD_DEPENDENCIES += opus
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-opus
+GST_PLUGINS_BAD_CONF_OPTS += --disable-opus
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rsvg
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rsvg
 GST_PLUGINS_BAD_DEPENDENCIES += librsvg
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rsvg
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rsvg
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y)
 GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
-GST_PLUGINS_BAD_CONF_OPT += --enable-sdl
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sdl
 GST_PLUGINS_BAD_DEPENDENCIES += sdl
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sdl
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-sndfile
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sndfile
 GST_PLUGINS_BAD_DEPENDENCIES += libsndfile
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sndfile
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sndfile
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
+GST_PLUGINS_BAD_CONF_OPTS += --enable-vcd
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-vcd
+GST_PLUGINS_BAD_CONF_OPTS += --disable-vcd
 endif
 
 $(eval $(autotools-package))
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index 6c7233ba4a..7e461df74e 100644
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -16,7 +16,7 @@ GST_PLUGINS_BASE_CONF_ENV =
 		FT2_CONFIG=/bin/false \
 		ac_cv_header_stdint_t="stdint.h"
 
-GST_PLUGINS_BASE_CONF_OPT = \
+GST_PLUGINS_BASE_CONF_OPTS = \
 		--disable-examples \
 		--disable-oggtest \
 		--disable-vorbistest \
@@ -26,12 +26,12 @@ GST_PLUGINS_BASE_DEPENDENCIES = gstreamer
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
-GST_PLUGINS_BASE_CONF_OPT += \
+GST_PLUGINS_BASE_CONF_OPTS += \
 	--enable-x \
 	--enable-xshm \
 	--enable-xvideo
 else
-GST_PLUGINS_BASE_CONF_OPT += \
+GST_PLUGINS_BASE_CONF_OPTS += \
 	--disable-x \
 	--disable-xshm \
 	--disable-xvideo
@@ -44,150 +44,150 @@ endif
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y)
 GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-alsa
+GST_PLUGINS_BASE_CONF_OPTS += --disable-alsa
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-adder
+GST_PLUGINS_BASE_CONF_OPTS += --enable-adder
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-adder
+GST_PLUGINS_BASE_CONF_OPTS += --disable-adder
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-app
+GST_PLUGINS_BASE_CONF_OPTS += --enable-app
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-app
+GST_PLUGINS_BASE_CONF_OPTS += --disable-app
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audioconvert
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audioconvert
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audiorate
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audiorate
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audiorate
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audiorate
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audioresample
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audioresample
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audioresample
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audioresample
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audiotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-encoding
+GST_PLUGINS_BASE_CONF_OPTS += --enable-encoding
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-encoding
+GST_PLUGINS_BASE_CONF_OPTS += --disable-encoding
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ffmpegcolorspace
+GST_PLUGINS_BASE_CONF_OPTS += --enable-ffmpegcolorspace
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ffmpegcolorspace
+GST_PLUGINS_BASE_CONF_OPTS += --disable-ffmpegcolorspace
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-gdp
+GST_PLUGINS_BASE_CONF_OPTS += --enable-gdp
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-gdp
+GST_PLUGINS_BASE_CONF_OPTS += --disable-gdp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-playback
+GST_PLUGINS_BASE_CONF_OPTS += --enable-playback
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-playback
+GST_PLUGINS_BASE_CONF_OPTS += --disable-playback
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-subparse
+GST_PLUGINS_BASE_CONF_OPTS += --enable-subparse
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-subparse
+GST_PLUGINS_BASE_CONF_OPTS += --disable-subparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-tcp
+GST_PLUGINS_BASE_CONF_OPTS += --enable-tcp
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-tcp
+GST_PLUGINS_BASE_CONF_OPTS += --disable-tcp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-typefind
+GST_PLUGINS_BASE_CONF_OPTS += --enable-typefind
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-typefind
+GST_PLUGINS_BASE_CONF_OPTS += --disable-typefind
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-videotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-videorate
+GST_PLUGINS_BASE_CONF_OPTS += --enable-videorate
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-videorate
+GST_PLUGINS_BASE_CONF_OPTS += --disable-videorate
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-videoscale
+GST_PLUGINS_BASE_CONF_OPTS += --enable-videoscale
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-videoscale
+GST_PLUGINS_BASE_CONF_OPTS += --disable-videoscale
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-volume
+GST_PLUGINS_BASE_CONF_OPTS += --enable-volume
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-volume
+GST_PLUGINS_BASE_CONF_OPTS += --disable-volume
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ogg
+GST_PLUGINS_BASE_CONF_OPTS += --enable-ogg
 GST_PLUGINS_BASE_DEPENDENCIES += libogg
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ogg
+GST_PLUGINS_BASE_CONF_OPTS += --disable-ogg
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-pango
+GST_PLUGINS_BASE_CONF_OPTS += --enable-pango
 GST_PLUGINS_BASE_DEPENDENCIES += pango
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-pango
+GST_PLUGINS_BASE_CONF_OPTS += --disable-pango
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-theora
+GST_PLUGINS_BASE_CONF_OPTS += --enable-theora
 GST_PLUGINS_BASE_DEPENDENCIES += libtheora
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-theora
+GST_PLUGINS_BASE_CONF_OPTS += --disable-theora
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis
 GST_PLUGINS_BASE_DEPENDENCIES += tremor
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+GST_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-vorbis
+GST_PLUGINS_BASE_CONF_OPTS += --enable-vorbis
 GST_PLUGINS_BASE_DEPENDENCIES += libvorbis
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-vorbis
+GST_PLUGINS_BASE_CONF_OPTS += --disable-vorbis
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 GST_PLUGINS_BASE_DEPENDENCIES += zlib
 else
-GST_PLUGINS_BASE_CONF_OPT += --disable-zlib
+GST_PLUGINS_BASE_CONF_OPTS += --disable-zlib
 endif
 
 $(eval $(autotools-package))
diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index c33fd3ad42..4ab5371f3b 100644
--- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_GOOD_VERSION = 0.10.31
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 
-GST_PLUGINS_GOOD_CONF_OPT = \
+GST_PLUGINS_GOOD_CONF_OPTS = \
 		--disable-debug \
 		--disable-examples \
 		--disable-directsound \
@@ -25,369 +25,369 @@ GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
-GST_PLUGINS_GOOD_CONF_OPT += \
+GST_PLUGINS_GOOD_CONF_OPTS += \
 	--enable-x \
 	--enable-xshm \
 	--enable-xvideo
 else
-GST_PLUGINS_GOOD_CONF_OPT += \
+GST_PLUGINS_GOOD_CONF_OPTS += \
 	--disable-x \
 	--disable-xshm \
 	--disable-xvideo
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg
 GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-libpng
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-libpng
 GST_PLUGINS_GOOD_DEPENDENCIES += libpng
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-libpng
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-libpng
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-bz2
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-bz2
 GST_PLUGINS_GOOD_DEPENDENCIES += bzip2
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-bz2
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-bz2
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-zlib
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-zlib
 GST_PLUGINS_GOOD_DEPENDENCIES += zlib
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-zlib
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-alpha
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-alpha
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-alpha
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-alpha
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-apetag
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-apetag
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-apetag
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-apetag
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-audiofx
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-audiofx
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-audioparsers
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-audioparsers
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-auparse
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-auparse
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-auparse
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-auparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-autodetect
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-autodetect
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-avi
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-avi
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-avi
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-avi
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-cutter
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-cutter
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-cutter
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-cutter
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-debugutils
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-debugutils
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-deinterlace
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-deinterlace
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-effectv
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-effectv
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-effectv
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-effectv
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-equalizer
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-equalizer
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flv
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-flv
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flv
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-flv
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flx
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-flx
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flx
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-flx
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-goom
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-goom
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-id3demux
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-id3demux
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-icydemux
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-interleave
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-interleave
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-interleave
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-interleave
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-isomp4
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-isomp4
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-law
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-law
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-law
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-law
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-level
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-level
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-level
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-level
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-matroska
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-matroska
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-matroska
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-matroska
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-monoscope
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-monoscope
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-multifile
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-multifile
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-multifile
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-multifile
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-multipart
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-multipart
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-multipart
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-multipart
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-replaygain
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-replaygain
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-rtp
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtp
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-rtp
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-rtpmanager
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-rtpmanager
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-rtsp
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-smpte
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-smpte
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-smpte
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-smpte
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-spectrum
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-spectrum
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-udp
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-udp
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-udp
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-udp
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videobox
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videobox
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videobox
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videobox
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videocrop
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videocrop
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videomixer
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videomixer
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-wavenc
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-y4m
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-y4m
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-y4m
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-y4m
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-gst_v4l2
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-gst_v4l2
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-annodex
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-annodex
 GST_PLUGINS_GOOD_DEPENDENCIES += libxml2
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-annodex
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-annodex
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-cairo
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-cairo
 GST_PLUGINS_GOOD_DEPENDENCIES += cairo
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-cairo
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-cairo
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flac
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-flac
 GST_PLUGINS_GOOD_DEPENDENCIES += flac
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flac
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-flac
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf
 GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-oss
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-oss
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss4
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss4
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-pulse
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-pulse
 GST_PLUGINS_GOOD_DEPENDENCIES += pulseaudio
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-pulse
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-pulse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-soup
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-soup
 GST_PLUGINS_GOOD_DEPENDENCIES += libsoup
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-soup
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-soup
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-speex
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-speex
 GST_PLUGINS_GOOD_DEPENDENCIES += speex
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-speex
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-speex
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack
 GST_PLUGINS_GOOD_DEPENDENCIES += wavpack
 else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack
 endif
 
 $(eval $(autotools-package))
diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index f3a9acb603..f8ec9801c6 100644
--- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -8,78 +8,78 @@ GST_PLUGINS_UGLY_VERSION = 0.10.19
 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 
-GST_PLUGINS_UGLY_CONF_OPT = \
+GST_PLUGINS_UGLY_CONF_OPTS = \
 		--disable-examples
 
 GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-asfdemux
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-asfdemux
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-dvdlpcmdec
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-dvdlpcmdec
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-dvdsub
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-dvdsub
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-iec958
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-iec958
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-iec958
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-iec958
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mpegaudioparse
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegaudioparse
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mpegaudioparse
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegaudioparse
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mpegstream
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegstream
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mpegstream
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegstream
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-realmedia
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-realmedia
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-synaesthesia
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-synaesthesia
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-synaesthesia
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-synaesthesia
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-lame
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-lame
 GST_PLUGINS_UGLY_DEPENDENCIES += lame
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-lame
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-lame
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mad
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mad
 GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mad
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mad
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mpeg2dec
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec
 GST_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
 else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec
 endif
 
 $(eval $(autotools-package))
diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
index 3f8643d730..8d05c3bf81 100644
--- a/package/gstreamer/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
@@ -19,7 +19,7 @@ ifeq ($(BR2_aarch64),y)
 GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes
 endif
 
-GSTREAMER_CONF_OPT = \
+GSTREAMER_CONF_OPTS = \
 		--disable-examples \
 		--disable-tests \
 		--disable-failing-tests \