support kodi.

22 files changed, 427 insertions, 25 deletions

diff --git a/meta-bsp/conf/machine/vuduo2.conf b/meta-bsp/conf/machine/vuduo2.conf
index 9c2c3c3..0dfc7ac 100644
--- a/meta-bsp/conf/machine/vuduo2.conf
+++ b/meta-bsp/conf/machine/vuduo2.conf
@@ -20,7 +20,7 @@ VUPLUS_FEATURES += "wol"
 VUPLUS_FEATURES += "audioeffect"
 VUPLUS_FEATURES += "dvbproxy"
 VUPLUS_FEATURES += "uianimation"
-VUPLUS_FEATURES += "xbmc"
+VUPLUS_FEATURES += "kodi"
 
 IMAGE_UNPACK_PATH = "vuplus/duo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "8192"
diff --git a/meta-bsp/conf/machine/vusolo2.conf b/meta-bsp/conf/machine/vusolo2.conf
index 95181f0..b9fb184 100644
--- a/meta-bsp/conf/machine/vusolo2.conf
+++ b/meta-bsp/conf/machine/vusolo2.conf
@@ -19,7 +19,7 @@ VUPLUS_FEATURES += "transcoding"
 VUPLUS_FEATURES += "audioeffect"
 VUPLUS_FEATURES += "dvbproxy"
 VUPLUS_FEATURES += "uianimation"
-VUPLUS_FEATURES += "xbmc"
+VUPLUS_FEATURES += "kodi"
 
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/conf/machine/vusolo4k.conf b/meta-bsp/conf/machine/vusolo4k.conf
index fe6c154..917b6d7 100644
--- a/meta-bsp/conf/machine/vusolo4k.conf
+++ b/meta-bsp/conf/machine/vusolo4k.conf
@@ -18,7 +18,7 @@ VUPLUS_FEATURES += "transcoding"
 VUPLUS_FEATURES += "audioeffect"
 VUPLUS_FEATURES += "dvbproxy"
 VUPLUS_FEATURES += "uianimation"
-VUPLUS_FEATURES += "xbmc"
+VUPLUS_FEATURES += "kodi"
 VUPLUS_FEATURES += "minitv"
 #VUPLUS_FEATURES += "fastzap"
 VUPLUS_FEATURES += "chromiumos"
diff --git a/meta-bsp/conf/machine/vusolose.conf b/meta-bsp/conf/machine/vusolose.conf
index d7d7e7c..4de3681 100644
--- a/meta-bsp/conf/machine/vusolose.conf
+++ b/meta-bsp/conf/machine/vusolose.conf
@@ -19,7 +19,7 @@ VUPLUS_FEATURES += "webmanual"
 VUPLUS_FEATURES += "audioeffect"
 VUPLUS_FEATURES += "dvbproxy"
 VUPLUS_FEATURES += "uianimation"
-VUPLUS_FEATURES += "xbmc"
+VUPLUS_FEATURES += "kodi"
 
 IMAGE_UNPACK_PATH = "vuplus/solose"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/recipes-multimedia/kodi/enigma2-plugin-extensions-kodi.bb b/meta-bsp/recipes-multimedia/kodi/enigma2-plugin-extensions-kodi.bb
