From 4fd35d88e2ab13a98408e8eb52e3a6dc1fa82149 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 14 Nov 2012 08:57:52 +0100 Subject: [PATCH] script.xbmc.lcd: rename to 'xbmc-addon-lcd', add script to get and package, update to xbmc-addon-lcd-6b08848 Signed-off-by: Stephan Raue --- .../script.xbmc.lcd-dc08f6e-be_quiet.patch | 17 -------- .../install | 4 +- .../{script.xbmc.lcd => xbmc-addon-lcd}/meta | 5 ++- packages/mediacenter/xbmc/meta | 4 ++ tools/mkpkg/mkpkg_xbmc-addon-lcd | 43 +++++++++++++++++++ 5 files changed, 52 insertions(+), 21 deletions(-) delete mode 100644 packages/mediacenter/script.xbmc.lcd/patches/script.xbmc.lcd-dc08f6e-be_quiet.patch rename packages/mediacenter/{script.xbmc.lcd => xbmc-addon-lcd}/install (88%) rename packages/mediacenter/{script.xbmc.lcd => xbmc-addon-lcd}/meta (93%) create mode 100755 tools/mkpkg/mkpkg_xbmc-addon-lcd diff --git a/packages/mediacenter/script.xbmc.lcd/patches/script.xbmc.lcd-dc08f6e-be_quiet.patch b/packages/mediacenter/script.xbmc.lcd/patches/script.xbmc.lcd-dc08f6e-be_quiet.patch deleted file mode 100644 index c2c67082e9..0000000000 --- a/packages/mediacenter/script.xbmc.lcd/patches/script.xbmc.lcd-dc08f6e-be_quiet.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur script.xbmc.lcd-dc08f6e/script.xbmc.lcd/lcdmain.py script.xbmc.lcd-dc08f6e.patch/script.xbmc.lcd/lcdmain.py ---- script.xbmc.lcd-dc08f6e/script.xbmc.lcd/lcdmain.py 2012-01-22 19:49:39.000000000 +0100 -+++ script.xbmc.lcd-dc08f6e.patch/script.xbmc.lcd/lcdmain.py 2012-01-28 19:34:23.222961732 +0100 -@@ -134,11 +134,11 @@ - if not g_failedConnectionNotified: - g_failedConnectionNotified = True - text = __settings__.getLocalizedString(500) -- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) -+# xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) - else: - text = __settings__.getLocalizedString(501) - if not g_failedConnectionNotified: -- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) -+# xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) - g_failedConnectionNotified = True - print "lcd: connected to LCD" - break diff --git a/packages/mediacenter/script.xbmc.lcd/install b/packages/mediacenter/xbmc-addon-lcd/install similarity index 88% rename from packages/mediacenter/script.xbmc.lcd/install rename to packages/mediacenter/xbmc-addon-lcd/install index ce37df5dd3..44469eef30 100755 --- a/packages/mediacenter/script.xbmc.lcd/install +++ b/packages/mediacenter/xbmc-addon-lcd/install @@ -22,5 +22,5 @@ . config/options $1 -mkdir -p $INSTALL/usr/share/xbmc/addons/script.xbmc.lcd - cp -PRf $PKG_BUILD/script.xbmc.lcd/* $INSTALL/usr/share/xbmc/addons/script.xbmc.lcd +mkdir -p $INSTALL/usr/share/xbmc/addons + cp -PRf $PKG_BUILD/script.xbmc.lcd $INSTALL/usr/share/xbmc/addons diff --git a/packages/mediacenter/script.xbmc.lcd/meta b/packages/mediacenter/xbmc-addon-lcd/meta similarity index 93% rename from packages/mediacenter/script.xbmc.lcd/meta rename to packages/mediacenter/xbmc-addon-lcd/meta index ab8a34b3eb..aa60e07139 100644 --- a/packages/mediacenter/script.xbmc.lcd/meta +++ b/packages/mediacenter/xbmc-addon-lcd/meta @@ -18,12 +18,13 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="script.xbmc.lcd" -PKG_VERSION="dc08f6e" +PKG_NAME="xbmc-addon-lcd" +PKG_VERSION="6b08848" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/Memphiz/script.xbmc.lcd" +PKG_SITE="https://github.com/herrnst/script.xbmc.lcd" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="Python" PKG_BUILD_DEPENDS="toolchain" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 5f28e674a4..c2c07ace43 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -91,6 +91,10 @@ if [ "$CEC_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS libcec" fi +if [ ! "$LCD_DRIVER" = "none" ]; then + PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-lcd" +fi + if [ "$XBMC_SCR_RSXS" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu" PKG_DEPENDS="$PKG_DEPENDS libXt libXmu" diff --git a/tools/mkpkg/mkpkg_xbmc-addon-lcd b/tools/mkpkg/mkpkg_xbmc-addon-lcd new file mode 100755 index 0000000000..b5deb80e52 --- /dev/null +++ b/tools/mkpkg/mkpkg_xbmc-addon-lcd @@ -0,0 +1,43 @@ +#!/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 xbmc-addon-lcd.git ]; then + git clone git://github.com/herrnst/script.xbmc.lcd.git xbmc-addon-lcd.git + fi + + cd xbmc-addon-lcd.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf xbmc-addon-lcd-$GIT_REV + cp -R xbmc-addon-lcd.git xbmc-addon-lcd-$GIT_REV + +echo "cleaning sources..." + rm -rf xbmc-addon-lcd-$GIT_REV/.git + +echo "packing sources..." + tar cvJf xbmc-addon-lcd-$GIT_REV.tar.xz xbmc-addon-lcd-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf xbmc-addon-lcd-$GIT_REV