summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-06-10 13:58:17 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-06-13 14:50:47 -0500
commit8ce72cebbee4664c5ff5c309e85a20b9c3623f3b (patch)
tree970e6982294062254f2344831e4391c9ba828c8c
parent61a14ddd401d218e65e71f7f4b5382c3f05d8c0e (diff)
add libiconv for kodi when uClibc-ng is choosen
-rw-r--r--package/kodi/Makefile5
-rw-r--r--package/libiconv/Makefile27
2 files changed, 31 insertions, 1 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index e08d8759d..a2a14ee5f 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= ff25ea118e3580bb1ebcbb7c450ed933da1782be
PKG_RELEASE:= 4
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
-PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv libsquish
+PKG_DEPENDS:= boost python2 libstdcxx libsquish
PKG_DEPENDS+= libass libmpeg2 libmad libdbus libglew mesa
PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libbz2 libtiff liblzo libopenssl libnettle
@@ -64,6 +64,9 @@ PKGFD_WITH_WEBSERVER:= enable internal webserver support
# libiconv missing, freescale GL libraries linked against glibc
PKG_LIBC_DEPENDS:= glibc uclibc-ng
+PKG_BUILDDEP_UCLIBC:= libiconv
+PKG_BUILDDEP_UCLIBC_NG:=libiconv
+
PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs
PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc
PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
new file mode 100644
index 000000000..a5ef2c997
--- /dev/null
+++ b/package/libiconv/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:= libiconv
+PKG_VERSION:= 1.14
+PKG_RELEASE:= 1
+PKG_HASH:= e34509b1623cec449dfeb73d7ce9c6c6
+PKG_DESCR:= character set conversion library
+PKG_SECTION:= libs/misc
+PKG_URL:= http://www.gnu.org/software/libiconv/
+PKG_SITES:= $(MASTER_SITE_GNU:=libiconv/)
+PKG_OPTS:= dev
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+libiconv-install:
+ $(INSTALL_DIR) $(IDIR_LIBICONV)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
+ $(CP) $(WRKINST)/usr/lib/libcharset.so* $(IDIR_LIBICONV)/usr/lib/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk