summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-11-15 20:29:11 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-12-04 21:41:59 +0100
commit4a9093159f7365b9006bbb31eeae2a4a57a4066f (patch)
treed34b1a968becc4f53d284fa32ae534a7c9b47dac
parent7023f5089d309d33ac0c60b870db915667a26ccc (diff)
kodi needs libiconv in uClibc-ng case
-rw-r--r--package/kodi/Makefile6
-rw-r--r--target/config/Config.in.toolchain2
2 files changed, 4 insertions, 4 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 9e6ea5366..3bb3b9822 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -6,11 +6,11 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
PKG_VERSION:= 17.3
PKG_RELEASE:= 1
-PKG_HASH:= 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1
+PKG_HASH:= ca97d044dc544568f34f067688b783d29f180b5e504814d5d947143b2f7e6d7b
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
PKG_DEPENDS:= python2 libsquish libressl libxz
-PKG_DEPENDS+= libass libmpeg2 libmad
+PKG_DEPENDS+= libass libmpeg2 libmad libiconv
PKG_DEPENDS+= libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo
PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses
@@ -28,7 +28,7 @@ PKG_BUILDDEP+= libgpg-error libvorbis
PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host
PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec
PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo
-PKG_NEEDS:= threads c++ iconv data
+PKG_NEEDS:= threads c++ data
PKG_URL:= http://kodi.tv/
PKG_SITES:= https://github.com/xbmc/xbmc/archive/
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 9750230f5..91aec0b8c 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -36,7 +36,7 @@ config ADK_TARGET_LIBC_WITH_LIBINTL
config ADK_TARGET_LIBC_WITH_LIBICONV
bool "Enable basic libiconv"
- depends on ADK_TARGET_LIB_UCLIBC_NG
+ depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_PACKAGE_LIBICONV
help
Enables uClibc-ng included basic libiconv support.