Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
config BR2_PACKAGE_MINIDLNA
|
||||
bool "minidlna"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_WCHAR # flac
|
||||
depends on BR2_USE_MMU # fork
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FLAC
|
||||
select BR2_PACKAGE_LIBVORBIS # selects libogg
|
||||
@@ -12,14 +14,14 @@ config BR2_PACKAGE_MINIDLNA
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
depends on !BR2_nios2 # ffmpeg
|
||||
help
|
||||
MiniDLNA (aka ReadyDLNA) is server software with the aim of being
|
||||
fully compliant with DLNA/UPnP-AV clients.
|
||||
|
||||
http://minidlna.sourceforge.net/
|
||||
|
||||
comment "minidlna needs a toolchain w/ threads, wchar"
|
||||
comment "minidlna needs a toolchain w/ dynamic library, threads, wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_nios2
|
||||
depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
|
||||
BR2_STATIC_LIBS
|
||||
|
||||
@@ -14,17 +14,8 @@ MINIDLNA_DEPENDENCIES = \
|
||||
ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \
|
||||
host-xutil_makedepend
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
# the configure script / Makefile forgets to link with some of the dependent
|
||||
# libraries breaking static linking, so help it along
|
||||
MINIDLNA_PKGCONFIG_DEPS = libavcodec libexif vorbis sqlite3
|
||||
MINIDLNA_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs $(MINIDLNA_PKGCONFIG_DEPS)`
|
||||
MINIDLNA_STATIC_LIBS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)
|
||||
MINIDLNA_CONF_ENV += LIBS="$(MINIDLNA_STATIC_LIBS)"
|
||||
else
|
||||
MINIDLNA_CONF_OPTS = \
|
||||
--disable-static
|
||||
endif
|
||||
|
||||
define MINIDLNA_INSTALL_CONF
|
||||
$(INSTALL) -D -m 644 $(@D)/minidlna.conf $(TARGET_DIR)/etc/minidlna.conf
|
||||
|
||||
Reference in New Issue
Block a user