diff --git a/config/functions b/config/functions
index 9d5814c12d..f62bd1d9ce 100644
--- a/config/functions
+++ b/config/functions
@@ -426,9 +426,6 @@ show_config() {
config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
- config_message="$config_message\n - Include RSXS Screensaver:\t\t $KODI_SCR_RSXS"
- config_message="$config_message\n - Include ProjectM Visualization:\t $KODI_VIS_PROJECTM"
- config_message="$config_message\n - Include Goom Visualization:\t\t $KODI_VIS_GOOM"
config_message="$config_message\n"
config_message="$config_message\n $dashes$dashes$dashes"
diff --git a/config/graphic b/config/graphic
index e59054088b..a0758352e2 100644
--- a/config/graphic
+++ b/config/graphic
@@ -10,12 +10,6 @@ else
OPENGLES_SUPPORT="yes"
fi
-if [ "$OPENGL_SUPPORT" = no ]; then
- KODI_SCR_RSXS="no"
- KODI_VIS_PROJECTM="no"
- KODI_VIS_GOOM="no"
-fi
-
get_graphicdrivers() {
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options
index a8a6dd7b74..85ad799571 100644
--- a/distributions/OpenELEC/options
+++ b/distributions/OpenELEC/options
@@ -28,25 +28,6 @@
# install extra subtitle Fonts for KODI (yes / no)
KODI_EXTRA_FONTS="yes"
-# build and install 'RSXS' Screensaver (yes / no)
- KODI_SCR_RSXS="yes"
-
-# build and install 'ProjectM' Visualization (yes / no)
- KODI_VIS_PROJECTM="yes"
-
-# build and install 'GOOM' Visualization (yes / no)
- KODI_VIS_GOOM="yes"
-
-# build and install 'Waveform' Visualization (yes / no)
- KODI_VIS_WAVEFORM="yes"
-
-# build and install 'Spectrum' Visualization (yes / no)
- KODI_VIS_SPECTRUM="yes"
-
-# build and install 'FishBMC' Visualization (yes / no)
- # does not work on RPi
- KODI_VIS_FISHBMC="yes"
-
# build and install espeak support (yes / no)
ESPEAK_SUPPORT="yes"
@@ -96,11 +77,6 @@
# build xbmc with optical drive support (yes / no)
KODI_OPTICAL_SUPPORT="yes"
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
- KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
-
# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
KODI_AIRPLAY_SUPPORT="yes"
diff --git a/packages/mediacenter/kodi-pvr-addons/package.mk b/packages/audio/sidplay-libs/package.mk
similarity index 63%
rename from packages/mediacenter/kodi-pvr-addons/package.mk
rename to packages/audio/sidplay-libs/package.mk
index 2b6cfa0707..a78d91813f 100644
--- a/packages/mediacenter/kodi-pvr-addons/package.mk
+++ b/packages/audio/sidplay-libs/package.mk
@@ -16,31 +16,26 @@
# along with OpenELEC. If not, see .
################################################################################
-PKG_NAME="kodi-pvr-addons"
-PKG_VERSION="4854fbe"
+PKG_NAME="sidplay-libs"
+PKG_VERSION="2.1.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain curl kodi"
+PKG_SITE="http://sidplay2.sourceforge.net/"
+PKG_URL=""http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz
+PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
-PKG_SECTION="mediacenter"
-PKG_SHORTDESC="Various PVR addons for Kodi"
-PKG_LONGDESC="This addons allows Kodi PVR to connect to various TV/PVR backends and tuners."
+PKG_SECTION="audio"
+PKG_SHORTDESC="sidplay-libs"
+PKG_LONGDESC="sidplay-libs"
+
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
-PKG_CONFIGURE_OPTS_TARGET="--enable-addons-with-dependencies $PVRADDONS_MYSQL"
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
pre_configure_target() {
- # kodi-pvr-addons fails to build in subdirs
+ # fails to build in subdirs
cd $ROOT/$PKG_BUILD
- rm -rf .$TARGET_NAME
-}
-
-post_makeinstall_target() {
- if [ "$DEBUG" != yes ]; then
- $STRIP $INSTALL/usr/lib/kodi/addons/pvr.*/*.pvr
- fi
+ rm -rf .$TARGET_NAME
}
diff --git a/packages/audio/sidplay-libs/patches/sidplay-libs-01-m4-tests.patch b/packages/audio/sidplay-libs/patches/sidplay-libs-01-m4-tests.patch
new file mode 100644
index 0000000000..88592b0b7c
--- /dev/null
+++ b/packages/audio/sidplay-libs/patches/sidplay-libs-01-m4-tests.patch
@@ -0,0 +1,26 @@
+--- sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4.orig 2004-06-14 22:08:04.000000000 +0200
++++ sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4 2013-11-18 01:23:32.195297135 +0100
+@@ -80,8 +80,8 @@
+ AC_CACHE_VAL(test_cv_have_ios_binary,
+ [
+ AC_TRY_COMPILE(
+- [#include ],
+- [ifstream myTest(ios::in|ios::binary);],
++ [#include ],
++ [std::ifstream myTest(std::ios::in|std::ios::binary);],
+ [test_cv_have_ios_binary=yes],
+ [test_cv_have_ios_binary=no]
+ )
+@@ -105,9 +105,9 @@
+ AC_CACHE_VAL(test_cv_have_ios_openmode,
+ [
+ AC_TRY_COMPILE(
+- [#include
+- #include ],
+- [ios::openmode myTest = ios::in;],
++ [#include
++ #include ],
++ [std::ios_base::openmode myTest = std::ios::in;],
+ [test_cv_have_ios_openmode=yes],
+ [test_cv_have_ios_openmode=no]
+ )
diff --git a/packages/audio/sidplay-libs/patches/sidplay-libs-02-inherited.patch b/packages/audio/sidplay-libs/patches/sidplay-libs-02-inherited.patch
new file mode 100644
index 0000000000..0e86eedf80
--- /dev/null
+++ b/packages/audio/sidplay-libs/patches/sidplay-libs-02-inherited.patch
@@ -0,0 +1,26 @@
+--- sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h.old 2013-11-18 00:40:16.679173012 +0100
++++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h 2013-11-18 00:41:22.451176157 +0100
+@@ -211,16 +211,16 @@
+ {
+ if ( bufferLen >= 1 )
+ {
+- pBufCurrent = ( bufBegin = buffer );
+- bufEnd = bufBegin + bufferLen;
+- bufLen = bufferLen;
+- status = true;
++ this->pBufCurrent = ( this->bufBegin = buffer );
++ this->bufEnd = this->bufBegin + bufferLen;
++ this->bufLen = bufferLen;
++ this->status = true;
+ }
+ else
+ {
+- pBufCurrent = bufBegin = bufEnd = 0;
+- bufLen = 0;
+- status = false;
++ this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
++ this->bufLen = 0;
++ this->status = false;
+ }
+ }
+ };
diff --git a/packages/audio/sidplay-libs/patches/sidplay-libs-03-operator.patch b/packages/audio/sidplay-libs/patches/sidplay-libs-03-operator.patch
new file mode 100644
index 0000000000..88af8ccd34
--- /dev/null
+++ b/packages/audio/sidplay-libs/patches/sidplay-libs-03-operator.patch
@@ -0,0 +1,11 @@
+--- sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h.orig 2013-11-18 00:58:06.111224154 +0100
++++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h 2013-11-18 00:58:28.219225212 +0100
+@@ -33,7 +33,7 @@
+ uint_least16_t length; // usage scan length
+
+ // Copy common parts of basic usage to extended usage.
+- sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage)
++ sid2_usage_t &operator= (const sid_usage_t &usage)
+ {
+ *((sid_usage_t *) this) = usage;
+ return *this;
diff --git a/packages/audio/sidplay-libs/patches/sidplay-libs-04-includes.patch b/packages/audio/sidplay-libs/patches/sidplay-libs-04-includes.patch
new file mode 100644
index 0000000000..ef9cf06017
--- /dev/null
+++ b/packages/audio/sidplay-libs/patches/sidplay-libs-04-includes.patch
@@ -0,0 +1,30 @@
+--- sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp.orig 2004-06-14 22:07:57.000000000 +0200
++++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp 2013-11-18 01:01:50.399234880 +0100
+@@ -55,6 +55,7 @@
+
+ #include "hardsid.h"
+ #include "hardsid-emu.h"
++#include
+
+
+ #ifdef HAVE_MSWINDOWS
+--- sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp.orig 2013-11-18 01:00:07.827229975 +0100
++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp 2013-11-18 01:00:21.563230632 +0100
+@@ -24,6 +24,7 @@
+
+ #include "resid.h"
+ #include "resid-emu.h"
++#include
+
+
+ char ReSID::m_credit[];
+--- sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp.orig 2013-11-18 01:00:39.727231501 +0100
++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp 2013-11-18 01:00:57.415232346 +0100
+@@ -45,6 +45,7 @@
+
+ #include "resid.h"
+ #include "resid-emu.h"
++#include
+
+ // Error String(s)
+ const char *ReSIDBuilder::ERR_FILTER_DEFINITION = "RESID ERROR: Filter definition is not valid (see docs).";
diff --git a/packages/mediacenter/kodi-addon-xvdr/package.mk b/packages/mediacenter/kodi-addon-xvdr/package.mk
deleted file mode 100644
index f70926479c..0000000000
--- a/packages/mediacenter/kodi-addon-xvdr/package.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-PKG_NAME="kodi-addon-xvdr"
-PKG_VERSION="c5eff57"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/pipelka/xbmc-addon-xvdr"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain zlib kodi"
-PKG_PRIORITY="optional"
-PKG_SECTION="mediacenter"
-PKG_SHORTDESC="XVDR addon for Kodi"
-PKG_LONGDESC="This addon allows Kodi PVR to connect to the VDR server."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr/share/kodi"
-
-export CXXFLAGS="$CXXFLAGS -DZLIB_INTERNAL=1"
-
-pre_make_target() {
- # dont build parallel
- MAKEFLAGS=-j1
-}
-
-post_makeinstall_target() {
- if [ "$DEBUG" != yes ]; then
- $STRIP $INSTALL/usr/share/kodi/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr
- fi
-}
diff --git a/packages/mediacenter/kodi-addon-xvdr/patches/kodi-addon-xvdr-xbmc-rebrand.patch b/packages/mediacenter/kodi-addon-xvdr/patches/kodi-addon-xvdr-xbmc-rebrand.patch
deleted file mode 100644
index 518f8bdd76..0000000000
--- a/packages/mediacenter/kodi-addon-xvdr/patches/kodi-addon-xvdr-xbmc-rebrand.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xbmc-addon-xvdr-2bf2563/configure.ac xbmc-addon-xvdr-2bf2563.patch/configure.ac
---- xbmc-addon-xvdr-2bf2563/configure.ac 2014-10-18 22:02:18.000000000 +0200
-+++ xbmc-addon-xvdr-2bf2563.patch/configure.ac 2014-10-20 03:03:20.525526996 +0200
-@@ -6,7 +6,7 @@
- AC_INIT([xbmc-addon-xvdr], [MAJOR.MINOR.MICRO], [alexander.pipelka@gmail.com])
-
- AC_CONFIG_AUX_DIR(autotools)
--AC_PREFIX_DEFAULT(/usr/lib/xbmc)
-+AC_PREFIX_DEFAULT(/usr/lib/kodi)
-
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk
new file mode 100644
index 0000000000..b96d192961
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.modplug"
+PKG_VERSION="c7e8ca8"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform libmodplug"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.modplug"
+PKG_LONGDESC="audiodecoder.modplug"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk
new file mode 100644
index 0000000000..95667c8c50
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.nosefart"
+PKG_VERSION="c77e5a1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.nosefart"
+PKG_LONGDESC="audiodecoder.nosefart"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk
new file mode 100644
index 0000000000..eae00217b2
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk
@@ -0,0 +1,49 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.sidplay"
+PKG_VERSION="f2e7d98"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform sidplay-libs"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.sidplay"
+PKG_LONGDESC="audiodecoder.sidplay"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ -DSIDPLAY2_LIBRARIES=$SYSROOT_PREFIX/usr/lib \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk
new file mode 100644
index 0000000000..39981517c4
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.snesapu"
+PKG_VERSION="9fc775b"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.snesapu"
+PKG_LONGDESC="audiodecoder.snesapu"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk
new file mode 100644
index 0000000000..070ef7dc66
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.stsound"
+PKG_VERSION="775c858"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.stsound"
+PKG_LONGDESC="audiodecoder.stsound"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF $DISTRO_SRC
+ -DCMAKE_INSTALL_PREFIX=/usr $DISTRO_SRC
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi $DISTRO_SRC
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr $DISTRO_SRC
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk
new file mode 100644
index 0000000000..5035ef01ba
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.timidity"
+PKG_VERSION="bf9ff93"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.timidity"
+PKG_LONGDESC="audiodecoder.timidity"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk
new file mode 100644
index 0000000000..8b56777dba
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audiodecoder.vgmstream"
+PKG_VERSION="0c3a51a"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audiodecoder.vgmstream"
+PKG_LONGDESC="audiodecoder.vgmstream"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="kodi.audiodecoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk
new file mode 100644
index 0000000000..903e90b7cf
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk
@@ -0,0 +1,50 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audioencoder.flac"
+PKG_VERSION="84acb14"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform flac"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audioencoder.flac: A audioencoder addon for Kodi"
+PKG_LONGDESC="audioencoder.flac is a audioencoder addon for Kodi"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.audioencoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
+ -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk
new file mode 100644
index 0000000000..199ae28e6b
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk
@@ -0,0 +1,49 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audioencoder.lame"
+PKG_VERSION="3eb59de"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform lame"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audioencoder.lame: A audioencoder addon for Kodi"
+PKG_LONGDESC="audioencoder.lame is a audioencoder addon for Kodi"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.audioencoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ -DLAME_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk
new file mode 100644
index 0000000000..07daaaefdf
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk
@@ -0,0 +1,51 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audioencoder.vorbis"
+PKG_VERSION="d556a68"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform libogg libvorbis"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audioencoder.vorbis: A audioencoder addon for Kodi"
+PKG_LONGDESC="audioencoder.vorbis is a audioencoder addon for Kodi"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.audioencoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
+ -DVORBIS_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
+ -DVORBISENC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk
new file mode 100644
index 0000000000..b766b5139f
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="audioencoder.wav"
+PKG_VERSION="40aaedf"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="audioencoder.wav: A audioencoder addon for Kodi"
+PKG_LONGDESC="audioencoder.wav is a audioencoder addon for Kodi"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.audioencoder"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-audioencoder-vorbis/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
similarity index 73%
rename from packages/mediacenter/kodi-audioencoder-vorbis/package.mk
rename to packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
index 45f241a343..47722ec3a4 100644
--- a/packages/mediacenter/kodi-audioencoder-vorbis/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
@@ -16,29 +16,33 @@
# along with OpenELEC. If not, see .
################################################################################
-PKG_NAME="kodi-audioencoder-vorbis"
-PKG_VERSION="dbf5c62"
+PKG_NAME="pvr.argustv"
+PKG_VERSION="e04d562"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libogg libvorbis kodi"
+PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp"
PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="kodi-audioencoder-vorbis: A audioencoder addon for Kodi"
-PKG_LONGDESC="kodi-audioencoder-vorbis is a audioencoder addon for Kodi"
-
-PKG_IS_ADDON="no"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.argustv"
+PKG_LONGDESC="pvr.argustv"
PKG_AUTORECONF="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
- -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
- -DVORBIS_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
- -DVORBISENC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
..
}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk
new file mode 100644
index 0000000000..ea8f6ed4b4
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.demo"
+PKG_VERSION="b4b7de1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.demo"
+PKG_LONGDESC="pvr.demo"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
new file mode 100644
index 0000000000..5e9fe8ce6f
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.dvblink"
+PKG_VERSION="5d505b8"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform tinyxml2"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.dvblink"
+PKG_LONGDESC="pvr.dvblink"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
new file mode 100644
index 0000000000..2fc2c679bf
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.dvbviewer"
+PKG_VERSION="bd2c01f"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.dvbviewer"
+PKG_LONGDESC="pvr.dvbviewer"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk
new file mode 100644
index 0000000000..c5839686b3
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.filmon"
+PKG_VERSION="413fe9e"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.filmon"
+PKG_LONGDESC="pvr.filmon"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-audioencoder-flac/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
similarity index 74%
rename from packages/mediacenter/kodi-audioencoder-flac/package.mk
rename to packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
index ecc0dfec9c..0f2130fb58 100644
--- a/packages/mediacenter/kodi-audioencoder-flac/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
@@ -16,28 +16,33 @@
# along with OpenELEC. If not, see .
################################################################################
-PKG_NAME="kodi-audioencoder-flac"
-PKG_VERSION="62c2cc8"
+PKG_NAME="pvr.hts"
+PKG_VERSION="4bf1a97"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain flac kodi"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="kodi-audioencoder-flac: A audioencoder addon for Kodi"
-PKG_LONGDESC="kodi-audioencoder-flac is a audioencoder addon for Kodi"
-
-PKG_IS_ADDON="no"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.hts"
+PKG_LONGDESC="pvr.hts"
PKG_AUTORECONF="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
- -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
- -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
..
}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
new file mode 100644
index 0000000000..768b670c39
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.iptvsimple"
+PKG_VERSION="38a72e5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform zlib"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.iptvsimple"
+PKG_LONGDESC="pvr.iptvsimple"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
new file mode 100644
index 0000000000..00ba7f7671
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.mediaportal.tvserver"
+PKG_VERSION="6f8ca82"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.mediaportal.tvserver"
+PKG_LONGDESC="pvr.mediaportal.tvserver"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
new file mode 100644
index 0000000000..66da665c4d
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.mythtv"
+PKG_VERSION="ef9cf41"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.mythtv"
+PKG_LONGDESC="pvr.mythtv"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
new file mode 100644
index 0000000000..f23623d568
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.nextpvr"
+PKG_VERSION="1ecbf87"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.nextpvr"
+PKG_LONGDESC="pvr.nextpvr"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk
new file mode 100644
index 0000000000..be8c6c4d11
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.njoy"
+PKG_VERSION="fcd6294"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.njoy"
+PKG_LONGDESC="pvr.njoy"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
new file mode 100644
index 0000000000..739cedc260
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.pctv"
+PKG_VERSION="0a0924e"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.pctv"
+PKG_LONGDESC="pvr.pctv"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk
new file mode 100644
index 0000000000..5d15d0d1dd
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.vdr.vnsi"
+PKG_VERSION="3a28e39"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.vdr.vnsi"
+PKG_LONGDESC="pvr.vdr.vnsi"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
new file mode 100644
index 0000000000..1cf74f8739
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="pvr.vuplus"
+PKG_VERSION="d6abad3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.vuplus"
+PKG_LONGDESC="pvr.vuplus"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-audioencoder-lame/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
similarity index 74%
rename from packages/mediacenter/kodi-audioencoder-lame/package.mk
rename to packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
index 4eb28b6aa0..ee1984303f 100644
--- a/packages/mediacenter/kodi-audioencoder-lame/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
@@ -16,27 +16,33 @@
# along with OpenELEC. If not, see .
################################################################################
-PKG_NAME="kodi-audioencoder-lame"
-PKG_VERSION="3eb59de"
+PKG_NAME="pvr.wmc"
+PKG_VERSION="cf28e4c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain lame kodi"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="kodi-audioencoder-lame: A audioencoder addon for Kodi"
-PKG_LONGDESC="kodi-audioencoder-lame is a audioencoder addon for Kodi"
-
-PKG_IS_ADDON="no"
+PKG_SECTION=""
+PKG_SHORTDESC="pvr.wmc"
+PKG_LONGDESC="pvr.wmc"
PKG_AUTORECONF="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
- -DLAME_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \
..
}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk
new file mode 100644
index 0000000000..c5500afeea
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk
@@ -0,0 +1,52 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="visualization.fishbmc"
+PKG_VERSION="30ea279b"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="visualization.fishbmc"
+PKG_LONGDESC="visualization.fishbmc"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+if [ "$OPENGL" = "no" ] ; then
+ exit 0
+fi
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk
new file mode 100644
index 0000000000..bb8b2a6595
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="visualization.spectrum"
+PKG_VERSION="d832db91"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="visualization.spectrum"
+PKG_LONGDESC="visualization.spectrum"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk
new file mode 100644
index 0000000000..6fece171ba
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="visualization.waveform"
+PKG_VERSION="9a14455d"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="visualization.waveform"
+PKG_LONGDESC="visualization.waveform"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.pvrclient"
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ ..
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+ cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/mediacenter/kodi-audioencoder-wav/package.mk b/packages/mediacenter/kodi-platform/package.mk
similarity index 81%
rename from packages/mediacenter/kodi-audioencoder-wav/package.mk
rename to packages/mediacenter/kodi-platform/package.mk
index 73e34af328..e512712fd9 100644
--- a/packages/mediacenter/kodi-audioencoder-wav/package.mk
+++ b/packages/mediacenter/kodi-platform/package.mk
@@ -16,18 +16,18 @@
# along with OpenELEC. If not, see .
################################################################################
-PKG_NAME="kodi-audioencoder-wav"
-PKG_VERSION="40aaedf"
+PKG_NAME="kodi-platform"
+PKG_VERSION="48bdd985"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain kodi"
+PKG_DEPENDS_TARGET="toolchain tinyxml kodi"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
-PKG_SHORTDESC="kodi-audioencoder-wav: A audioencoder addon for Kodi"
-PKG_LONGDESC="kodi-audioencoder-wav is a audioencoder addon for Kodi"
+PKG_SHORTDESC="kodi-platform:"
+PKG_LONGDESC="kodi-platform:"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
@@ -35,7 +35,13 @@ PKG_AUTORECONF="no"
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \
-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+ -DBUILD_SHARED_LIBS=0 \
..
}
+
+post_makeinstall_target() {
+ rm -rf $INSTALL/usr/lib/kodiplatform
+}
diff --git a/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch b/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch
new file mode 100644
index 0000000000..4ff62af8bd
--- /dev/null
+++ b/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2765341..1bd4fc2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ endif()
+
+-set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi")
++set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX_TOOLCHAIN}/include/kodi")
+ IF(WIN32)
+ LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows")
+ ENDIF(WIN32)
+diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in
+index 3fc5273..60bdf1b 100644
+--- a/kodiplatform-config.cmake.in
++++ b/kodiplatform-config.cmake.in
+@@ -10,7 +10,7 @@
+ #
+ # propagate these properties from one build system to the other
+ set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@")
+-set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
++set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include)
+ set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
+ set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@")
+ set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@")
diff --git a/packages/textproc/jsoncpp/config/CMakeLists.txt b/packages/textproc/jsoncpp/config/CMakeLists.txt
new file mode 100644
index 0000000000..ffcfd8a5b2
--- /dev/null
+++ b/packages/textproc/jsoncpp/config/CMakeLists.txt
@@ -0,0 +1,15 @@
+project(jsoncpp)
+
+cmake_minimum_required(VERSION 2.6)
+enable_language(CXX)
+
+set(SOURCES src/lib_json/json_reader.cpp
+ src/lib_json/json_value.cpp
+ src/lib_json/json_writer.cpp)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+add_library(jsoncpp ${SOURCES})
+
+install(TARGETS jsoncpp DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(DIRECTORY include/json DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jsoncpp)
diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk
new file mode 100644
index 0000000000..37449f8f67
--- /dev/null
+++ b/packages/textproc/jsoncpp/package.mk
@@ -0,0 +1,47 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC. If not, see .
+################################################################################
+
+PKG_NAME="jsoncpp"
+PKG_VERSION="src-0.5.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="http://garr.dl.sourceforge.net/project/jsoncpp/jsoncpp/0.5.0/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="jsoncpp"
+PKG_LONGDESC="jsoncpp"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+ export CFLAGS="$CFLAGS -fPIC"
+}
+
+pre_build_target() {
+ cp $PKG_DIR/config/CMakeLists.txt $ROOT/$PKG_BUILD
+}
+
+configure_target() {
+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ ..
+}
diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk
index 223578a285..afcca3e91a 100644
--- a/packages/virtual/mediacenter/package.mk
+++ b/packages/virtual/mediacenter/package.mk
@@ -42,17 +42,6 @@ if [ "$MEDIACENTER" = "kodi" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET simplejson"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"
-# Kodi audio encoder addons
- if [ "$KODI_OPTICAL_SUPPORT" = "yes" ]; then
- for audioencoder in $KODI_AUDIOENCODER_ADDONS; do
- PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-audioencoder-$audioencoder"
- done
- fi
-
-# various PVR clients
- PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-pvr-addons"
- PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-addon-xvdr"
-
# other packages
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET OpenELEC-settings"
fi
diff --git a/projects/RPi/options b/projects/RPi/options
index f7ead012ef..1c45910994 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -138,17 +138,5 @@
# build with installer (yes / no)
INSTALLER_SUPPORT="no"
- # build and install 'RSXS' Screensaver (yes / no)
- KODI_SCR_RSXS="no"
-
- # build and install 'ProjectM' Visualization (yes / no)
- KODI_VIS_PROJECTM="no"
-
- # build and install 'GOOM' Visualization (yes / no)
- KODI_VIS_GOOM="no"
-
- # build and install 'FishBMC' Visualization (yes / no)
- KODI_VIS_FISHBMC="no"
-
# kernel image name
KERNEL_NAME="kernel.img"
diff --git a/projects/RPi2/options b/projects/RPi2/options
index aeab274d96..7e13ed0c3b 100644
--- a/projects/RPi2/options
+++ b/projects/RPi2/options
@@ -138,17 +138,5 @@
# build with installer (yes / no)
INSTALLER_SUPPORT="no"
- # build and install 'RSXS' Screensaver (yes / no)
- KODI_SCR_RSXS="no"
-
- # build and install 'ProjectM' Visualization (yes / no)
- KODI_VIS_PROJECTM="no"
-
- # build and install 'GOOM' Visualization (yes / no)
- KODI_VIS_GOOM="no"
-
- # build and install 'FishBMC' Visualization (yes / no)
- KODI_VIS_FISHBMC="no"
-
# kernel image name
KERNEL_NAME="kernel.img"
diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options
index 29bec27cc8..c67d9660e2 100644
--- a/projects/WeTek_Play/options
+++ b/projects/WeTek_Play/options
@@ -145,18 +145,6 @@
# build with installer (yes / no)
INSTALLER_SUPPORT="no"
- # build and install 'RSXS' Screensaver (yes / no)
- KODI_SCR_RSXS="no"
-
- # build and install 'ProjectM' Visualization (yes / no)
- KODI_VIS_PROJECTM="no"
-
- # build and install 'GOOM' Visualization (yes / no)
- KODI_VIS_GOOM="no"
-
- # build and install 'FishBMC' Visualization (yes / no)
- KODI_VIS_FISHBMC="no"
-
# extra build dependeices
EXTRA_DEPS="mkimage"
EXTRA_DEPS_PKG="u-boot-tools"
diff --git a/projects/imx6/options b/projects/imx6/options
index b841297c2a..bb68545a96 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -137,14 +137,3 @@
# build with installer (yes / no)
INSTALLER_SUPPORT="no"
- # build and install 'RSXS' Screensaver (yes / no)
- KODI_SCR_RSXS="no"
-
- # build and install 'ProjectM' Visualization (yes / no)
- KODI_VIS_PROJECTM="no"
-
- # build and install 'GOOM' Visualization (yes / no)
- KODI_VIS_GOOM="no"
-
- # build and install 'FishBMC' Visualization (yes / no)
- KODI_VIS_FISHBMC="no"
diff --git a/tools/mkpkg/mkpkg_kodi-addon-xvdr b/tools/mkpkg/mkpkg_kodi-addon-xvdr
deleted file mode 100755
index 7886023003..0000000000
--- a/tools/mkpkg/mkpkg_kodi-addon-xvdr
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-addon-xvdr.git ]; then
- git clone git://github.com/pipelka/xbmc-addon-xvdr.git kodi-addon-xvdr.git
- fi
-
- cd kodi-addon-xvdr.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-addon-xvdr-$GIT_REV
- cp -R kodi-addon-xvdr.git kodi-addon-xvdr-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-addon-xvdr-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-addon-xvdr-$GIT_REV.tar.xz kodi-addon-xvdr-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-addon-xvdr-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_kodi-audioencoder-flac b/tools/mkpkg/mkpkg_kodi-audioencoder-flac
deleted file mode 100755
index fa1cd0ce29..0000000000
--- a/tools/mkpkg/mkpkg_kodi-audioencoder-flac
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-audioencoder-flac.git ]; then
- git clone https://github.com/xbmc/audioencoder.flac.git -b master kodi-audioencoder-flac.git
- fi
-
- cd kodi-audioencoder-flac.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-audioencoder-flac-$GIT_REV
- cp -R kodi-audioencoder-flac.git kodi-audioencoder-flac-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-audioencoder-flac-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-audioencoder-flac-$GIT_REV.tar.xz kodi-audioencoder-flac-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-audioencoder-flac-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_kodi-audioencoder-lame b/tools/mkpkg/mkpkg_kodi-audioencoder-lame
deleted file mode 100755
index db60e4823e..0000000000
--- a/tools/mkpkg/mkpkg_kodi-audioencoder-lame
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-audioencoder-lame.git ]; then
- git clone https://github.com/xbmc/audioencoder.lame.git -b master kodi-audioencoder-lame.git
- fi
-
- cd kodi-audioencoder-lame.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-audioencoder-lame-$GIT_REV
- cp -R kodi-audioencoder-lame.git kodi-audioencoder-lame-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-audioencoder-lame-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-audioencoder-lame-$GIT_REV.tar.xz kodi-audioencoder-lame-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-audioencoder-lame-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_kodi-audioencoder-vorbis b/tools/mkpkg/mkpkg_kodi-audioencoder-vorbis
deleted file mode 100755
index 823e0dcf42..0000000000
--- a/tools/mkpkg/mkpkg_kodi-audioencoder-vorbis
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-audioencoder-vorbis.git ]; then
- git clone https://github.com/xbmc/audioencoder.vorbis.git -b master kodi-audioencoder-vorbis.git
- fi
-
- cd kodi-audioencoder-vorbis.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-audioencoder-vorbis-$GIT_REV
- cp -R kodi-audioencoder-vorbis.git kodi-audioencoder-vorbis-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-audioencoder-vorbis-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-audioencoder-vorbis-$GIT_REV.tar.xz kodi-audioencoder-vorbis-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-audioencoder-vorbis-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_kodi-audioencoder-wav b/tools/mkpkg/mkpkg_kodi-audioencoder-wav
deleted file mode 100755
index dd740205f5..0000000000
--- a/tools/mkpkg/mkpkg_kodi-audioencoder-wav
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-audioencoder-wav.git ]; then
- git clone https://github.com/xbmc/audioencoder.wav.git -b master kodi-audioencoder-wav.git
- fi
-
- cd kodi-audioencoder-wav.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-audioencoder-wav-$GIT_REV
- cp -R kodi-audioencoder-wav.git kodi-audioencoder-wav-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-audioencoder-wav-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-audioencoder-wav-$GIT_REV.tar.xz kodi-audioencoder-wav-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-audioencoder-wav-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_kodi-pvr-addons b/tools/mkpkg/mkpkg_kodi-pvr-addons
deleted file mode 100755
index 4fb2c0992b..0000000000
--- a/tools/mkpkg/mkpkg_kodi-pvr-addons
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-pvr-addons.git ]; then
- git clone git://github.com/opdenkamp/xbmc-pvr-addons.git -b master kodi-pvr-addons.git
- fi
-
- cd kodi-pvr-addons.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-pvr-addons-$GIT_REV
- cp -R kodi-pvr-addons.git kodi-pvr-addons-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-pvr-addons-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-pvr-addons-$GIT_REV.tar.xz kodi-pvr-addons-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-pvr-addons-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_kodi-pvr-addons-helix b/tools/mkpkg/mkpkg_kodi-pvr-addons-helix
deleted file mode 100755
index fc78376516..0000000000
--- a/tools/mkpkg/mkpkg_kodi-pvr-addons-helix
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This Program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
- if [ ! -d kodi-pvr-addons-helix.git ]; then
- git clone git://github.com/opdenkamp/xbmc-pvr-addons.git -b helix kodi-pvr-addons-helix.git
- fi
-
- cd kodi-pvr-addons-helix.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-pvr-addons-$GIT_REV
- cp -R kodi-pvr-addons-helix.git kodi-pvr-addons-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf kodi-pvr-addons-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf kodi-pvr-addons-$GIT_REV.tar.xz kodi-pvr-addons-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-pvr-addons-$GIT_REV