mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 07:27:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
Stephan Raue
commit
6fa00d8b5a
@ -0,0 +1,29 @@
|
||||
From 61c795e71df00f4d3c22d2be405ceb0eb0e0e49c Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Fri, 22 Nov 2013 21:45:56 +0200
|
||||
Subject: [PATCH] don't build unused plugins
|
||||
|
||||
---
|
||||
Makefile | 6 +++---
|
||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 118e379..5f15ebe 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,9 +16,9 @@
|
||||
### edit one of these lines to '1', if you don't want the addon epgsearchonly,
|
||||
### conflictcheckonly or quickepgsearch
|
||||
|
||||
-WITHOUT_EPGSEARCHONLY=0
|
||||
-WITHOUT_CONFLICTCHECKONLY=0
|
||||
-WITHOUT_QUICKSEARCH=0
|
||||
+WITHOUT_EPGSEARCHONLY=1
|
||||
+WITHOUT_CONFLICTCHECKONLY=1
|
||||
+WITHOUT_QUICKSEARCH=1
|
||||
|
||||
### edit this to '0' if you don't want epgsearch to auto config itself
|
||||
AUTOCONFIG=1
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
@ -1,26 +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
|
||||
################################################################################
|
||||
|
||||
. config/options
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
cp $PKG_BUILD/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
@ -1,30 +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
|
||||
################################################################################
|
||||
|
||||
. config/options
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
|
||||
make
|
||||
@ -1,23 +0,0 @@
|
||||
4.0.1
|
||||
- rebuild
|
||||
|
||||
4.0.0
|
||||
- rebuild for OpenELEC-4.0
|
||||
|
||||
3.1.1
|
||||
- rebuild for OpenELEC-3.2
|
||||
|
||||
3.0.2
|
||||
- update to w_scan-20121111
|
||||
|
||||
3.0.1
|
||||
- bump addon version
|
||||
|
||||
2.1.2
|
||||
- update to w_scan-20120605
|
||||
|
||||
2.1.1
|
||||
- update to addon version 2.1
|
||||
|
||||
2.0.0
|
||||
- initial addon w_scan based on version 20120128
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 75 KiB |
@ -1,36 +0,0 @@
|
||||
################################################################################
|
||||
# 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
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="w_scan"
|
||||
PKG_VERSION="20121111"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"
|
||||
PKG_URL="http://wirbel.htpc-forum.de/w_scan/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="lib/multimedia"
|
||||
PKG_SHORTDESC="w_scan: eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf."
|
||||
PKG_LONGDESC="w_scan ist eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf."
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_TYPE="xbmc.python.script"
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/scan.c b/scan.c
|
||||
index c24e256..8f603f8 100644
|
||||
--- a/scan.c
|
||||
+++ b/scan.c
|
||||
@@ -1816,7 +1816,11 @@ static int set_frontend(int frontend_fd, struct transponder * t) {
|
||||
case SCAN_TERRESTRIAL:
|
||||
set_cmd_sequence(DTV_DELIVERY_SYSTEM, t->param.u.terr.delivery_system);
|
||||
if (t->param.u.terr.delivery_system == SYS_DVBT2) {
|
||||
+#ifdef DTV_DVBT2_PLP_ID
|
||||
set_cmd_sequence(DTV_DVBT2_PLP_ID, t->pids.plp_id);
|
||||
+#else
|
||||
+ set_cmd_sequence(DTV_DVBT2_PLP_ID_LEGACY, t->pids.plp_id);
|
||||
+#endif
|
||||
}
|
||||
set_cmd_sequence(DTV_FREQUENCY, t->param.frequency);
|
||||
set_cmd_sequence(DTV_INVERSION, t->param.inversion);
|
||||
@ -1,23 +0,0 @@
|
||||
################################################################################
|
||||
# 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
|
||||
################################################################################
|
||||
|
||||
import os
|
||||
import sys
|
||||
import xbmcaddon
|
||||
@ -8,7 +8,6 @@
|
||||
<setting id="ENABLE_SOFTCAM" value="true" />
|
||||
<setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
|
||||
<setting id="ENABLE_STREAMDEV_SERVER" value="false" />
|
||||
<setting id="ENABLE_WIRBELSCAN" value="true" />
|
||||
<setting id="ENABLE_LIVE" value="false" />
|
||||
<setting id="LIVE_IP" value="0.0.0.0" />
|
||||
<setting id="LIVE_PORT" value="8008" />
|
||||
|
||||
@ -116,6 +116,7 @@ if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
|
||||
fi
|
||||
|
||||
VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
|
||||
VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
|
||||
|
||||
if [ "$ENABLE_SOFTCAM" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"
|
||||
@ -129,9 +130,6 @@ fi
|
||||
if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P streamdev-client"
|
||||
fi
|
||||
if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
|
||||
fi
|
||||
if [ "$ENABLE_LIVE" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
|
||||
fi
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
<string id="1031">Enable plugin: iptv</string>
|
||||
<string id="1032">Enable plugin: streamdev-client</string>
|
||||
<string id="1033">Enable plugin: streamdev-server</string>
|
||||
<string id="1034">Enable plugin: wirbelscan</string>
|
||||
<string id="1036">Enable softcam</string>
|
||||
<string id="1037">softcam plugin</string>
|
||||
<string id="1038">Enable plugin: live</string>
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
|
||||
<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
|
||||
<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
|
||||
<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
|
||||
<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
|
||||
<setting id="LIVE_IP" type="ipaddress" label="1039" values="" enable="!eq(-1,false)" default="0.0.0.0"/>
|
||||
<setting id="LIVE_PORT" type="number" label="1040" values="" enable="!eq(-2,false)" default="8008"/>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
PKG_NAME="linux"
|
||||
case "$LINUX" in
|
||||
*)
|
||||
PKG_VERSION="3.12"
|
||||
PKG_VERSION="3.12.1"
|
||||
;;
|
||||
esac
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
|
||||
@ -10,6 +10,8 @@ Environment=HOME=/storage
|
||||
EnvironmentFile=-/run/openelec/xbmc.conf
|
||||
EnvironmentFile=-/run/openelec/debug/xbmc.conf
|
||||
ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG"
|
||||
# keep KillMode=process unless there is no good reason to switch to cgroup
|
||||
KillMode=process
|
||||
TimeoutStopSec=10
|
||||
Restart=always
|
||||
RestartSec=2
|
||||
|
||||
@ -113,12 +113,12 @@
|
||||
root preexec = mkdir -p /storage/pictures
|
||||
|
||||
[Emulators]
|
||||
path = /storage/emulators/mame/roms
|
||||
path = /storage/emulators
|
||||
available = yes
|
||||
browsable = yes
|
||||
public = yes
|
||||
writable = yes
|
||||
root preexec = mkdir -p /storage/emulators/mame/roms
|
||||
root preexec = mkdir -p /storage/emulators
|
||||
|
||||
[Configfiles]
|
||||
path = /storage/.config
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user