Bump buildroot to 2019.02
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VLC_VERSION = 2.2.8
|
||||
VLC_VERSION = 3.0.6
|
||||
VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
|
||||
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
|
||||
VLC_LICENSE = GPL-2.0+, LGPL-2.1+
|
||||
@@ -17,11 +17,15 @@ VLC_INSTALL_STAGING = YES
|
||||
|
||||
# gcc bug internal compiler error: in merge_overlapping_regs, at
|
||||
# regrename.c:304. This bug is fixed since gcc 6.
|
||||
ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
|
||||
ifeq ($(BR2_microblaze)$(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
|
||||
VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
|
||||
VLC_CONF_OPTS += --disable-optimizations
|
||||
endif
|
||||
|
||||
# configure check for -fstack-protector-strong is broken
|
||||
VLC_CONF_ENV += \
|
||||
ax_cv_check_cflags___fstack_protector_strong=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
|
||||
|
||||
# VLC defines two autoconf functions which are also defined by our own pkg.m4
|
||||
# from pkgconf. Unfortunately, they are defined in a different way: VLC adds
|
||||
# --enable- options, but pkg.m4 adds --with- options. To make sure we use
|
||||
@@ -34,33 +38,53 @@ endef
|
||||
VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4
|
||||
|
||||
VLC_CONF_OPTS += \
|
||||
--disable-gles1 \
|
||||
--disable-a52 \
|
||||
--disable-shout \
|
||||
--disable-twolame \
|
||||
--disable-dca \
|
||||
--disable-schroedinger \
|
||||
--disable-fluidsynth \
|
||||
--disable-zvbi \
|
||||
--disable-kate \
|
||||
--disable-caca \
|
||||
--disable-jack \
|
||||
--disable-samplerate \
|
||||
--disable-chromaprint \
|
||||
--disable-goom \
|
||||
--disable-projectm \
|
||||
--disable-vsxu \
|
||||
--disable-mtp \
|
||||
--disable-mmal-codec \
|
||||
--disable-mmal-vout \
|
||||
--disable-dvdnav \
|
||||
--disable-vpx \
|
||||
--disable-jpeg \
|
||||
--disable-x262 \
|
||||
--disable-x265 \
|
||||
--disable-mfx \
|
||||
--disable-vdpau \
|
||||
--disable-addonmanagermodules \
|
||||
--disable-aom \
|
||||
--disable-aribb25 \
|
||||
--disable-aribsub \
|
||||
--disable-asdcp \
|
||||
--disable-bpg \
|
||||
--disable-caca \
|
||||
--disable-chromaprint \
|
||||
--disable-chromecast \
|
||||
--disable-crystalhd \
|
||||
--disable-dc1394 \
|
||||
--disable-dca \
|
||||
--disable-decklink \
|
||||
--disable-dsm \
|
||||
--disable-dv1394 \
|
||||
--disable-fluidlite \
|
||||
--disable-fluidsynth \
|
||||
--disable-gme \
|
||||
--disable-goom \
|
||||
--disable-jack \
|
||||
--disable-jpeg \
|
||||
--disable-kai \
|
||||
--disable-kate \
|
||||
--disable-kva \
|
||||
--disable-libplacebo \
|
||||
--disable-linsys \
|
||||
--disable-mfx \
|
||||
--disable-microdns \
|
||||
--disable-mmal \
|
||||
--disable-mtp \
|
||||
--disable-notify \
|
||||
--disable-projectm \
|
||||
--disable-schroedinger \
|
||||
--disable-shine \
|
||||
--disable-shout \
|
||||
--disable-sndio \
|
||||
--disable-spatialaudio \
|
||||
--disable-srt \
|
||||
--disable-telx \
|
||||
--disable-tiger \
|
||||
--disable-twolame \
|
||||
--disable-vdpau \
|
||||
--disable-vsxu \
|
||||
--disable-wasapi \
|
||||
--disable-x262 \
|
||||
--disable-zvbi \
|
||||
--enable-run-as-root
|
||||
|
||||
# Uses __atomic_fetch_add_4
|
||||
@@ -92,12 +116,12 @@ else
|
||||
VLC_CONF_OPTS += --disable-alsa
|
||||
endif
|
||||
|
||||
# bonjour support needs avahi-client, which needs avahi-daemon and dbus
|
||||
# avahi support needs avahi-client, which needs avahi-daemon and dbus
|
||||
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
|
||||
VLC_CONF_OPTS += --enable-bonjour
|
||||
VLC_DEPENDENCIES += avahi dbus
|
||||
VLC_CONF_OPTS += --enable-avahi
|
||||
VLC_DEPENDENCIES += avahi
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-bonjour
|
||||
VLC_CONF_OPTS += --disable-avahi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
@@ -107,14 +131,6 @@ else
|
||||
VLC_CONF_OPTS += --disable-dbus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
|
||||
VLC_CONF_OPTS += --enable-directfb
|
||||
VLC_CONF_ENV += ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config
|
||||
VLC_DEPENDENCIES += directfb
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-directfb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FAAD2),y)
|
||||
VLC_CONF_OPTS += --enable-faad
|
||||
VLC_DEPENDENCIES += faad2
|
||||
@@ -149,13 +165,30 @@ VLC_CONF_OPTS += --disable-flac
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREERDP),y)
|
||||
VLC_CONF_OPTS += --enable-freerdp
|
||||
VLC_DEPENDENCIES += freerdp
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-freerdp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
|
||||
VLC_CONF_OPTS += --enable-gst-decode
|
||||
VLC_DEPENDENCIES += gst1-plugins-base
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-gst-decode
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||
VLC_DEPENDENCIES += libgl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
|
||||
VLC_CONF_OPTS += --enable-harfbuzz
|
||||
VLC_DEPENDENCIES += harfbuzz
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-harfbuzz
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
|
||||
VLC_CONF_OPTS += --enable-gles2
|
||||
VLC_DEPENDENCIES += libgles
|
||||
@@ -181,6 +214,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-opus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
|
||||
VLC_CONF_OPTS += --enable-archive
|
||||
VLC_DEPENDENCIES += libarchive
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-archive
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBASS),y)
|
||||
VLC_CONF_OPTS += --enable-libass
|
||||
VLC_DEPENDENCIES += libass
|
||||
@@ -209,6 +249,20 @@ else
|
||||
VLC_CONF_OPTS += --disable-dvbpsi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
|
||||
VLC_CONF_OPTS += --enable-dvdnav
|
||||
VLC_DEPENDENCIES += libdvdnav
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-dvdnav
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
|
||||
VLC_CONF_OPTS += --enable-dvdread
|
||||
VLC_DEPENDENCIES += libdvdread
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-dvdread
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
VLC_CONF_OPTS += --enable-libgcrypt
|
||||
VLC_DEPENDENCIES += libgcrypt
|
||||
@@ -218,6 +272,10 @@ else
|
||||
VLC_CONF_OPTS += --disable-libgcrypt
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN),y)
|
||||
VLC_DEPENDENCIES += libidn
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBMAD),y)
|
||||
VLC_CONF_OPTS += --enable-mad
|
||||
VLC_DEPENDENCIES += libmad
|
||||
@@ -226,10 +284,10 @@ VLC_CONF_OPTS += --disable-mad
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBMATROSKA),y)
|
||||
VLC_CONF_OPTS += --enable-mkv
|
||||
VLC_CONF_OPTS += --enable-matroska
|
||||
VLC_DEPENDENCIES += libmatroska
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-mkv
|
||||
VLC_CONF_OPTS += --disable-matroska
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
|
||||
@@ -246,6 +304,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-libmpeg2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNFS),y)
|
||||
VLC_CONF_OPTS += --enable-nfs
|
||||
VLC_DEPENDENCIES += libnfs
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-nfs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
VLC_CONF_OPTS += --enable-png
|
||||
VLC_DEPENDENCIES += libpng
|
||||
@@ -260,6 +325,27 @@ else
|
||||
VLC_CONF_OPTS += --disable-svg --disable-svgdec
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
|
||||
VLC_CONF_OPTS += --enable-samplerate
|
||||
VLC_DEPENDENCIES += libsamplerate
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-samplerate
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECRET),y)
|
||||
VLC_CONF_OPTS += --enable-secret
|
||||
VLC_DEPENDENCIES += libsecret
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-secret
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSOXR),y)
|
||||
VLC_CONF_OPTS += --enable-soxr
|
||||
VLC_DEPENDENCIES += libsoxr
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-soxr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
|
||||
VLC_CONF_OPTS += --enable-sftp
|
||||
VLC_DEPENDENCIES += libssh2
|
||||
@@ -288,6 +374,14 @@ else
|
||||
VLC_CONF_OPTS += --disable-upnp
|
||||
endif
|
||||
|
||||
# libva support depends on ffmpeg
|
||||
ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBVA),yy)
|
||||
VLC_CONF_OPTS += --enable-libva
|
||||
VLC_DEPENDENCIES += libva
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-libva
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y)
|
||||
VLC_CONF_OPTS += --enable-vnc
|
||||
VLC_DEPENDENCIES += libvncserver
|
||||
@@ -309,6 +403,13 @@ else
|
||||
VLC_CONF_OPTS += --disable-v4l2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVPX),y)
|
||||
VLC_CONF_OPTS += --enable-vpx
|
||||
VLC_DEPENDENCIES += libvpx
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-vpx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXCB),y)
|
||||
VLC_CONF_OPTS += --enable-xcb
|
||||
VLC_DEPENDENCIES += libxcb
|
||||
@@ -326,14 +427,6 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_LIVE555),y)
|
||||
VLC_CONF_OPTS += --enable-live555
|
||||
VLC_DEPENDENCIES += live555
|
||||
VLC_CONF_ENV += \
|
||||
LIVE555_CFLAGS="\
|
||||
-I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \
|
||||
-I$(STAGING_DIR)/usr/include/groupsock \
|
||||
-I$(STAGING_DIR)/usr/include/liveMedia \
|
||||
-I$(STAGING_DIR)/usr/include/UsageEnvironment \
|
||||
" \
|
||||
LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-live555
|
||||
endif
|
||||
@@ -349,6 +442,13 @@ ifeq ($(BR2_PACKAGE_MINIZIP),y)
|
||||
VLC_DEPENDENCIES += minizip
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MPG123),y)
|
||||
VLC_CONF_OPTS += --enable-mpg123
|
||||
VLC_DEPENDENCIES += mpg123
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-mpg123
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MUSEPACK),y)
|
||||
VLC_CONF_OPTS += --enable-mpc
|
||||
VLC_DEPENDENCIES += musepack
|
||||
@@ -356,22 +456,31 @@ else
|
||||
VLC_CONF_OPTS += --disable-mpc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
|
||||
VLC_CONF_OPTS += --enable-qt
|
||||
VLC_CONF_ENV += \
|
||||
ac_cv_path_MOC=$(HOST_DIR)/bin/moc \
|
||||
ac_cv_path_RCC=$(HOST_DIR)/bin/rcc \
|
||||
ac_cv_path_UIC=$(HOST_DIR)/bin/uic
|
||||
VLC_DEPENDENCIES += qt
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
||||
VLC_CONF_OPTS += --enable-ncurses
|
||||
VLC_DEPENDENCIES += ncurses
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-qt
|
||||
VLC_CONF_OPTS += --disable-ncurses
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL_X11),y)
|
||||
VLC_CONF_OPTS += --enable-sdl
|
||||
VLC_DEPENDENCIES += sdl
|
||||
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
|
||||
VLC_CONF_OPTS += --enable-pulse
|
||||
VLC_DEPENDENCIES += pulseaudio
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-sdl
|
||||
VLC_CONF_OPTS += --disable-pulse
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5SVG),yy)
|
||||
VLC_CONF_OPTS += --enable-qt
|
||||
VLC_DEPENDENCIES += qt5base qt5svg
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT)$(BR2_PACKAGE_XLIB_LIBXINERAMA)$(BR2_PACKAGE_XLIB_LIBXPM),yyy)
|
||||
VLC_CONF_OPTS += --enable-skins2
|
||||
VLC_DEPENDENCIES += xlib_libXext xlib_libXinerama xlib_libXpm
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-skins2
|
||||
endif
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-qt --disable-skins2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
|
||||
@@ -381,9 +490,16 @@ else
|
||||
VLC_CONF_OPTS += --disable-sdl-image
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SPEEX),y)
|
||||
ifeq ($(BR2_PACKAGE_SAMBA4),y)
|
||||
VLC_CONF_OPTS += --enable-smbclient
|
||||
VLC_DEPENDENCIES += samba4
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-smbclient
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy)
|
||||
VLC_CONF_OPTS += --enable-speex
|
||||
VLC_DEPENDENCIES += speex
|
||||
VLC_DEPENDENCIES += speex speexdsp
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-speex
|
||||
endif
|
||||
@@ -409,11 +525,29 @@ else
|
||||
VLC_CONF_OPTS += --disable-udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y)
|
||||
VLC_CONF_OPTS += --enable-xcb
|
||||
VLC_DEPENDENCIES += xcb-util-keysyms
|
||||
ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS),yy)
|
||||
VLC_CONF_OPTS += --enable-wayland
|
||||
VLC_DEPENDENCIES += wayland wayland-protocols
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-xcb
|
||||
VLC_CONF_OPTS += --disable-wayland
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_X264),y)
|
||||
VLC_CONF_OPTS += --enable-x264
|
||||
VLC_DEPENDENCIES += x264
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-x264
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_X265),y)
|
||||
VLC_CONF_OPTS += --enable-x265
|
||||
VLC_DEPENDENCIES += x265
|
||||
else
|
||||
VLC_CONF_OPTS += --disable-x265
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y)
|
||||
VLC_DEPENDENCIES += xcb-util-keysyms
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
|
||||
|
||||
Reference in New Issue
Block a user