kodi-theme-Estuary: add new kodi default theme

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"
+# e.g. SKINS="Estuary"
-  SKINS="Confluence"
+  SKINS="Estuary"
 
-# Default Skin (Confluence)
+# Default Skin (Estuary)
-  SKIN_DEFAULT="Confluence"
+  SKIN_DEFAULT="Estuary"
 
 # install extra subtitle Fonts for KODI (yes / no)
   KODI_EXTRA_FONTS="yes"

packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch

@@ -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 @@
- 			<label>5</label>
- 			<onclick>ActivateWindow(Settings)</onclick>
- 		</control>
-+		<control type="button" id="90120">
-+			<include>ButtonHomeSubCommonValues</include>
-+			<label>@DISTRONAME@</label>
-+			<onclick>RunAddon(service.libreelec.settings)</onclick>
-+		</control>
- 		<control type="button" id="90123">
- 			<include>ButtonHomeSubCommonValues</include>
- 			<label>7</label>

packages/mediacenter/kodi-theme-Estuary/package.mk

@@ -16,8 +16,8 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="kodi-theme-Confluence"
+PKG_NAME="kodi-theme-Estuary"
-PKG_VERSION="16.1-rc2-a7caa16"
+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
+  mkdir -p $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp -R */ $INSTALL/usr/share/kodi/addons/skin.confluence
+    cp -R */ $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp *.txt $INSTALL/usr/share/kodi/addons/skin.confluence
+    cp *.txt $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp *.xml $INSTALL/usr/share/kodi/addons/skin.confluence
+    cp *.xml $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp *.png $INSTALL/usr/share/kodi/addons/skin.confluence
+    cp *.png $INSTALL/usr/share/kodi/addons/skin.estuary
-      rm -rf $INSTALL/usr/share/kodi/addons/skin.confluence/media
+      rm -rf $INSTALL/usr/share/kodi/addons/skin.estuary/media
 
-  mkdir -p $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.confluence/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
 }

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 @@
+ 								<property name="id">weather</property>
+ 								<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
+ 							</item>
++							<item>
++								<label>@DISTRONAME@</label>
++								<onclick>RunAddon(service.libreelec.settings)</onclick>
++								<thumb>icons/home/libreelec.png</thumb>
++								<property name="id">libreelec</property>
++							</item>
+ 						</content>
+ 					</control>
+ 				</control>

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
+  mkdir -p $PKG_BUILD/addons/skin.estuary/media
-  touch $PKG_BUILD/addons/skin.confluence/media/Makefile.in
+  touch $PKG_BUILD/addons/skin.estuary/media/Makefile.in
-
-# autoreconf
-  BOOTSTRAP_STANDALONE=1 make -C $PKG_BUILD -f bootstrap.mk
 }
 
 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.estuary|$SKIN_DIR|g" $ROOT/$PKG_BUILD/xbmc/system.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/system/settings/settings.xml
 
   make externals
   make kodi.bin