jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 07:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vlc: fix some configure options

Browse Source 
Fix a large number of incorrect configure options for vlc.

Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc
autobuild failures.

Notice that this change of configure options is caused by our AUTORECONF
picking up a different PKG_WITH_MODULES definition.  If vlc is bumped in the
future and AUTORECONF is turned off, then this needs to be reverted.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Simon Dawson 2014-02-25 20:36:06 +00:00 committed by Peter Korsgaard
parent 1ddf44a3ab
commit 020047730b
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
package/vlc/vlc.mk
View File

@ -14,23 +14,23 @@ VLC_AUTORECONF = YES
VLC_CONF_OPT += \ VLC_CONF_OPT += \
--disable-a52 \ --disable-a52 \
--disable-shout \ --without-shout \
--disable-twolame \ --without-twolame \
--disable-dca \ --without-dca \
--disable-dirac \ --without-dirac \
--disable-schroedinger \ --without-schroedinger \
--disable-quicksync \ --without-quicksync \
--disable-fluidsynth \ --without-fluidsynth \
--disable-zvbi \ --disable-zvbi \
--disable-kate \ --without-kate \
--disable-caca \ --without-caca \
--disable-jack \ --disable-jack \
--disable-samplerate \ --without-samplerate \
--disable-chromaprint \ --without-chromaprint \
--disable-goom \ --without-goom \
--disable-projectm \ --disable-projectm \
--disable-vsxu \ --disable-vsxu \
--disable-mtp \ --without-mtp \
--without-opencv --without-opencv
# Set powerpc altivec appropriately # Set powerpc altivec appropriately
@ -49,10 +49,10 @@ endif
# bonjour support needs avahi-client, which needs avahi-daemon and dbus # bonjour support needs avahi-client, which needs avahi-daemon and dbus
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
VLC_CONF_OPT += --enable-bonjour VLC_CONF_OPT += --with-bonjour
VLC_DEPENDENCIES += avahi dbus VLC_DEPENDENCIES += avahi dbus
else else
VLC_CONF_OPT += --disable-bonjour VLC_CONF_OPT += --without-bonjour
endif endif
ifeq ($(BR2_PACKAGE_DBUS),y) ifeq ($(BR2_PACKAGE_DBUS),y)
@ -96,10 +96,10 @@ VLC_CONF_OPT += --disable-swscale
endif endif
ifeq ($(BR2_PACKAGE_FLAC),y) ifeq ($(BR2_PACKAGE_FLAC),y)
VLC_CONF_OPT += --enable-flac VLC_CONF_OPT += --with-flac
VLC_DEPENDENCIES += flac VLC_DEPENDENCIES += flac
else else
VLC_CONF_OPT += --disable-flac VLC_CONF_OPT += --without-flac
endif endif
ifeq ($(BR2_PACKAGE_MESA3D),y) ifeq ($(BR2_PACKAGE_MESA3D),y)
@ -110,10 +110,10 @@ VLC_CONF_OPT += --disable-glx
endif endif
ifeq ($(BR2_PACKAGE_OPUS),y) ifeq ($(BR2_PACKAGE_OPUS),y)
VLC_CONF_OPT += --enable-opus VLC_CONF_OPT += --with-opus
VLC_DEPENDENCIES += opus VLC_DEPENDENCIES += opus
else else
VLC_CONF_OPT += --disable-opus VLC_CONF_OPT += --without-opus
endif endif
ifeq ($(BR2_PACKAGE_LIBASS),y) ifeq ($(BR2_PACKAGE_LIBASS),y)
@ -147,10 +147,10 @@ VLC_CONF_OPT += --disable-mod
endif endif
ifeq ($(BR2_PACKAGE_LIBMPEG2),y) ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
VLC_CONF_OPT += --enable-libmpeg2 VLC_CONF_OPT += --with-libmpeg2
VLC_DEPENDENCIES += libmpeg2 VLC_DEPENDENCIES += libmpeg2
else else
VLC_CONF_OPT += --disable-libmpeg2 VLC_CONF_OPT += --without-libmpeg2
endif endif
ifeq ($(BR2_PACKAGE_LIBPNG),y) ifeq ($(BR2_PACKAGE_LIBPNG),y)
@ -161,31 +161,31 @@ VLC_CONF_OPT += --disable-png
endif endif
ifeq ($(BR2_PACKAGE_LIBRSVG),y) ifeq ($(BR2_PACKAGE_LIBRSVG),y)
VLC_CONF_OPT += --enable-svg VLC_CONF_OPT += --with-svg
VLC_DEPENDENCIES += librsvg VLC_DEPENDENCIES += librsvg
else else
VLC_CONF_OPT += --disable-svg VLC_CONF_OPT += --without-svg
endif endif
ifeq ($(BR2_PACKAGE_LIBTHEORA),y) ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
VLC_CONF_OPT += --enable-theora VLC_CONF_OPT += --with-theora
VLC_DEPENDENCIES += libtheora VLC_DEPENDENCIES += libtheora
else else
VLC_CONF_OPT += --disable-theora VLC_CONF_OPT += --without-theora
endif endif
ifeq ($(BR2_PACKAGE_LIBUPNP),y) ifeq ($(BR2_PACKAGE_LIBUPNP),y)
VLC_CONF_OPT += --enable-upnp VLC_CONF_OPT += --with-upnp
VLC_DEPENDENCIES += libupnp VLC_DEPENDENCIES += libupnp
else else
VLC_CONF_OPT += --disable-upnp VLC_CONF_OPT += --without-upnp
endif endif
ifeq ($(BR2_PACKAGE_LIBVORBIS),y) ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
VLC_CONF_OPT += --enable-vorbis VLC_CONF_OPT += --with-vorbis
VLC_DEPENDENCIES += libvorbis VLC_DEPENDENCIES += libvorbis
else else
VLC_CONF_OPT += --disable-vorbis VLC_CONF_OPT += --without-vorbis
endif endif
ifeq ($(BR2_PACKAGE_LIBV4L),y) ifeq ($(BR2_PACKAGE_LIBV4L),y)
@ -203,10 +203,10 @@ VLC_CONF_OPT += --disable-xcb
endif endif
ifeq ($(BR2_PACKAGE_LIBXML2),y) ifeq ($(BR2_PACKAGE_LIBXML2),y)
VLC_CONF_OPT += --enable-libxml2 VLC_CONF_OPT += --with-libxml2
VLC_DEPENDENCIES += libxml2 VLC_DEPENDENCIES += libxml2
else else
VLC_CONF_OPT += --disable-libxml2 VLC_CONF_OPT += --without-libxml2
endif endif
ifeq ($(BR2_PACKAGE_LIVE555),y) ifeq ($(BR2_PACKAGE_LIVE555),y)
@ -254,10 +254,10 @@ VLC_CONF_OPT += --disable-sdl-image
endif endif
ifeq ($(BR2_PACKAGE_SPEEX),y) ifeq ($(BR2_PACKAGE_SPEEX),y)
VLC_CONF_OPT += --enable-speex VLC_CONF_OPT += --with-speex
VLC_DEPENDENCIES += speex VLC_DEPENDENCIES += speex
else else
VLC_CONF_OPT += --disable-speex VLC_CONF_OPT += --without-speex
endif endif
ifeq ($(BR2_PACKAGE_TREMOR),y) ifeq ($(BR2_PACKAGE_TREMOR),y)
@ -268,10 +268,10 @@ VLC_CONF_OPT += --disable-tremor
endif endif
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_UDEV),y)
VLC_CONF_OPT += --enable-udev VLC_CONF_OPT += --with-udev
VLC_DEPENDENCIES += udev VLC_DEPENDENCIES += udev
else else
VLC_CONF_OPT += --disable-udev VLC_CONF_OPT += --without-udev
endif endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)