aboutsummaryrefslogtreecommitdiff
path: root/package/vlc/vlc.mk
diff options
context:
space:
mode:
authorGravatar Thomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:44 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:54:16 +0200
commitaaffd209fae91a733fe0becb72268f87bf4ea369 (patch)
tree40569895ef8a09c605060e2164d86567a12f9889 /package/vlc/vlc.mk
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
downloadbuildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.gz
buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.bz2
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>
Diffstat (limited to 'package/vlc/vlc.mk')
-rw-r--r--package/vlc/vlc.mk140
1 files changed, 70 insertions, 70 deletions
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index ad9f48503b..0b275f2ba7 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -23,7 +23,7 @@ define VLC_OVERRIDE_PKG_M4
endef
VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4
-VLC_CONF_OPT += \
+VLC_CONF_OPTS += \
--disable-a52 \
--disable-shout \
--disable-twolame \
@@ -46,188 +46,188 @@ VLC_CONF_OPT += \
# Building static and shared doesn't work, so force static off.
ifeq ($(BR2_PREFER_STATIC_LIB),)
-VLC_CONF_OPT += --disable-static
+VLC_CONF_OPTS += --disable-static
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-VCL_CONF_OPT += --enable-altivec
+VCL_CONF_OPTS += --enable-altivec
else
-VLC_CONF_OPT += --disable-altivec
+VLC_CONF_OPTS += --disable-altivec
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-VLC_CONF_OPT += --enable-alsa
+VLC_CONF_OPTS += --enable-alsa
VLC_DEPENDENCIES += alsa-lib
else
-VLC_CONF_OPT += --disable-alsa
+VLC_CONF_OPTS += --disable-alsa
endif
# bonjour support needs avahi-client, which needs avahi-daemon and dbus
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
-VLC_CONF_OPT += --enable-bonjour
+VLC_CONF_OPTS += --enable-bonjour
VLC_DEPENDENCIES += avahi dbus
else
-VLC_CONF_OPT += --disable-bonjour
+VLC_CONF_OPTS += --disable-bonjour
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
-VLC_CONF_OPT += --enable-dbus
+VLC_CONF_OPTS += --enable-dbus
VLC_DEPENDENCIES += dbus
else
-VLC_CONF_OPT += --disable-dbus
+VLC_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-VLC_CONF_OPT += --enable-directfb
+VLC_CONF_OPTS += --enable-directfb
VLC_DEPENDENCIES += directfb
else
-VLC_CONF_OPT += --disable-directfb
+VLC_CONF_OPTS += --disable-directfb
endif
ifeq ($(BR2_PACKAGE_FAAD2),y)
-VLC_CONF_OPT += --enable-faad
+VLC_CONF_OPTS += --enable-faad
VLC_DEPENDENCIES += faad2
else
-VLC_CONF_OPT += --disable-faad
+VLC_CONF_OPTS += --disable-faad
endif
ifeq ($(BR2_PACKAGE_FFMPEG),y)
-VLC_CONF_OPT += --enable-avcodec
+VLC_CONF_OPTS += --enable-avcodec
VLC_DEPENDENCIES += ffmpeg
else
-VLC_CONF_OPT += --disable-avcodec
+VLC_CONF_OPTS += --disable-avcodec
endif
ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
-VLC_CONF_OPT += --enable-postproc
+VLC_CONF_OPTS += --enable-postproc
else
-VLC_CONF_OPT += --disable-postproc
+VLC_CONF_OPTS += --disable-postproc
endif
ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-VLC_CONF_OPT += --enable-swscale
+VLC_CONF_OPTS += --enable-swscale
else
-VLC_CONF_OPT += --disable-swscale
+VLC_CONF_OPTS += --disable-swscale
endif
ifeq ($(BR2_PACKAGE_FLAC),y)
-VLC_CONF_OPT += --enable-flac
+VLC_CONF_OPTS += --enable-flac
VLC_DEPENDENCIES += flac
else
-VLC_CONF_OPT += --disable-flac
+VLC_CONF_OPTS += --disable-flac
endif
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-VLC_CONF_OPT += --enable-glx
+VLC_CONF_OPTS += --enable-glx
VLC_DEPENDENCIES += libgl
else
-VLC_CONF_OPT += --disable-glx
+VLC_CONF_OPTS += --disable-glx
endif
ifeq ($(BR2_PACKAGE_OPUS),y)
-VLC_CONF_OPT += --enable-opus
+VLC_CONF_OPTS += --enable-opus
VLC_DEPENDENCIES += libvorbis opus
else
-VLC_CONF_OPT += --disable-opus
+VLC_CONF_OPTS += --disable-opus
endif
ifeq ($(BR2_PACKAGE_LIBASS),y)
-VLC_CONF_OPT += --enable-libass
+VLC_CONF_OPTS += --enable-libass
VLC_DEPENDENCIES += libass
else
-VLC_CONF_OPT += --disable-libass
+VLC_CONF_OPTS += --disable-libass
endif
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-VLC_CONF_OPT += --enable-libgcrypt
+VLC_CONF_OPTS += --enable-libgcrypt
VLC_DEPENDENCIES += libgcrypt
VLC_CONF_ENV += \
GCRYPT_CONFIG="$(STAGING_DIR)/usr/bin/libgcrypt-config"
else
-VLC_CONF_OPT += --disable-libgcrypt
+VLC_CONF_OPTS += --disable-libgcrypt
endif
ifeq ($(BR2_PACKAGE_LIBMAD),y)
-VLC_CONF_OPT += --enable-mad
+VLC_CONF_OPTS += --enable-mad
VLC_DEPENDENCIES += libmad
else
-VLC_CONF_OPT += --disable-mad
+VLC_CONF_OPTS += --disable-mad
endif
ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
-VLC_CONF_OPT += --enable-mod
+VLC_CONF_OPTS += --enable-mod
VLC_DEPENDENCIES += libmodplug
else
-VLC_CONF_OPT += --disable-mod
+VLC_CONF_OPTS += --disable-mod
endif
ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
-VLC_CONF_OPT += --enable-libmpeg2
+VLC_CONF_OPTS += --enable-libmpeg2
VLC_DEPENDENCIES += libmpeg2
else
-VLC_CONF_OPT += --disable-libmpeg2
+VLC_CONF_OPTS += --disable-libmpeg2
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
-VLC_CONF_OPT += --enable-png
+VLC_CONF_OPTS += --enable-png
VLC_DEPENDENCIES += libpng
else
-VLC_CONF_OPT += --disable-png
+VLC_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
-VLC_CONF_OPT += --enable-svg
+VLC_CONF_OPTS += --enable-svg
VLC_DEPENDENCIES += librsvg
else
-VLC_CONF_OPT += --disable-svg
+VLC_CONF_OPTS += --disable-svg
endif
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
-VLC_CONF_OPT += --enable-theora
+VLC_CONF_OPTS += --enable-theora
VLC_DEPENDENCIES += libtheora
else
-VLC_CONF_OPT += --disable-theora
+VLC_CONF_OPTS += --disable-theora
endif
ifeq ($(BR2_PACKAGE_LIBUPNP),y)
-VLC_CONF_OPT += --enable-upnp
+VLC_CONF_OPTS += --enable-upnp
VLC_DEPENDENCIES += libupnp
else
-VLC_CONF_OPT += --disable-upnp
+VLC_CONF_OPTS += --disable-upnp
endif
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
-VLC_CONF_OPT += --enable-vorbis
+VLC_CONF_OPTS += --enable-vorbis
VLC_DEPENDENCIES += libvorbis
else
-VLC_CONF_OPT += --disable-vorbis
+VLC_CONF_OPTS += --disable-vorbis
endif
ifeq ($(BR2_PACKAGE_LIBV4L),y)
-VLC_CONF_OPT += --enable-v4l2
+VLC_CONF_OPTS += --enable-v4l2
VLC_DEPENDENCIES += libv4l
else
-VLC_CONF_OPT += --disable-v4l2
+VLC_CONF_OPTS += --disable-v4l2
endif
ifeq ($(BR2_PACKAGE_LIBXCB),y)
-VLC_CONF_OPT += --enable-xcb
+VLC_CONF_OPTS += --enable-xcb
VLC_DEPENDENCIES += libxcb
else
-VLC_CONF_OPT += --disable-xcb
+VLC_CONF_OPTS += --disable-xcb
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
-VLC_CONF_OPT += --enable-libxml2
+VLC_CONF_OPTS += --enable-libxml2
VLC_DEPENDENCIES += libxml2
else
-VLC_CONF_OPT += --disable-libxml2
+VLC_CONF_OPTS += --disable-libxml2
endif
# live555 installs a static library only, and vlc tries to link it into a
# shared library - which doesn't work. So only enable live555 if static.
ifeq ($(BR2_PACKAGE_LIVE555)$(BR2_PREFER_STATIC_LIB),yy)
-VLC_CONF_OPT += --enable-live555
+VLC_CONF_OPTS += --enable-live555
VLC_DEPENDENCIES += live555
VLC_CONF_ENV += \
LIVE555_CFLAGS="\
@@ -239,63 +239,63 @@ VLC_CONF_ENV += \
" \
LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"
else
-VLC_CONF_OPT += --disable-live555
+VLC_CONF_OPTS += --disable-live555
endif
ifeq ($(BR2_PACKAGE_LUA),y)
-VLC_CONF_OPT += --enable-lua
+VLC_CONF_OPTS += --enable-lua
VLC_DEPENDENCIES += lua host-lua
else
-VLC_CONF_OPT += --disable-lua
+VLC_CONF_OPTS += --disable-lua
endif
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-VLC_CONF_OPT += --enable-qt
+VLC_CONF_OPTS += --enable-qt
VLC_DEPENDENCIES += qt
else
-VLC_CONF_OPT += --disable-qt
+VLC_CONF_OPTS += --disable-qt
endif
ifeq ($(BR2_PACKAGE_SDL_X11),y)
-VLC_CONF_OPT += --enable-sdl
+VLC_CONF_OPTS += --enable-sdl
VLC_DEPENDENCIES += sdl
else
-VLC_CONF_OPT += --disable-sdl
+VLC_CONF_OPTS += --disable-sdl
endif
ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
-VLC_CONF_OPT += --enable-sdl-image
+VLC_CONF_OPTS += --enable-sdl-image
VLC_DEPENDENCIES += sdl_image
else
-VLC_CONF_OPT += --disable-sdl-image
+VLC_CONF_OPTS += --disable-sdl-image
endif
ifeq ($(BR2_PACKAGE_SPEEX),y)
-VLC_CONF_OPT += --enable-speex
+VLC_CONF_OPTS += --enable-speex
VLC_DEPENDENCIES += speex
else
-VLC_CONF_OPT += --disable-speex
+VLC_CONF_OPTS += --disable-speex
endif
ifeq ($(BR2_PACKAGE_TREMOR),y)
-VLC_CONF_OPT += --enable-tremor
+VLC_CONF_OPTS += --enable-tremor
VLC_DEPENDENCIES += tremor
else
-VLC_CONF_OPT += --disable-tremor
+VLC_CONF_OPTS += --disable-tremor
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-VLC_CONF_OPT += --enable-udev
+VLC_CONF_OPTS += --enable-udev
VLC_DEPENDENCIES += udev
else
-VLC_CONF_OPT += --disable-udev
+VLC_CONF_OPTS += --disable-udev
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-VLC_CONF_OPT += --with-x
+VLC_CONF_OPTS += --with-x
VLC_DEPENDENCIES += xlib_libX11
else
-VLC_CONF_OPT += --without-x
+VLC_CONF_OPTS += --without-x
endif
$(eval $(autotools-package))