Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openele…
…c-3.0
- Loading branch information
Showing
394 changed files
with
43,906 additions
and
6,818 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
...es/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/couchpotato/runner.py b/couchpotato/runner.py | ||
| index c0b7eb8..3a550f9 100644 | ||
| --- a/couchpotato/runner.py | ||
| +++ b/couchpotato/runner.py | ||
| @@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En | ||
| Env.set('data_dir', data_dir) | ||
| Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log')) | ||
| Env.set('db_path', 'sqlite:///' + db_path) | ||
| - Env.set('cache_dir', os.path.join(data_dir, 'cache')) | ||
| + Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2')) | ||
| Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python'))) | ||
| Env.set('console_log', options.console_log) | ||
| Env.set('quiet', options.quiet) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 0 additions & 44 deletions
44
...Beard/patches/SickBeard-b7cf06e-001-remove_logo_update-header_and_donate_button-0.1.patch
This file was deleted.
Oops, something went wrong.
55 changes: 55 additions & 0 deletions
55
...Beard/patches/SickBeard-e6dcfb3-001-remove_logo_update-header_and_donate_button-0.1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl | ||
| index ec28766..fdf3e30 100644 | ||
| --- a/data/interfaces/default/config.tmpl | ||
| +++ b/data/interfaces/default/config.tmpl | ||
| @@ -36,13 +36,4 @@ | ||
| </table> | ||
| </div> | ||
|
|
||
| -<div class="container padding" style="width: 600px;"> | ||
| - <table class="infoTable"> | ||
| - <tr> | ||
| - <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td> | ||
| - <td>Sick Beard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td> | ||
| - </tr> | ||
| - </table> | ||
| -</div> | ||
| - | ||
| #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl") | ||
| diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl | ||
| index f791be8..fb38f17 100644 | ||
| --- a/data/interfaces/default/inc_top.tmpl | ||
| +++ b/data/interfaces/default/inc_top.tmpl | ||
| @@ -108,20 +108,6 @@ | ||
|
|
||
| <body> | ||
| <header> | ||
| -#if $sickbeard.NEWEST_VERSION_STRING: | ||
| -<div id="upgrade-notification"> | ||
| - <div> | ||
| - <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span> | ||
| - </div> | ||
| -</div> | ||
| -<div id="header-fix"></div> | ||
| -#end if | ||
| -<div id="header"> | ||
| - <a name="top"></a> | ||
| - <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard.png" width="150" height="72" /></a></span> | ||
| - <span id="versiontext">alpha <a href="https://github.com/midgetspy/Sick-Beard/wiki/ChangeLog" onclick="window.open(this.href, '_blank'); return false;">$sickbeard.version.SICKBEARD_VERSION</a></span> | ||
| -</div> | ||
| - | ||
| <div class="navbar"> | ||
| <div class="navbar-inner"> | ||
| <div class="container"> | ||
| @@ -208,11 +194,6 @@ | ||
| </li> | ||
| <li class="divider-vertical"></li> | ||
| </ul> | ||
| - <ul class="nav pull-right"> | ||
| - <li> | ||
| - <a id="navDonate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" height="26" width="92" /></a> | ||
| - </li> | ||
| - </ul> | ||
| </div><!-- /nav-collapse --> | ||
|
|
||
| </div><!-- /container --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
packages/3rdparty/multimedia/vdr/patches/vdr-1.7.27-90_linux-3.7.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/dvbdevice.c b/dvbdevice.c | ||
| index 42ec5b1..9c397d7 100644 | ||
| --- a/dvbdevice.c | ||
| +++ b/dvbdevice.c | ||
| @@ -839,7 +839,11 @@ bool cDvbTuner::SetFrontend(void) | ||
| SETCMD(DTV_HIERARCHY, dtp.Hierarchy()); | ||
| if (frontendType == SYS_DVBT2) { | ||
| // DVB-T2 | ||
| +#ifdef DTV_DVBT2_PLP_ID | ||
| SETCMD(DTV_DVBT2_PLP_ID, dtp.PlpId()); | ||
| +#else | ||
| + SETCMD(DTV_DVBT2_PLP_ID_LEGACY, dtp.PlpId()); | ||
| +#endif | ||
| } | ||
|
|
||
| tuneTimeout = DVBT_TUNE_TIMEOUT; |
12 changes: 12 additions & 0 deletions
12
packages/addons/debugging/tools/evtest/patches/evtest-1.30-automake_1.13.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff -Naur evtest-1.30-old/configure.ac evtest-1.30-new/configure.ac | ||
| --- evtest-1.30-old/configure.ac 2012-04-26 15:15:32.000000000 -0700 | ||
| +++ evtest-1.30-new/configure.ac 2013-01-03 17:00:38.000000000 -0800 | ||
| @@ -2,7 +2,7 @@ | ||
| AC_INIT(evtest,[1.30], [https://bugzilla.freedesktop.org/enter_bug.cgi?product=evtest], evtest) | ||
| AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
|
|
||
| -AM_CONFIG_HEADER(config.h) | ||
| +AC_CONFIG_HEADERS(config.h) | ||
| AC_PROG_CC | ||
| AC_PROG_INSTALL | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| 3.0.2 | ||
| - update to htop-1.0.2 | ||
|
|
||
| 3.0.1 | ||
| - bump addon version | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| 3.0.2 | ||
| - update to w_scan-20121111 | ||
|
|
||
| 3.0.1 | ||
| - bump addon version | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
packages/addons/multimedia/w_scan/patches/w_scan-20121111-kernel-3.7.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| 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); |
8 changes: 8 additions & 0 deletions
8
packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.