diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 6395b4a14c..9bda19ba91 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -20,13 +20,13 @@ # Mediacenter to use (kodi / no) MEDIACENTER="kodi" -# Skins to install (Confluence) +# Skins to install (Estuary) # Space separated list is supported, -# e.g. SKINS="Confluence" - SKINS="Confluence" +# e.g. SKINS="Estuary" + SKINS="Estuary" -# Default Skin (Confluence) - SKIN_DEFAULT="Confluence" +# Default Skin (Estuary) + SKIN_DEFAULT="Estuary" # install extra subtitle Fonts for KODI (yes / no) KODI_EXTRA_FONTS="yes" diff --git a/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch deleted file mode 100644 index 3a01defe63..0000000000 --- a/packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/720p/IncludesHomeMenuItems.xml 2012-07-22 21:56:07.000000000 +0400 -+++ b/720p/IncludesHomeMenuItems.xml 2012-09-13 23:34:16.975470148 +0400 -@@ -189,6 +189,11 @@ - - ActivateWindow(Settings) - -+ -+ ButtonHomeSubCommonValues -+ -+ RunAddon(service.libreelec.settings) -+ - - ButtonHomeSubCommonValues - diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk similarity index 67% rename from packages/mediacenter/kodi-theme-Confluence/package.mk rename to packages/mediacenter/kodi-theme-Estuary/package.mk index 54c10304ae..ac37780238 100644 --- a/packages/mediacenter/kodi-theme-Confluence/package.mk +++ b/packages/mediacenter/kodi-theme-Estuary/package.mk @@ -16,8 +16,8 @@ # along with OpenELEC. If not, see . ################################################################################ -PKG_NAME="kodi-theme-Confluence" -PKG_VERSION="16.1-rc2-a7caa16" +PKG_NAME="kodi-theme-Estuary" +PKG_VERSION="17.0-alpha1-2c72ac9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -26,7 +26,7 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain kodi:host" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" -PKG_SHORTDESC="kodi-theme-Confluence: Kodi Mediacenter default theme" +PKG_SHORTDESC="kodi-theme-Estuary: Kodi Mediacenter default theme" PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center and XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." PKG_IS_ADDON="no" @@ -37,19 +37,28 @@ make_target() { -output Textures.xbt \ -dupecheck \ -use_none + + for theme in themes/*; do + TexturePacker -input $theme \ + -output $(basename $theme).xbt \ + -dupecheck + done } makeinstall_target() { - mkdir -p $INSTALL/usr/share/kodi/addons/skin.confluence - cp -R */ $INSTALL/usr/share/kodi/addons/skin.confluence - cp *.txt $INSTALL/usr/share/kodi/addons/skin.confluence - cp *.xml $INSTALL/usr/share/kodi/addons/skin.confluence - cp *.png $INSTALL/usr/share/kodi/addons/skin.confluence - rm -rf $INSTALL/usr/share/kodi/addons/skin.confluence/media + mkdir -p $INSTALL/usr/share/kodi/addons/skin.estuary + cp -R */ $INSTALL/usr/share/kodi/addons/skin.estuary + cp *.txt $INSTALL/usr/share/kodi/addons/skin.estuary + cp *.xml $INSTALL/usr/share/kodi/addons/skin.estuary + cp *.png $INSTALL/usr/share/kodi/addons/skin.estuary + rm -rf $INSTALL/usr/share/kodi/addons/skin.estuary/media - mkdir -p $INSTALL/usr/share/kodi/addons/skin.confluence/media - cp Textures.xbt $INSTALL/usr/share/kodi/addons/skin.confluence/media + mkdir -p $INSTALL/usr/share/kodi/addons/skin.estuary/media + cp Textures.xbt $INSTALL/usr/share/kodi/addons/skin.estuary/media + for theme in themes/*; do + cp $(basename $theme).xbt $INSTALL/usr/share/kodi/addons/skin.estuary/media + done # Rebrand - sed -e "s,@DISTRONAME@,$DISTRONAME,g" -i $INSTALL/usr/share/kodi/addons/skin.confluence/720p/IncludesHomeMenuItems.xml + sed -e "s,@DISTRONAME@,$DISTRONAME,g" -i $INSTALL/usr/share/kodi/addons/skin.estuary/1080i/Home.xml } diff --git a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch new file mode 100644 index 0000000000..c2806c96d5 --- /dev/null +++ b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch @@ -0,0 +1,16 @@ +diff -Naur a/1080i/Home.xml b/1080i/Home.xml +--- a/1080i/Home.xml 2016-03-29 23:29:42.616607010 +0100 ++++ b/1080i/Home.xml 2016-03-29 23:30:49.205150336 +0100 +@@ -1090,6 +1090,12 @@ + weather + !Skin.HasSetting(HomeMenuNoWeatherButton) + ++ ++ ++ RunAddon(service.libreelec.settings) ++ icons/home/libreelec.png ++ libreelec ++ + + + diff --git a/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png new file mode 100644 index 0000000000..489b6d760b Binary files /dev/null and b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png differ diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 4a79ab5a15..e8940338d0 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -296,11 +296,8 @@ makeinstall_host() { pre_build_target() { # adding fake Makefile for stripped skin - mkdir -p $PKG_BUILD/addons/skin.confluence/media - touch $PKG_BUILD/addons/skin.confluence/media/Makefile.in - -# autoreconf - BOOTSTRAP_STANDALONE=1 make -C $PKG_BUILD -f bootstrap.mk + mkdir -p $PKG_BUILD/addons/skin.estuary/media + touch $PKG_BUILD/addons/skin.estuary/media/Makefile.in } pre_configure_target() { @@ -323,8 +320,8 @@ make_target() { SKIN_DIR="skin.`tolower $SKIN_DEFAULT`" # setup default skin inside the sources - sed -i -e "s|skin.confluence|$SKIN_DIR|g" $ROOT/$PKG_BUILD/xbmc/settings/Settings.h - sed -i -e "s|skin.confluence|$SKIN_DIR|g" $ROOT/$PKG_BUILD/system/settings/settings.xml + sed -i -e "s|skin.estuary|$SKIN_DIR|g" $ROOT/$PKG_BUILD/xbmc/system.h + sed -i -e "s|skin.estuary|$SKIN_DIR|g" $ROOT/$PKG_BUILD/system/settings/settings.xml make externals make kodi.bin