new file mode 100644
index 0000000..8e7153f
--- /dev/null
+++ b/meta-bsp/recipes-multimedia/kodi/enigma2-plugin-extensions-kodi.bb
@@ -0,0 +1,34 @@
+SECTION = "base"
+LICENSE = "CLOSED"
+require conf/license/license-close.inc
+
+SRCDATE = "20160331_r0"
+
+PV = "1.0"
+PR = "${SRCDATE}_r0"
+
+DEPENDS += "kodi"
+RDEPENDS_${PN} += "kodi"
+
+PROVIDES += "enigma2-plugin-extensions-kodi"
+RPROVIDES_${PN} += "enigma2-plugin-extensions-kodi"
+
+SRC_URI = "http://archive.vuplus.com/download/build_support/kodi/e2xbmc-plugin_${SRCDATE}.tar.gz"
+
+S = "${WORKDIR}/plugin"
+
+PLUGIN_DIR="${D}${libdir}/enigma2/python/Plugins/Extensions/Kodi"
+
+do_install() {
+	install -d ${PLUGIN_DIR}
+	install -m 0755 ${S}/*.py ${PLUGIN_DIR}
+	install -m 0755 ${S}/button.png ${PLUGIN_DIR}
+}
+
+do_package_qa() {
+}
+
+FILES_${PN}="/"
+
+SRC_URI[md5sum] = "670c29a6d7fe8cb09545e929196b6734"
+SRC_URI[sha256sum] = "58920ae07aa2f935205b1ea2c37389d5176714cef470a29466974dbf7b59750a"
diff --git a/meta-bsp/recipes-multimedia/kodi/kodi-vuduo2.bb b/meta-bsp/recipes-multimedia/kodi/kodi-vuduo2.bb
new file mode 100644
index 0000000..7480235
--- /dev/null
+++ b/meta-bsp/recipes-multimedia/kodi/kodi-vuduo2.bb
@@ -0,0 +1,11 @@
+require kodi.inc
+
+COMPATIBLE_MACHINE = "^(vuduo2)$"
+
+BUILD_PR = "r0"
+GLPR = "20160331_r0"
+
+EXTRA_OECONF += " --with-platform=vuplus --with-ffmpeg=force_vuplus_mips "
+
+SRC_URI[xbmc-support.md5sum] = "f3db678550f3654fcc8dfbb875678943"
+SRC_URI[xbmc-support.sha256sum] = "758e75966c1ca513bbeb7eaef0d0359207232ba0e7f4f5e2574c146f5e09cab3"
diff --git a/meta-bsp/recipes-multimedia/kodi/kodi-vusolo2.bb b/meta-bsp/recipes-multimedia/kodi/kodi-vusolo2.bb
new file mode 100644
index 0000000..2caf592
--- /dev/null
+++ b/meta-bsp/recipes-multimedia/kodi/kodi-vusolo2.bb
@@ -0,0 +1,11 @@
+require kodi.inc
+
+COMPATIBLE_MACHINE = "^(vusolo2)$"
+
+BUILD_PR = "r0"
+GLPR = "20160331_r0"
+
+EXTRA_OECONF += " --with-platform=vuplus --with-ffmpeg=force_vuplus_mips "
+
+SRC_URI[xbmc-support.md5sum] = "e29a91b185133ec60a59e94a8229d2b4"
+SRC_URI[xbmc-support.sha256sum] = "3c56b7ee890b3e21f378acd79db3752d721de0880b6d763bbd37fa942c2ae2b5"
diff --git a/meta-bsp/recipes-multimedia/kodi/kodi-vusolo4k.bb b/meta-bsp/recipes-multimedia/kodi/kodi-vusolo4k.bb
new file mode 100644
index 0000000..f642370
--- /dev/null
+++ b/meta-bsp/recipes-multimedia/kodi/kodi-vusolo4k.bb
@@ -0,0 +1,11 @@
+require kodi.inc
+
+COMPATIBLE_MACHINE = "^(vusolo4k)$"
+
+BUILD_PR = "r0"
+GLPR = "20160331_r0"
+
+EXTRA_OECONF += " --with-platform=vuplus-arm --with-ffmpeg=force_vuplus_arm "
+
+SRC_URI[xbmc-support.md5sum] = "1ae0c982f8db9625a7f831874f6f0605"
+SRC_URI[xbmc-support.sha256sum] = "1be88ba6d4cbc0a0b1f10c83995132aa9bd5a088cf5b7080e1b0ef90170d96f7"
diff --git a/meta-bsp/recipes-multimedia/kodi/kodi-vusolose.bb b/meta-bsp/recipes-multimedia/kodi/kodi-vusolose.bb
new file mode 100644
index 0000000..1a0204d
--- /dev/null
+++ b/meta-bsp/recipes-multimedia/kodi/kodi-vusolose.bb
@@ -0,0 +1,11 @@
+require kodi.inc
+
+COMPATIBLE_MACHINE = "^(vusolose)$"
+
+BUILD_PR = "r0"
+GLPR = "20160331_r0"
+
+EXTRA_OECONF += " --with-platform=vuplus --with-ffmpeg=force_vuplus_mips "
+
+SRC_URI[xbmc-support.md5sum] = "831014212eed47e36ec084f2e803e2d8"
+SRC_URI[xbmc-support.sha256sum] = "97bfc26a316bcba4b897f81f31179e8861cc123a0b4d8589a2290f3cd7268c1d"
diff --git a/meta-bsp/recipes-multimedia/kodi/kodi.inc b/meta-bsp/recipes-multimedia/kodi/kodi.inc
new file mode 100644
index 0000000..efd004b
--- /dev/null
+++ b/meta-bsp/recipes-multimedia/kodi/kodi.inc
@@ -0,0 +1,208 @@
+SUMMARY = "Kodi Media Center"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46"
+
+DEPENDS = "\
+	libgles \
+	libxslt \
+	libusb1 \
+	libcec \
+	libplist \
+	expat \
+	yajl \
+	gperf-native \
+	fribidi \
+	mpeg2dec \
+	samba \
+	fontconfig \
+	curl \
+	python \
+	libass \
+	libmodplug \
+	libmicrohttpd \
+	wavpack \
+	libmms\
+	cmake-native \
+	libsdl-image \
+	libsdl-mixer \
+	mysql5 \
+	sqlite3 \
+	libmms \
+	faad2 \
+	libcdio \
+	libpcre \
+	boost \
+	lzo \
+	enca \
+	avahi \
+	libsamplerate0 \
+	bzip2 \
+	virtual/libsdl \
+	jasper \
+	zip-native \
+	zlib \
+	libtinyxml \
+	taglib \
+	libbluray \
+	libshairport \
+	librtmp \
+	zlib \
+	libnfs \
+	libxslt \
+	libsquish \
+	libdcadec \
+	libcrossguid \
+"
+
+PROVIDES += "kodi"
+RPROVIDES_${PN} += "kodi"
+
+RDEPENDS_${PN} = "python"
+RDEPENDS_${PN} += "\
+	python-distutils \
+	python-subprocess \
+	python-robotparser \
+	python-mechanize \
+	python-threading \
+	python-shell \
+	python-zlib \
+	python-sqlite3 \
+	python-json \
+	python-xml \
+	python-html \
+	python-netserver \
+	python-misc \
+	python-pygobject \
+	python-pygobject-lib \
+	python-textutils \
+	python-simplejson \
+	python-xmlrpc   \
+	python-pprint \
+	python-difflib \
+	python-email \
+	python-compression \
+	python-compile \
+	python-compiler \
+	python-numbers \
+	nfs-utils-client \
+	libshairport \
+	glibc-gconv-utf-32 \
+	xz \
+	tiff \
+	yajl \
+	libxslt \
+	libupnp \
+	libplist \
+	librtmp \
+	libbluray \
+	libnfs \
+	libtinyxml \
+	alsa-lib \
+	shairplay \
+"
+
+BRANCH = "jarvis_vuplus"
+SRCREV = "528f9f8abfc045b8cf8edea013aaf19fd02dba09"
+
+PV = "16.1.rc2"
+PR = "${BUILD_PR}_${GLPR}_${SRCREV}"
+
+SRC_URI = "\
+	git://code.vuplus.com/git/xbmc.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
+	http://archive.vuplus.com/download/build_support/kodi/xbmc-support_${MACHINE}_${GLPR}.tar.gz;name=xbmc-support \
+"
+
+inherit autotools-brokensep autotools lib_package pkgconfig gettext python-dir
+
+S = "${WORKDIR}/git"
+
+CACHED_CONFIGUREVARS += " \
+ ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
+"
+
+EXTRA_OECONF = " \
+	--enable-gles \
+	--enable-libusb \
+	--enable-airplay \
+	--enable-rtmp	\
+	--enable-optimizations \
+	--disable-optical-drive \
+	--disable-ssh \
+	--disable-x11 \
+	--disable-dbus \
+	--disable-pulse \
+	--disable-gtest \
+	--disable-joystick \
+	--disable-alsa \
+	--disable-lirc \
+	--disable-libcec \
+	--disable-texturepacker \
+	--disable-debug \
+"
+
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
+# for python modules
+export HOST_SYS
+export BUILD_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR
+export PYTHON_DIR
+
+do_configure() {
+	cp -av ${WORKDIR}/xbmc-support/gles_init.* ${WORKDIR}/git/xbmc/windowing/egl/
+	sh bootstrap
+	sed -i 's/-V -qversion//' configure
+	oe_runconf
+}
+
+do_compile_prepend() {
+	for i in $(find . -name "Makefile") ; do
+		sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
+	done
+
+	for i in $(find . -name "*.mak*" -o	-name "Makefile") ; do
+		sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
+	done
+}
+
+INSANE_SKIP_${PN} = "rpaths"
+
+# on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly
+#do_install_append_arm() {
+#	sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop
+#}
+
+do_install_append(){
+	install -d ${D}${bindir}
+	install -m 0755 ${WORKDIR}/xbmc-support/xbmc.helper ${D}${bindir}
+	install -m 0755 ${WORKDIR}/xbmc-support/libxbmc_base.so ${D}${libdir}
+}
+
+do_package_qa(){
+}
+
+FILES_${PN} = "${libdir}/kodi ${libdir}/xbmc"
+FILES_${PN} += "${bindir}/kodi ${bindir}/xbmc ${bindir}/xbmc.helper"
+FILES_${PN} += "${datadir}/icons ${datadir}/kodi ${datadir}/xbmc"
+FILES_${PN} += "${libdir}/libxbmc_base.so"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-bin = "${bindir}/kodi-standalone ${bindir}/xbmc-standalone ${datadir}/xsessions"
+FILES_${PN}-dbg += "${libdir}/kodi/.debug ${libdir}/kodi/*/.debug ${libdir}/kodi/*/*/.debug ${libdir}/kodi/*/*/*/.debug ${datadir}/applications"
+
+# xbmc uses some kind of dlopen() method for libcec so we need to add it manually
+RRECOMMENDS_${PN}_append = " libcec \
+                             python \
+                             python-lang \
+                             python-re \
+                             python-netclient \
+                             libcurl \
+                             "
+RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850"
+
+INSANE_SKIP_${PN} = "already-stripped"
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+
diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index cf2c1a1..26162c1 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -37,7 +37,7 @@ PREFERRED_VERSION_udev ?= "182"
 
 PREFERRED_VERSION_elfutils ?= "0.148"
 
-PREFERRED_VERSION_libmicrohttpd ?= "0.4.6"
+PREFERRED_VERSION_libmicrohttpd ?= "0.9.34"
 PREFERRED_VERSION_libdvdcss ?= "1.2.10"
 PREFERRED_VERSION_taglib ?= "1.8"
 
diff --git a/meta-openvuplus/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb b/meta-openvuplus/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb
deleted file mode 100644
index 0fb9b4e..0000000
--- a/meta-openvuplus/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application."
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5"
-
-DEPENDS = "libgcrypt curl"
-
-SRC_URI = "ftp://ftp.nluug.nl/pub/gnu/libmicrohttpd//libmicrohttpd-${PV}.tar.gz"
-SRC_URI[md5sum] = "61698da6aa04744ea076c327f66fc05a"
-SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a99e371"
-
-inherit autotools lib_package
-
-do_compile_append() {
-	sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc
-}
diff --git a/meta-openvuplus/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bbappend b/meta-openvuplus/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bbappend
deleted file mode 100644
index cdf2ea8..0000000
--- a/meta-openvuplus/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC_URI = "http://mirrors.usc.edu/pub/gnu/libmicrohttpd/libmicrohttpd-0.4.6.tar.gz"
-SRC_URI[md5sum] = "61698da6aa04744ea076c327f66fc05a"
-SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a99e371"
-
diff --git a/meta-openvuplus/recipes-multimedia/libdcadec/libdcadec.bb b/meta-openvuplus/recipes-multimedia/libdcadec/libdcadec.bb
new file mode 100644
index 0000000..e696a49
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/libdcadec/libdcadec.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "dcadec is a free DTS Coherent Acoustics decoder with support for HD extensions."
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c"
+
+PR = "r0"
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/foo86/dcadec.git;protocol=http"
+SRCREV = "0e074384c9569e921f8facfe3863912cdb400596"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	PREFIX=/usr make -C ${S}
+}
+
+do_install() {
+	mkdir -p ${D}/usr/{include,lib/pkgconfig}
+	PREFIX=/usr DESTDIR=${D} make -C ${S} install
+}
+
+do_package_qa() {
+}
+
+FILES_${PN} = "/"
+
diff --git a/meta-openvuplus/recipes-multimedia/libsquish/libsquish.bb b/meta-openvuplus/recipes-multimedia/libsquish/libsquish.bb
new file mode 100644
index 0000000..f31951b
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/libsquish/libsquish.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "libCEC allows you in combination with the right hardware to control your device with your TV remote control. Utilising your existing HDMI cabling"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://README;md5=2a51a796ca47e91336a4d198147ba58f"
+
+PR = "r0"
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/alfonsotames/libsquish.git"
+SRCREV = "a9b44adc6c9d7ae74e23392a83995ba59b436950"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+   mkdir -p ${D}/usr/{include,lib/pkgconfig}
+   INSTALL_DIR=${D}/usr make -C ${S} install
+}
+
+FILES_${PN} = "/"
+
diff --git a/meta-openvuplus/recipes-multimedia/shairplay/shairplay_git.bb b/meta-openvuplus/recipes-multimedia/shairplay/shairplay_git.bb
new file mode 100644
index 0000000..7627efc
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/shairplay/shairplay_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Free portable AirPlay server implementation"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7fff59c88f17faa814f26f26b06a7100"
+
+PR = "r0"
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/juhovh/shairplay.git"
+SRCREV="64d59e3087f829006d091fa0d114efb50972a2bf"
+S = "${WORKDIR}/git"
+
+
+FILES_${PN} += "${libdir}/*.so"
+
diff --git a/meta-openvuplus/recipes-support/libcrossguid/libcrossguid.bb b/meta-openvuplus/recipes-support/libcrossguid/libcrossguid.bb
new file mode 100644
index 0000000..9cc9aa6
--- /dev/null
+++ b/meta-openvuplus/recipes-support/libcrossguid/libcrossguid.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Lightweight cross platform C++ GUID/UUID library"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68"
+
+PR = "r0"
+inherit autotools pkgconfig
+
+SRC_URI = "\
+	git://github.com/graeme-hill/crossguid.git;protocol=http \
+	file://crossguid.pc \
+"
+SRCREV = "8f399e8bd4252be9952f3dfa8199924cc8487ca4"
+
+S = "${WORKDIR}/git"
+
+EXTRA_CXXFLAGS = "-I. -fPIC -Wall -std=c++11 -DGUID_LIBUUID"
+
+do_compile() {
+    cd ${S}
+    ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o guid.o guid.cpp
+    ${AR} rvs libcrossguid.a guid.o
+}
+
+do_install() {
+	mkdir -p ${D}/usr/{include,lib/pkgconfig}
+	install -m 644 ${S}/guid.h ${D}/usr/include
+	install -m 644 ${S}/libcrossguid.a ${D}/usr/lib
+	install -m 644 ${WORKDIR}/crossguid.pc ${D}/usr/lib/pkgconfig
+}
+
+do_package_qa() {
+}
+
+FILES_${PN} = "/"
+
diff --git a/meta-openvuplus/recipes-support/libcrossguid/libcrossguid/crossguid.pc b/meta-openvuplus/recipes-support/libcrossguid/libcrossguid/crossguid.pc
new file mode 100644
index 0000000..5cb2361
--- /dev/null
+++ b/meta-openvuplus/recipes-support/libcrossguid/libcrossguid/crossguid.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: CrossGUID
+Description: Lightweight GUID/UUID library
+Version: 1.0.0
+Libs: -L${libdir} -lcrossguid
+Cflags: -I${includedir}
+
diff --git a/meta-openvuplus/recipes-support/libtinyxml/libtinyxml/tinyxml.pc b/meta-openvuplus/recipes-support/libtinyxml/libtinyxml/tinyxml.pc
new file mode 100644
index 0000000..2234f13
--- /dev/null
+++ b/meta-openvuplus/recipes-support/libtinyxml/libtinyxml/tinyxml.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml
+Description: simple, small, C++ XML parser
+Version: 2.6.2
+Libs: -L${libdir} -ltinyxml
+Cflags: -I${includedir}
+
diff --git a/meta-openvuplus/recipes-support/libtinyxml/libtinyxml_2.6.2.bbappend b/meta-openvuplus/recipes-support/libtinyxml/libtinyxml_2.6.2.bbappend
new file mode 100644
index 0000000..31dac68
--- /dev/null
+++ b/meta-openvuplus/recipes-support/libtinyxml/libtinyxml_2.6.2.bbappend
@@ -0,0 +1,14 @@
+PR_append = "-vuplus0"
+
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+
+SRC_URI += " file://tinyxml.pc "
+
+do_install_append() {
+	mkdir -p ${D}/usr/lib/pkgconfig
+	install -m 644 ${WORKDIR}/tinyxml.pc ${D}/usr/lib/pkgconfig
+}
+
+FILES_${PN} = "/"
+
diff --git a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
index b88db55..c0b7ec5 100644
--- a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
+++ b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
@@ -21,6 +21,9 @@ DEPENDS += " \
 DEPENDS += " \
 	${@base_contains("VUPLUS_FEATURES", "xbmc", "enigma2-plugin-extensions-xbmc", "", d)} \
 "
+DEPENDS += " \
+	${@base_contains("VUPLUS_FEATURES", "kodi", "enigma2-plugin-extensions-kodi", "", d)} \
+"
 
 #BAD_RECOMMENDATIONS += "libnss-mdns wpa-supplicant-passphrase"
 BAD_RECOMMENDATIONS += "libnss-mdns"
diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
index 9206a8a..ddb923c 100644
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
@@ -2,7 +2,7 @@ SUMMARY = "Enigma2 set of packages for Vuplus"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r11"
+PR = "r12"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -71,6 +71,7 @@ RDEPENDS_${PN} += " \
   ${@base_contains("VUPLUS_FEATURES", "audioeffect", "enigma2-plugin-systemplugins-audioeffect", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "uianimation", "enigma2-plugin-systemplugins-animationsetup", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "xbmc", "enigma2-plugin-extensions-xbmc", "", d)} \
+  ${@base_contains("VUPLUS_FEATURES", "kodi", "enigma2-plugin-extensions-kodi", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "minitv", "enigma2-plugin-extensions-minitv", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "chromiumos", "enigma2-plugin-extensions-chromium", "", d)} \
 "