From 2823d1958c524a8ffdb44b58639e8c74dd381dbc Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 18 Apr 2016 00:50:59 -0700 Subject: [PATCH] kodi-theme-Estuary: add new kodi default theme --- distributions/LibreELEC/options | 10 +++--- ...ce-001-add_oe_settings_to_homescreen.patch | 14 -------- .../package.mk | 33 +++++++++++------- ...y-0001-add_oe_settings_to_homescreen.patch | 16 +++++++++ .../sources/media/icons/home/libreelec.png | Bin 0 -> 1262 bytes packages/mediacenter/kodi/package.mk | 11 +++--- 6 files changed, 46 insertions(+), 38 deletions(-) delete mode 100644 packages/mediacenter/kodi-theme-Confluence/patches/kodi-theme-Confluence-001-add_oe_settings_to_homescreen.patch rename packages/mediacenter/{kodi-theme-Confluence => kodi-theme-Estuary}/package.mk (67%) create mode 100644 packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch create mode 100644 packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png 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 0000000000000000000000000000000000000000..489b6d760b385f1b05aeae9d0fa72a52a2081f49 GIT binary patch literal 1262 zcmVO007d60e8sJ4qxeBE_}By{GI2N zOMA%wWp#G&$b9fz8fS&E*C2VUu&@s>_5@!5u_tlLcyb?L#36np$}slCW@*GQ#Mr}Z zCQ{&|#@whgV~8^>6=`dg)%=wKYgG;iW64th00;yKOtU~CY9Ix`49Pf3CL}Nr0H%ND z?1!L60`nq&!I({d`^@nwtLWR_-{wEp z+qO7@BkOPgCZjArzb|E>z0-N*Lz%@`Fy?`s-!x=5a2B$W9BHDI7LD*TH5m)0oC(AH z(PCw0MyiawC}=x`2RI&YnL;pzda$Xcqg5bFLs4vnpSh)2FldD`quV`Mh`9Gtrp4M} z7h(BWFjFB@boDjV#fV+Z@Cv;?|4o~*V6vg#4SiTcCTiCcrtVQ+FCSu~^g)so(Z({C zlB|zK$sxkj;T-^qIvRJ4Bpf0PXPW7VeVEW!)R#rnv0&`b^ny4km>qGMv~UbF>;ire z3r2^go1!3iL>N%gHu|ck-Hiofg{GruWT6pl(~#$MR6gv$ycr9|@AOq`4%V5DMB~UU zRt&=!Td`m~C$vm3k%v0Dkzlr*mJDSEq1%ern{I`}rKVsVI*|%{({)*>7X=X1V!^Dv z-~E-kr2pF|7Cbf!t9Uzt*C@Qv>G8td74oU$f5N_w^+JB)+LdQdETm7TPl}_d12|T^ zpKSz}^vnDpO|Tqfm_Y^z1^`5$Apj2?*rEnj<(nxEQv}qaRjjH?@B8aNJ>?GN7UJqe z`Jgp_`^>DWzg?}LV#V~hB@0+gTV4UoF#+Uha>i`8gH6}=+;&fJ>(SChwt^LP%dQ=A zhI}P*iFM?~`RNZV0S&Z8L)mgubR4BUj>tGmnP$q*LrLaglI37VEjzEEJw4FLX(08o z{?-0>Z%vx?-P6Igyf;V;7Jb0ut=UtR-61&eT`8tkP>JYB_X_ip#tKC%?NwYE@xlK+ zqMKNY)U>Nm8!-$(a7RV?$APNkx+8}vwP_h}&qeZg@2yeX>4E=cPz4~M|1n|$1O+a% zzF7Ks@W}Uc^;$ocS=5s_?oO~=+9aW+Cenf5?lL>I>9)LD=BpDeNR%j1qC|-jCE5@D Y3*Pa1(Pvf$aR2}S07*qoM6N<$f@Pyo-2eap literal 0 HcmV?d00001 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