mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
Stephan Raue
commit
41ae5f9370
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-iptv"
|
||||
PKG_VERSION="2.0.1"
|
||||
PKG_VERSION="2.0.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,43 +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 <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
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_TARGET="toolchain Python"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="mediacenter"
|
||||
PKG_SHORTDESC="LCD addon for XBMC"
|
||||
PKG_LONGDESC="This addon allows XBM to connect to LCDproc."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
make_target() {
|
||||
: # nothing todo
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p $INSTALL/usr/share/xbmc/addons
|
||||
cp -PRf script.xbmc.lcd $INSTALL/usr/share/xbmc/addons
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
From 70ba5ad47b5bb49216c30d5321948d33dd7a3cfe Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Scheller <d.scheller@gmx.net>
|
||||
Date: Wed, 14 Nov 2012 23:23:26 +0100
|
||||
Subject: [PATCH] testing: disable all connection notifications
|
||||
|
||||
---
|
||||
script.xbmc.lcd/lcdmain.py | 36 ++++++++++++++++++------------------
|
||||
1 file changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/script.xbmc.lcd/lcdmain.py b/script.xbmc.lcd/lcdmain.py
|
||||
index 585f87d..15a7e3f 100644
|
||||
--- a/script.xbmc.lcd/lcdmain.py
|
||||
+++ b/script.xbmc.lcd/lcdmain.py
|
||||
@@ -125,26 +125,26 @@ def handleConnectLCD():
|
||||
|
||||
ret = g_lcdproc.Initialize()
|
||||
|
||||
- if not ret:
|
||||
- count = 10
|
||||
- if not g_failedConnectionNotified:
|
||||
- g_failedConnectionNotified = True
|
||||
- g_initialConnectAttempt = False
|
||||
- text = __settings__.getLocalizedString(500)
|
||||
- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__))
|
||||
- while (not xbmc.abortRequested) and (count > 0):
|
||||
- time.sleep(1)
|
||||
- count -= 1
|
||||
- ret = False
|
||||
- else:
|
||||
- text = __settings__.getLocalizedString(501)
|
||||
- if not g_failedConnectionNotified and not g_initialConnectAttempt:
|
||||
- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__))
|
||||
- g_failedConnectionNotified = True
|
||||
- break
|
||||
+ #if not ret:
|
||||
+ # count = 10
|
||||
+ # if not g_failedConnectionNotified:
|
||||
+ # g_failedConnectionNotified = True
|
||||
+ # g_initialConnectAttempt = False
|
||||
+ # text = __settings__.getLocalizedString(500)
|
||||
+ # xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__))
|
||||
+ # while (not xbmc.abortRequested) and (count > 0):
|
||||
+ # time.sleep(1)
|
||||
+ # count -= 1
|
||||
+ # ret = False
|
||||
+ #else:
|
||||
+ # text = __settings__.getLocalizedString(501)
|
||||
+ # if not g_failedConnectionNotified and not g_initialConnectAttempt:
|
||||
+ # xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__))
|
||||
+ # g_failedConnectionNotified = True
|
||||
+ # break
|
||||
|
||||
# initial connection attempt done, update flag
|
||||
- g_initialConnectAttempt = False
|
||||
+ # g_initialConnectAttempt = False
|
||||
return ret
|
||||
|
||||
#MAIN - entry point
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-addon-xvdr"
|
||||
PKG_VERSION="f267086"
|
||||
PKG_VERSION="df75826"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="13.alpha-536cf62"
|
||||
PKG_VERSION="13.alpha-a4342cf"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="13.alpha-536cf62"
|
||||
PKG_VERSION="13.alpha-a4342cf"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-intel"
|
||||
PKG_VERSION="2.99.907"
|
||||
PKG_VERSION="2.99.909"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -24,7 +24,7 @@ PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.nvidia.com/"
|
||||
[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run"
|
||||
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros libXinerama linux xorg-server"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/driver"
|
||||
|
||||
@ -24,7 +24,7 @@ PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.nvidia.com/"
|
||||
[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run"
|
||||
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros linux libXinerama xorg-server"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/driver"
|
||||
|
||||
@ -32,7 +32,8 @@ PKG_LONGDESC="X font Library"
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-ipv6 \
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
|
||||
--disable-ipv6 \
|
||||
--enable-freetype \
|
||||
--enable-builtins \
|
||||
--disable-pcfformat \
|
||||
|
||||
@ -1,33 +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 <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libXft"
|
||||
PKG_VERSION="2.3.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.X.org"
|
||||
PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros xproto libXrender fontconfig freetype"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/lib"
|
||||
PKG_SHORTDESC="libxft: X FreeType library"
|
||||
PKG_LONGDESC="X FreeType library"
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -32,4 +32,4 @@ PKG_LONGDESC="libXinerama is the Xinerama library."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"
|
||||
|
||||
@ -32,4 +32,4 @@ PKG_LONGDESC="The Xtst Library"
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--with-gnu-ld --without-xmlto"
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-gnu-ld --without-xmlto"
|
||||
|
||||
@ -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 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
|
||||
Loading…
x
Reference in New Issue
Block a user