mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
Conflicts: packages/mediacenter/xbmc-addon-settings/config/default_settings.xml packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
This commit is contained in:
Stephan Raue
commit
ea96225d65
@ -20,7 +20,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="CouchPotatoServer"
|
PKG_NAME="CouchPotatoServer"
|
||||||
PKG_VERSION="e1d7440"
|
PKG_VERSION="393c14d"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
|||||||
13
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
vendored
Normal file
13
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
vendored
Normal file
@ -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)
|
||||||
2
packages/3rdparty/download/Headphones/meta
vendored
2
packages/3rdparty/download/Headphones/meta
vendored
@ -20,7 +20,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="Headphones"
|
PKG_NAME="Headphones"
|
||||||
PKG_VERSION="d07dc39"
|
PKG_VERSION="263272c"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
|||||||
2
packages/3rdparty/download/SABnzbd/meta
vendored
2
packages/3rdparty/download/SABnzbd/meta
vendored
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="SABnzbd"
|
PKG_NAME="SABnzbd"
|
||||||
PKG_VERSION="0.7.3"
|
PKG_VERSION="0.7.9"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
|||||||
2
packages/3rdparty/download/SickBeard/meta
vendored
2
packages/3rdparty/download/SickBeard/meta
vendored
@ -20,7 +20,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="SickBeard"
|
PKG_NAME="SickBeard"
|
||||||
PKG_VERSION="b7cf06e"
|
PKG_VERSION="e6dcfb3"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
|||||||
@ -1,44 +0,0 @@
|
|||||||
diff -Naur SickBeard-9b43f71/data/interfaces/default/config.tmpl SickBeard-9b43f71.patch/data/interfaces/default/config.tmpl
|
|
||||||
--- SickBeard-9b43f71/data/interfaces/default/config.tmpl 2011-12-14 04:42:55.000000000 +0100
|
|
||||||
+++ SickBeard-9b43f71.patch/data/interfaces/default/config.tmpl 2011-12-14 04:56:35.317466009 +0100
|
|
||||||
@@ -25,9 +25,4 @@
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><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>Sickbeard 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>
|
|
||||||
-
|
|
||||||
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
|
|
||||||
diff -Naur SickBeard-9b43f71/data/interfaces/default/inc_top.tmpl SickBeard-9b43f71.patch/data/interfaces/default/inc_top.tmpl
|
|
||||||
--- SickBeard-9b43f71/data/interfaces/default/inc_top.tmpl 2011-12-14 04:42:55.000000000 +0100
|
|
||||||
+++ SickBeard-9b43f71.patch/data/interfaces/default/inc_top.tmpl 2011-12-14 04:56:35.318466029 +0100
|
|
||||||
@@ -140,19 +140,6 @@
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
-#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_small.png" width="150" /></a></span>
|
|
||||||
- <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
|
|
||||||
-</div>
|
|
||||||
<ul id="MainMenu" class="sf-menu">
|
|
||||||
<li id="NAVsystem" class="first"><a href="#" class="navIcon" onclick="return false;"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
|
|
||||||
<ul>
|
|
||||||
@@ -194,7 +181,6 @@
|
|
||||||
<li><a href="$sbRoot/errorlogs/viewlog/"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
- <li id="donate"><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_donate_LG.gif" alt="[donate]" /></a></li>
|
|
||||||
</ul>
|
|
||||||
#if $varExists('submenu'):
|
|
||||||
<div id="SubMenu">
|
|
||||||
@ -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 -->
|
||||||
@ -1,14 +1,13 @@
|
|||||||
diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl
|
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
|
||||||
--- SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl 2012-03-21 04:31:18.000000000 +0100
|
index 826cf0a..02f14af 100755
|
||||||
+++ SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl 2012-03-21 06:39:45.827897872 +0100
|
--- a/data/interfaces/default/config_notifications.tmpl
|
||||||
@@ -528,45 +528,6 @@
|
+++ b/data/interfaces/default/config_notifications.tmpl
|
||||||
</fieldset>
|
@@ -547,45 +547,6 @@
|
||||||
</div><!-- /notifo component-group //-->
|
|
||||||
|
|
||||||
-
|
<div class="component-group clearfix">
|
||||||
- <div class="component-group clearfix">
|
<div class="component-group-desc">
|
||||||
- <div class="component-group-desc">
|
- <img class="notifier-icon" src="$sbRoot/images/notifiers/libnotify.png" alt="" title="Libnotify" />
|
||||||
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="" title="Libnotify" width="16" height="16" /> Libnotify </a></h3>
|
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;">Libnotify</a></h3>
|
||||||
- <p>The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
|
- <p>The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
|
||||||
- </div>
|
- </div>
|
||||||
- <fieldset class="component-group-list">
|
- <fieldset class="component-group-list">
|
||||||
@ -36,32 +35,37 @@ diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl S
|
|||||||
- </label>
|
- </label>
|
||||||
- </div>
|
- </div>
|
||||||
- <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
|
- <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
|
||||||
- <input type="button" value="Test Libnotify" id="testLibnotify" />
|
- <input type="button" class="btn" value="Test Libnotify" id="testLibnotify" />
|
||||||
- <input type="submit" class="config_submitter" value="Save Changes" />
|
- <input type="submit" class="btn config_submitter" value="Save Changes" />
|
||||||
- </div><!-- /content_use_libnotify //-->
|
- </div><!-- /content_use_libnotify //-->
|
||||||
-
|
-
|
||||||
- </fieldset>
|
- </fieldset>
|
||||||
- </div><!-- /libnotify component-group //-->
|
- </div><!-- /libnotify component-group //-->
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
<div class="component-group clearfix">
|
- <div class="component-group clearfix">
|
||||||
<div class="component-group-desc">
|
- <div class="component-group-desc">
|
||||||
<h3><a href="http://boxcar.io/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/boxcar.gif" alt="" title="Boxcar" width="16" height="16" /> Boxcar </a></h3>
|
<img class="notifier-icon" src="$sbRoot/images/notifiers/pushover.png" alt="" title="Pushover" />
|
||||||
diff -Naur SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl
|
<h3><a href="http://pushover.net/" onclick="window.open(this.href, '_blank'); return false;">Pushover</a></h3>
|
||||||
--- SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:02.098433287 +0100
|
<p>Pushover makes it easy to send real-time notifications to your Android and iOS devices.</p>
|
||||||
+++ SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:34.445056278 +0100
|
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
|
||||||
@@ -169,7 +169,6 @@
|
index fb38f17..4ead36f 100644
|
||||||
<li id="NAVconfig"><a href="$sbRoot/config/">Config</a>
|
--- a/data/interfaces/default/inc_top.tmpl
|
||||||
<ul>
|
+++ b/data/interfaces/default/inc_top.tmpl
|
||||||
<li><a href="$sbRoot/config/"><img src="$sbRoot/images/menu/config_index16.png" alt="" width="16" height="16" />Help & Info</a></li>
|
@@ -172,8 +172,6 @@
|
||||||
- <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
|
<ul class="dropdown-menu">
|
||||||
<li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
|
<li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help & Info</a></li>
|
||||||
<li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
|
<li class="divider"></li>
|
||||||
<li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
|
- <li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
|
||||||
diff -Naur SickBeard-a24eac6/sickbeard/webserve.py SickBeard-a24eac6.patch/sickbeard/webserve.py
|
- <li class="divider"></li>
|
||||||
--- SickBeard-a24eac6/sickbeard/webserve.py 2012-03-21 04:31:18.000000000 +0100
|
<li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
|
||||||
+++ SickBeard-a24eac6.patch/sickbeard/webserve.py 2012-03-21 06:35:34.447056316 +0100
|
<li class="divider"></li>
|
||||||
@@ -593,7 +593,6 @@
|
<li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
|
||||||
|
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
|
||||||
|
index 20f0dfc..b0bf6a6 100644
|
||||||
|
--- a/sickbeard/webserve.py
|
||||||
|
+++ b/sickbeard/webserve.py
|
||||||
|
@@ -609,7 +609,6 @@ class History:
|
||||||
|
|
||||||
|
|
||||||
ConfigMenu = [
|
ConfigMenu = [
|
||||||
@ -1,3 +1,6 @@
|
|||||||
|
3.0.2
|
||||||
|
- update to htop-1.0.2
|
||||||
|
|
||||||
3.0.1
|
3.0.1
|
||||||
- bump addon version
|
- bump addon version
|
||||||
|
|
||||||
|
|||||||
@ -19,8 +19,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="htop"
|
PKG_NAME="htop"
|
||||||
PKG_VERSION="1.0.1"
|
PKG_VERSION="1.0.2"
|
||||||
PKG_REV="1"
|
PKG_REV="2"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://htop.sourceforge.net/"
|
PKG_SITE="http://htop.sourceforge.net/"
|
||||||
|
|||||||
@ -1,3 +1,11 @@
|
|||||||
|
3.0.2
|
||||||
|
- Fixed bug causing configobj to throw an exception with Couchpotato v2s config
|
||||||
|
- corrected a bug causing most of the suite to crash on first launch in certain circumstances
|
||||||
|
- update to SABnzbd-0.7.9
|
||||||
|
- update to CouchPotatoServer-393c14d
|
||||||
|
- update to Headphones-263272c
|
||||||
|
- update to SickBeard-e6dcfb3
|
||||||
|
|
||||||
3.0.1
|
3.0.1
|
||||||
- bump addon version
|
- bump addon version
|
||||||
|
|
||||||
|
|||||||
@ -8,6 +8,6 @@
|
|||||||
<setting id="SABNZBD_LAUNCH" value="true" />
|
<setting id="SABNZBD_LAUNCH" value="true" />
|
||||||
<setting id="SICKBEARD_LAUNCH" value="true" />
|
<setting id="SICKBEARD_LAUNCH" value="true" />
|
||||||
<setting id="COUCHPOTATO_LAUNCH" value="true" />
|
<setting id="COUCHPOTATO_LAUNCH" value="true" />
|
||||||
<setting id="COUCHPOTATO_VERSION" value="0" />
|
<setting id="COUCHPOTATO_VERSION" value="1" />
|
||||||
<setting id="HEADPHONES_LAUNCH" value="true" />
|
<setting id="HEADPHONES_LAUNCH" value="true" />
|
||||||
</settings>
|
</settings>
|
||||||
|
|||||||
@ -74,6 +74,7 @@ pSickBeardSettings = os.path.join(pAddonHome, 'sickbeard.ini')
|
|||||||
pCouchPotatoSettings = os.path.join(pAddonHome, 'couchpotato.ini')
|
pCouchPotatoSettings = os.path.join(pAddonHome, 'couchpotato.ini')
|
||||||
pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini')
|
pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini')
|
||||||
pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini')
|
pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini')
|
||||||
|
pTransmission_Addon_Settings ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml'
|
||||||
|
|
||||||
# directories
|
# directories
|
||||||
pSabNzbdComplete = '/storage/downloads'
|
pSabNzbdComplete = '/storage/downloads'
|
||||||
@ -130,6 +131,18 @@ if firstLaunch:
|
|||||||
# read addon and xbmc settings
|
# read addon and xbmc settings
|
||||||
# ----------------------------
|
# ----------------------------
|
||||||
|
|
||||||
|
# Transmission-Daemon
|
||||||
|
if os.path.exists(pTransmission_Addon_Settings):
|
||||||
|
fTransmission_Addon_Settings = open(pTransmission_Addon_Settings, 'r')
|
||||||
|
data = fTransmission_Addon_Settings.read()
|
||||||
|
fTransmission_Addon_Settings.close
|
||||||
|
transmission_addon_settings = parseString(data)
|
||||||
|
transuser = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_USER')
|
||||||
|
transpwd = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_PWD')
|
||||||
|
transauth = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_AUTH')
|
||||||
|
else:
|
||||||
|
transauth = 'false'
|
||||||
|
|
||||||
# SABnzbd-Suite
|
# SABnzbd-Suite
|
||||||
fSuiteSettings = open(pSuiteSettings, 'r')
|
fSuiteSettings = open(pSuiteSettings, 'r')
|
||||||
data = fSuiteSettings.read()
|
data = fSuiteSettings.read()
|
||||||
@ -249,7 +262,7 @@ try:
|
|||||||
|
|
||||||
# launch SABnzbd and get the API key
|
# launch SABnzbd and get the API key
|
||||||
# ----------------------------------
|
# ----------------------------------
|
||||||
if "true" in sabnzbd_launch:
|
if firstLaunch or "true" in sabnzbd_launch:
|
||||||
logging.debug('Launching SABnzbd...')
|
logging.debug('Launching SABnzbd...')
|
||||||
subprocess.call(sabnzbd,close_fds=True)
|
subprocess.call(sabnzbd,close_fds=True)
|
||||||
logging.debug('...done')
|
logging.debug('...done')
|
||||||
@ -260,6 +273,8 @@ try:
|
|||||||
sabNzbdConfig.reload()
|
sabNzbdConfig.reload()
|
||||||
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
|
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
|
||||||
logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
|
logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
|
||||||
|
if firstLaunch and "false" in sabnzbd_launch:
|
||||||
|
urllib2.urlopen('http://' + sabNzbdHost + '/api?mode=shutdown&apikey=' + sabNzbdApiKey)
|
||||||
except Exception,e:
|
except Exception,e:
|
||||||
print 'SABnzbd: exception occurred:', e
|
print 'SABnzbd: exception occurred:', e
|
||||||
print traceback.format_exc()
|
print traceback.format_exc()
|
||||||
@ -308,6 +323,7 @@ try:
|
|||||||
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
||||||
defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1'
|
defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1'
|
||||||
defaultConfig['XBMC']['xbmc_update_library'] = '1'
|
defaultConfig['XBMC']['xbmc_update_library'] = '1'
|
||||||
|
defaultConfig['XBMC']['xbmc_update_full'] = '1'
|
||||||
|
|
||||||
sickBeardConfig.merge(defaultConfig)
|
sickBeardConfig.merge(defaultConfig)
|
||||||
sickBeardConfig.write()
|
sickBeardConfig.write()
|
||||||
@ -383,15 +399,13 @@ try:
|
|||||||
|
|
||||||
# write CouchPotatoServer settings
|
# write CouchPotatoServer settings
|
||||||
# --------------------------
|
# --------------------------
|
||||||
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True)
|
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False)
|
||||||
defaultConfig = ConfigObj()
|
defaultConfig = ConfigObj()
|
||||||
defaultConfig['newznab'] = {}
|
|
||||||
defaultConfig['newznab']['api_key'] = ''
|
|
||||||
defaultConfig['core'] = {}
|
defaultConfig['core'] = {}
|
||||||
defaultConfig['core']['username'] = user
|
defaultConfig['core']['username'] = user
|
||||||
defaultConfig['core']['password'] = md5pwd
|
defaultConfig['core']['password'] = md5pwd
|
||||||
defaultConfig['core']['port'] = '8083'
|
defaultConfig['core']['port'] = '8083'
|
||||||
defaultConfig['core']['launchbrowser'] = '0'
|
defaultConfig['core']['launch_browser'] = '0'
|
||||||
defaultConfig['core']['host'] = host
|
defaultConfig['core']['host'] = host
|
||||||
defaultConfig['core']['data_dir'] = pAddonHome
|
defaultConfig['core']['data_dir'] = pAddonHome
|
||||||
defaultConfig['core']['permission_folder'] = '0644'
|
defaultConfig['core']['permission_folder'] = '0644'
|
||||||
@ -415,15 +429,26 @@ try:
|
|||||||
defaultConfig['xbmc']['username'] = xbmcUser
|
defaultConfig['xbmc']['username'] = xbmcUser
|
||||||
defaultConfig['xbmc']['password'] = xbmcPwd
|
defaultConfig['xbmc']['password'] = xbmcPwd
|
||||||
|
|
||||||
|
if 'true' in transauth:
|
||||||
|
defaultConfig['transmission'] = {}
|
||||||
|
defaultConfig['transmission']['username'] = transuser
|
||||||
|
defaultConfig['transmission']['password'] = transpwd
|
||||||
|
defaultConfig['transmission']['directory'] = pSabNzbdCompleteMov
|
||||||
|
defaultConfig['transmission']['host'] = 'localhost:9091'
|
||||||
|
|
||||||
if firstLaunch:
|
if firstLaunch:
|
||||||
|
defaultConfig['xbmc']['xbmc_update_library'] = '1'
|
||||||
|
defaultConfig['xbmc']['xbmc_update_full'] = '1'
|
||||||
|
defaultConfig['xbmc']['xbmc_notify_onsnatch'] = '1'
|
||||||
|
defaultConfig['xbmc']['xbmc_notify_ondownload'] = '1'
|
||||||
defaultConfig['Sabnzbd']['category'] = 'movies'
|
defaultConfig['Sabnzbd']['category'] = 'movies'
|
||||||
defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov
|
defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov
|
||||||
defaultConfig['Renamer'] = {}
|
defaultConfig['Renamer'] = {}
|
||||||
defaultConfig['Renamer']['enabled'] = 'True'
|
defaultConfig['Renamer']['enabled'] = '1'
|
||||||
defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov
|
defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov
|
||||||
defaultConfig['Renamer']['destination'] = '/storage/videos'
|
defaultConfig['Renamer']['destination'] = '/storage/videos'
|
||||||
defaultConfig['Renamer']['separator'] = '.'
|
defaultConfig['Renamer']['separator'] = '.'
|
||||||
defaultConfig['Renamer']['cleanup'] = 'False'
|
defaultConfig['Renamer']['cleanup'] = '0'
|
||||||
|
|
||||||
couchPotatoServerConfig.merge(defaultConfig)
|
couchPotatoServerConfig.merge(defaultConfig)
|
||||||
couchPotatoServerConfig.write()
|
couchPotatoServerConfig.write()
|
||||||
@ -446,13 +471,23 @@ try:
|
|||||||
headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
|
headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
|
||||||
defaultConfig = ConfigObj()
|
defaultConfig = ConfigObj()
|
||||||
defaultConfig['General'] = {}
|
defaultConfig['General'] = {}
|
||||||
defaultConfig['General']['launch_browser'] = '0'
|
defaultConfig['General']['launch_browser'] = '0'
|
||||||
defaultConfig['General']['http_port'] = '8084'
|
defaultConfig['General']['http_port'] = '8084'
|
||||||
defaultConfig['General']['http_host'] = host
|
defaultConfig['General']['http_host'] = host
|
||||||
defaultConfig['General']['http_username'] = user
|
defaultConfig['General']['http_username'] = user
|
||||||
defaultConfig['General']['http_password'] = pwd
|
defaultConfig['General']['http_password'] = pwd
|
||||||
|
defaultConfig['General']['check_github'] = '0'
|
||||||
|
defaultConfig['General']['check_github_on_startup'] = '0'
|
||||||
|
defaultConfig['General']['log_dir'] = pAddonHome + '/logs'
|
||||||
|
defaultConfig['General']['folder_permissions'] = '0644'
|
||||||
|
defaultConfig['XBMC'] = {}
|
||||||
|
defaultConfig['XBMC']['xbmc_enabled'] = '1'
|
||||||
|
defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort
|
||||||
|
defaultConfig['XBMC']['xbmc_username'] = xbmcUser
|
||||||
|
defaultConfig['XBMC']['xbmc_password'] = xbmcPwd
|
||||||
|
defaultConfig['SABnzbd'] = {}
|
||||||
|
|
||||||
if "true" in sabnzbd_launch:
|
if "true" in sabnzbd_launch:
|
||||||
defaultConfig['SABnzbd'] = {}
|
|
||||||
defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey
|
defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey
|
||||||
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
||||||
defaultConfig['SABnzbd']['sab_username'] = user
|
defaultConfig['SABnzbd']['sab_username'] = user
|
||||||
@ -460,6 +495,8 @@ try:
|
|||||||
|
|
||||||
if firstLaunch:
|
if firstLaunch:
|
||||||
defaultConfig['SABnzbd']['sab_category'] = 'music'
|
defaultConfig['SABnzbd']['sab_category'] = 'music'
|
||||||
|
defaultConfig['XBMC']['xbmc_update'] = '1'
|
||||||
|
defaultConfig['XBMC']['xbmc_notify'] = '1'
|
||||||
defaultConfig['General']['music_dir'] = '/storage/music'
|
defaultConfig['General']['music_dir'] = '/storage/music'
|
||||||
defaultConfig['General']['destination_dir'] = '/storage/music'
|
defaultConfig['General']['destination_dir'] = '/storage/music'
|
||||||
defaultConfig['General']['download_dir'] = '/storage/downloads/music'
|
defaultConfig['General']['download_dir'] = '/storage/downloads/music'
|
||||||
|
|||||||
@ -1,6 +1,2 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | awk '{print $1}'` 2>/dev/null
|
kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null
|
||||||
kill -9 `ps | grep -E 'python.*/SABnzbd.py' | awk '{print $1}'` 2>/dev/null
|
|
||||||
kill -9 `ps | grep -E 'python.*/SickBeard.py' | awk '{print $1}'` 2>/dev/null
|
|
||||||
kill -9 `ps | grep -E 'python.*/CouchPotato.py' | awk '{print $1}'` 2>/dev/null
|
|
||||||
kill -9 `ps | grep -E 'python.*/Headphones.py' | awk '{print $1}'` 2>/dev/null
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
<setting id="SABNZBD_LAUNCH" type="bool" label="1024" default="true" />
|
<setting id="SABNZBD_LAUNCH" type="bool" label="1024" default="true" />
|
||||||
<setting id="SICKBEARD_LAUNCH" type="bool" label="1025" default="true" />
|
<setting id="SICKBEARD_LAUNCH" type="bool" label="1025" default="true" />
|
||||||
<setting id="COUCHPOTATO_LAUNCH" type="bool" label="1026" default="true" />
|
<setting id="COUCHPOTATO_LAUNCH" type="bool" label="1026" default="true" />
|
||||||
<setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="0" values="Version 1|Version 2" enable="eq(-1,true)" />
|
<setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="1" values="Version 1|Version 2" enable="eq(-1,true)" />
|
||||||
<setting id="HEADPHONES_LAUNCH" type="bool" label="1028" default="true" />
|
<setting id="HEADPHONES_LAUNCH" type="bool" label="1028" default="true" />
|
||||||
|
|
||||||
<setting label="2010" type="lsep"/>
|
<setting label="2010" type="lsep"/>
|
||||||
|
|||||||
@ -1,3 +1,9 @@
|
|||||||
|
3.0.5
|
||||||
|
- update to oscam-8119
|
||||||
|
- use internal crypto functions
|
||||||
|
- disable ssl support
|
||||||
|
- disable debug support
|
||||||
|
|
||||||
3.0.4
|
3.0.4
|
||||||
- update to oscam-8030
|
- update to oscam-8030
|
||||||
- update to pcsc-lite-1.8.7
|
- update to pcsc-lite-1.8.7
|
||||||
|
|||||||
@ -20,8 +20,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="oscam"
|
PKG_NAME="oscam"
|
||||||
PKG_VERSION="8030"
|
PKG_VERSION="8119"
|
||||||
PKG_REV="4"
|
PKG_REV="5"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
|
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# This file is part of OpenELEC - http://www.openelec.tv
|
|
||||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
|
||||||
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 $1
|
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
|
||||||
cp -Pa $PKG_BUILD/crond $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
|
||||||
cp -Pa $PKG_BUILD/crontab $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
|
||||||
cp -Pa $PKG_BUILD/extra/run-cron $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
|
||||||
cp -Pa $BUILD/nano-*/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
|
|
||||||
cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
|
|
||||||
@ -1,35 +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 $1
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
|
||||||
|
|
||||||
ADDON_DIR="/storage/.xbmc/addons/service.system.dcron/"
|
|
||||||
ADDON_HOME="/storage/.xbmc/userdata/addon_data/service.system.dcron"
|
|
||||||
|
|
||||||
sed -i "s|/usr/bin/vi|$ADDON_DIR/bin/nano|g" defs.h
|
|
||||||
|
|
||||||
$MAKE \
|
|
||||||
CRONTABS=$ADDON_HOME/crontabs \
|
|
||||||
CRONSTAMPS=$ADDON_HOME/cronstamps \
|
|
||||||
SCRONTABS=$ADDON_HOME/cron.d
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
3.0.1
|
|
||||||
- bump addon version
|
|
||||||
|
|
||||||
2.1.1
|
|
||||||
- update to addon version 2.1
|
|
||||||
|
|
||||||
2.0.2
|
|
||||||
- add possibilty to start / stop addon from addon manager with enable / disable
|
|
||||||
|
|
||||||
2.0
|
|
||||||
- initial version for dcron 4.5
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
# /etc/cron.d/prune-cronstamps
|
|
||||||
|
|
||||||
# Prunes any files in /var/spool/cron/cronstamps that haven't been used in ninety
|
|
||||||
# days. We check that both mtime and atime are greater than this:
|
|
||||||
#
|
|
||||||
# atime because the cronstamp may be in use (crond is reading it) but the
|
|
||||||
# job keeps failing. So the cronstamp hasn't yet been updated.
|
|
||||||
#
|
|
||||||
# mtime because the volume the cronstamp is located on may be mounted noatime
|
|
||||||
# and so its atime won't be updated. At least its mtime will be updated when
|
|
||||||
# it's modified.
|
|
||||||
|
|
||||||
@weekly ID=prune-cronstamps find /storage/.xbmc/userdata/addon_data/service.system.dcron/cronstamps -type f -mtime +90 -atime +90 -delete
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
# root crontab
|
|
||||||
# DO NOT EDIT THIS FILE MANUALLY! USE crontab -e INSTEAD
|
|
||||||
|
|
||||||
# man 1 crontab for acceptable formats:
|
|
||||||
# <minute> <hour> <day> <month> <dow> <tags and command>
|
|
||||||
# <@freq> <tags and command>
|
|
||||||
|
|
||||||
# SYSTEM DAILY/WEEKLY/... FOLDERS
|
|
||||||
@hourly ID=sys-hourly /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.hourly
|
|
||||||
@daily ID=sys-daily /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.daily
|
|
||||||
@weekly ID=sys-weekly /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.weekly
|
|
||||||
@monthly ID=sys-monthly /storage/.xbmc/addons/service.system.dcron/bin/run-cron /storage/.xbmc/userdata/addon_data/service.system.dcron/cron.monthly
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB |
@ -1,37 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
# This file is part of OpenELEC - http://www.openelec.tv
|
|
||||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
|
||||||
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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="dcron"
|
|
||||||
PKG_VERSION="4.5"
|
|
||||||
PKG_REV="1"
|
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="GPL"
|
|
||||||
PKG_SITE="http://www.jimpryor.net/linux/dcron.html"
|
|
||||||
PKG_URL="http://www.jimpryor.net/linux/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
|
||||||
PKG_DEPENDS=""
|
|
||||||
PKG_BUILD_DEPENDS="toolchain nano"
|
|
||||||
PKG_PRIORITY="optional"
|
|
||||||
PKG_SECTION="service/system"
|
|
||||||
PKG_SHORTDESC="This lightweight cron daemon aims to be simple and secure, with just enough features to stay useful."
|
|
||||||
PKG_LONGDESC="This lightweight cron daemon aims to be simple and secure, with just enough features to stay useful."
|
|
||||||
PKG_IS_ADDON="yes"
|
|
||||||
PKG_ADDON_TYPE="xbmc.service"
|
|
||||||
PKG_AUTORECONF="no"
|
|
||||||
@ -1,63 +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
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
. /etc/profile
|
|
||||||
|
|
||||||
LOCKDIR="/var/lock/"
|
|
||||||
LOCKFILE="dcron.disabled"
|
|
||||||
|
|
||||||
ADDON_NAME="service.system.dcron"
|
|
||||||
ADDON_DIR="$HOME/.xbmc/addons/$ADDON_NAME"
|
|
||||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$ADDON_NAME"
|
|
||||||
|
|
||||||
if [ ! "$(pidof crond)" ]; then
|
|
||||||
mkdir -p $ADDON_HOME
|
|
||||||
|
|
||||||
if [ ! -d $ADDON_HOME/crontabs ]; then
|
|
||||||
mkdir -p $ADDON_HOME/cron.hourly
|
|
||||||
mkdir -p $ADDON_HOME/cron.daily
|
|
||||||
mkdir -p $ADDON_HOME/cron.weekly
|
|
||||||
mkdir -p $ADDON_HOME/cron.monthly
|
|
||||||
|
|
||||||
mkdir -p $ADDON_HOME/crontabs
|
|
||||||
mkdir -p $ADDON_HOME/cronstamps
|
|
||||||
mkdir -p $ADDON_HOME/cron.d
|
|
||||||
|
|
||||||
cp $ADDON_DIR/config/root.crond $ADDON_HOME/cron.d/root
|
|
||||||
cp $ADDON_DIR/config/prune-cronstamps $ADDON_HOME/cron.d/
|
|
||||||
cp $ADDON_DIR/config/root.crontabs $ADDON_HOME/crontabs/root
|
|
||||||
fi
|
|
||||||
|
|
||||||
export PATH=$ADDON_DIR/bin:$PATH
|
|
||||||
|
|
||||||
# Restart process if it terminates.
|
|
||||||
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
|
||||||
rm -rf "$LOCKDIR/$LOCKFILE"
|
|
||||||
fi
|
|
||||||
while [ true ] ; do
|
|
||||||
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
crond -f -l info
|
|
||||||
sleep 1
|
|
||||||
done &
|
|
||||||
fi
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
# This file is part of OpenELEC - http://www.openelec.tv
|
|
||||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
|
||||||
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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
|
|
||||||
import time
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
__scriptname__ = "Lightweight cron daemon"
|
|
||||||
__author__ = "OpenELEC"
|
|
||||||
__url__ = "http://www.openelec.tv"
|
|
||||||
__settings__ = xbmcaddon.Addon(id='service.system.dcron')
|
|
||||||
__cwd__ = __settings__.getAddonInfo('path')
|
|
||||||
__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "dcron.start") )
|
|
||||||
__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "dcron.stop") )
|
|
||||||
|
|
||||||
#make binary files executable in adson bin folder
|
|
||||||
subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
|
|
||||||
|
|
||||||
subprocess.Popen(__start__, shell=True, close_fds=True)
|
|
||||||
|
|
||||||
while (not xbmc.abortRequested):
|
|
||||||
time.sleep(0.250)
|
|
||||||
|
|
||||||
subprocess.Popen(__stop__, shell=True, close_fds=True)
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
3.0.1
|
|
||||||
- bump addon version
|
|
||||||
|
|
||||||
2.1.2
|
|
||||||
- cleanup
|
|
||||||
|
|
||||||
2.1.1
|
|
||||||
- update to addon version 2.1
|
|
||||||
|
|
||||||
2.0.0
|
|
||||||
- prepare for OpenELEC-2.0 release
|
|
||||||
|
|
||||||
1.90.1
|
|
||||||
- depends on xbmc.python API 2.0
|
|
||||||
|
|
||||||
1.90.0
|
|
||||||
- prepare for OpenELEC-1.90 release
|
|
||||||
|
|
||||||
1.0.0
|
|
||||||
- update to nano-2.3.1
|
|
||||||
- prepare for OpenELEC-1.0 release
|
|
||||||
|
|
||||||
0.99.4
|
|
||||||
- change icon
|
|
||||||
|
|
||||||
0.99.3
|
|
||||||
- build as shared lib
|
|
||||||
- include ncurses libs
|
|
||||||
|
|
||||||
0.99.2
|
|
||||||
- prepare for release
|
|
||||||
|
|
||||||
0.99.1
|
|
||||||
- initial addon based on nano-2.3.0
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
@ -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
|
|
||||||
@ -1,47 +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 $1
|
|
||||||
|
|
||||||
$SCRIPTS/unpack eggdbus
|
|
||||||
|
|
||||||
# dont build parallel
|
|
||||||
MAKEFLAGS=-j1
|
|
||||||
|
|
||||||
EGGDBUS_DIR=`ls -d $BUILD/eggdbus-[0-9]*`
|
|
||||||
|
|
||||||
setup_toolchain host
|
|
||||||
|
|
||||||
cd $EGGDBUS_DIR
|
|
||||||
do_autoreconf
|
|
||||||
|
|
||||||
mkdir -p .build-host && cd .build-host
|
|
||||||
../configure --host=$HOST_NAME \
|
|
||||||
--build=$HOST_NAME \
|
|
||||||
--prefix=$ROOT/$TOOLCHAIN \
|
|
||||||
--sysconfdir=$ROOT/$TOOLCHAIN/etc \
|
|
||||||
--disable-static \
|
|
||||||
--enable-shared \
|
|
||||||
--disable-man-pages \
|
|
||||||
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
@ -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="eggdbus-host"
|
|
||||||
PKG_VERSION=""
|
|
||||||
PKG_REV="1"
|
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="LGPL"
|
|
||||||
PKG_SITE="http://cgit.freedesktop.org/~david/eggdbus"
|
|
||||||
PKG_URL=""
|
|
||||||
PKG_DEPENDS=""
|
|
||||||
PKG_BUILD_DEPENDS="toolchain glib-host dbus-host dbus-glib-host"
|
|
||||||
PKG_PRIORITY="optional"
|
|
||||||
PKG_SECTION="devel"
|
|
||||||
PKG_SHORTDESC="eggdbus: D-Bus bindings for GObject"
|
|
||||||
PKG_LONGDESC="D-Bus bindings for GObject."
|
|
||||||
PKG_IS_ADDON="no"
|
|
||||||
|
|
||||||
PKG_AUTORECONF="no"
|
|
||||||
@ -1,47 +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 $1
|
|
||||||
|
|
||||||
# dont build parallel
|
|
||||||
MAKEFLAGS=-j1
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
|
||||||
mkdir -p .build-target
|
|
||||||
|
|
||||||
cd .build-target
|
|
||||||
../configure --host=$TARGET_NAME \
|
|
||||||
--build=$HOST_NAME \
|
|
||||||
--prefix=/usr \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--datadir=/usr/share \
|
|
||||||
--localstatedir=/var \
|
|
||||||
--disable-static \
|
|
||||||
--enable-shared \
|
|
||||||
--with-eggdbus-binding-tool=$ROOT/$TOOLCHAIN/bin/eggdbus-binding-tool \
|
|
||||||
--with-eggdbus-glib-genmarshal=$ROOT/$TOOLCHAIN/bin/eggdbus-glib-genmarshal \
|
|
||||||
--disable-man-pages \
|
|
||||||
--disable-gtk-doc \
|
|
||||||
|
|
||||||
make
|
|
||||||
|
|
||||||
$MAKEINSTALL
|
|
||||||
@ -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 $1
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
|
||||||
cp -P $PKG_BUILD/.build-target/src/eggdbus/.libs/*.so* $INSTALL/usr/lib
|
|
||||||
@ -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="eggdbus"
|
|
||||||
PKG_VERSION="0.6"
|
|
||||||
PKG_REV="1"
|
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="LGPL"
|
|
||||||
PKG_SITE="http://cgit.freedesktop.org/~david/eggdbus"
|
|
||||||
PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
|
||||||
PKG_DEPENDS="glib dbus dbus-glib"
|
|
||||||
PKG_BUILD_DEPENDS="toolchain eggdbus-host glib dbus dbus-glib"
|
|
||||||
PKG_PRIORITY="optional"
|
|
||||||
PKG_SECTION="devel"
|
|
||||||
PKG_SHORTDESC="eggdbus: D-Bus bindings for GObject"
|
|
||||||
PKG_LONGDESC="D-Bus bindings for GObject."
|
|
||||||
PKG_IS_ADDON="no"
|
|
||||||
|
|
||||||
PKG_AUTORECONF="yes"
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff -Naur eggdbus-0.6/configure.ac eggdbus-0.6.patch/configure.ac
|
|
||||||
--- eggdbus-0.6/configure.ac 2009-06-19 23:39:32.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/configure.ac 2013-01-12 09:34:09.276789441 +0100
|
|
||||||
@@ -3,12 +3,11 @@
|
|
||||||
AC_PREREQ(2.59c)
|
|
||||||
AC_INIT(eggdbus, 0.6, davidz@redhat.com)
|
|
||||||
AM_INIT_AUTOMAKE(eggdbus, 0.6)
|
|
||||||
-AM_CONFIG_HEADER(config.h)
|
|
||||||
+AC_CONFIG_HEADERS(config.h)
|
|
||||||
AM_MAINTAINER_MODE
|
|
||||||
|
|
||||||
AC_ISC_POSIX
|
|
||||||
AC_PROG_CC
|
|
||||||
-AM_PROG_CC_STDC
|
|
||||||
AC_HEADER_STDC
|
|
||||||
AM_PROG_LIBTOOL
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
@ -1,317 +0,0 @@
|
|||||||
diff -Naur eggdbus-0.6/configure eggdbus-0.6.patch/configure
|
|
||||||
--- eggdbus-0.6/configure 2009-07-05 01:07:00.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/configure 2009-11-14 22:17:59.828231573 +0100
|
|
||||||
@@ -805,6 +805,8 @@
|
|
||||||
MAN_PAGES_ENABLED_FALSE
|
|
||||||
MAN_PAGES_ENABLED_TRUE
|
|
||||||
XSLTPROC
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL
|
|
||||||
+EGGDBUS_BINDING_TOOL
|
|
||||||
OTOOL64
|
|
||||||
OTOOL
|
|
||||||
LIPO
|
|
||||||
@@ -927,6 +929,8 @@
|
|
||||||
enable_ansi
|
|
||||||
enable_verbose_mode
|
|
||||||
enable_man_pages
|
|
||||||
+with_eggdbus_binding_tool
|
|
||||||
+with_eggdbus_glib_genmarshal
|
|
||||||
with_html_dir
|
|
||||||
enable_gtk_doc
|
|
||||||
'
|
|
||||||
@@ -1597,6 +1601,10 @@
|
|
||||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
|
||||||
both]
|
|
||||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
|
||||||
+ --with-eggdbus-binding-tool=filename
|
|
||||||
+ Use external eggdbus-binding-tool program
|
|
||||||
+ --with-eggdbus-glib-genmarshal=filename
|
|
||||||
+ Use external eggdbus-glib-genmarshal program
|
|
||||||
--with-html-dir=PATH path to installed docs
|
|
||||||
|
|
||||||
Some influential environment variables:
|
|
||||||
@@ -6563,13 +6571,13 @@
|
|
||||||
else
|
|
||||||
lt_cv_nm_interface="BSD nm"
|
|
||||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
|
||||||
- (eval echo "\"\$as_me:6566: $ac_compile\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:6574: $ac_compile\"" >&5)
|
|
||||||
(eval "$ac_compile" 2>conftest.err)
|
|
||||||
cat conftest.err >&5
|
|
||||||
- (eval echo "\"\$as_me:6569: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:6577: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
||||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
||||||
cat conftest.err >&5
|
|
||||||
- (eval echo "\"\$as_me:6572: output\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:6580: output\"" >&5)
|
|
||||||
cat conftest.out >&5
|
|
||||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
||||||
lt_cv_nm_interface="MS dumpbin"
|
|
||||||
@@ -7774,7 +7782,7 @@
|
|
||||||
;;
|
|
||||||
*-*-irix6*)
|
|
||||||
# Find out which ABI we are using.
|
|
||||||
- echo '#line 7777 "configure"' > conftest.$ac_ext
|
|
||||||
+ echo '#line 7785 "configure"' > conftest.$ac_ext
|
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
||||||
(eval $ac_compile) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
@@ -9212,11 +9220,11 @@
|
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
|
||||||
- (eval echo "\"\$as_me:9215: $lt_compile\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:9223: $lt_compile\"" >&5)
|
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
|
||||||
ac_status=$?
|
|
||||||
cat conftest.err >&5
|
|
||||||
- echo "$as_me:9219: \$? = $ac_status" >&5
|
|
||||||
+ echo "$as_me:9227: \$? = $ac_status" >&5
|
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
|
||||||
# So say no if there are warnings other than the usual output.
|
|
||||||
@@ -9551,11 +9559,11 @@
|
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
|
||||||
- (eval echo "\"\$as_me:9554: $lt_compile\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:9562: $lt_compile\"" >&5)
|
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
|
||||||
ac_status=$?
|
|
||||||
cat conftest.err >&5
|
|
||||||
- echo "$as_me:9558: \$? = $ac_status" >&5
|
|
||||||
+ echo "$as_me:9566: \$? = $ac_status" >&5
|
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
|
||||||
# So say no if there are warnings other than the usual output.
|
|
||||||
@@ -9656,11 +9664,11 @@
|
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
|
||||||
- (eval echo "\"\$as_me:9659: $lt_compile\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:9667: $lt_compile\"" >&5)
|
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
|
||||||
ac_status=$?
|
|
||||||
cat out/conftest.err >&5
|
|
||||||
- echo "$as_me:9663: \$? = $ac_status" >&5
|
|
||||||
+ echo "$as_me:9671: \$? = $ac_status" >&5
|
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
||||||
then
|
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
|
||||||
@@ -9711,11 +9719,11 @@
|
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
|
||||||
- (eval echo "\"\$as_me:9714: $lt_compile\"" >&5)
|
|
||||||
+ (eval echo "\"\$as_me:9722: $lt_compile\"" >&5)
|
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
|
||||||
ac_status=$?
|
|
||||||
cat out/conftest.err >&5
|
|
||||||
- echo "$as_me:9718: \$? = $ac_status" >&5
|
|
||||||
+ echo "$as_me:9726: \$? = $ac_status" >&5
|
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
||||||
then
|
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
|
||||||
@@ -12514,7 +12522,7 @@
|
|
||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
||||||
lt_status=$lt_dlunknown
|
|
||||||
cat > conftest.$ac_ext <<_LT_EOF
|
|
||||||
-#line 12517 "configure"
|
|
||||||
+#line 12525 "configure"
|
|
||||||
#include "confdefs.h"
|
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
|
||||||
@@ -12610,7 +12618,7 @@
|
|
||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
||||||
lt_status=$lt_dlunknown
|
|
||||||
cat > conftest.$ac_ext <<_LT_EOF
|
|
||||||
-#line 12613 "configure"
|
|
||||||
+#line 12621 "configure"
|
|
||||||
#include "confdefs.h"
|
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
|
||||||
@@ -13391,6 +13399,26 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
+
|
|
||||||
+# Check whether --with-eggdbus-binding-tool was given.
|
|
||||||
+if test "${with_eggdbus_binding_tool+set}" = set; then
|
|
||||||
+ withval=$with_eggdbus_binding_tool; EGGDBUS_BINDING_TOOL=$withval
|
|
||||||
+else
|
|
||||||
+ EGGDBUS_BINDING_TOOL=\$\(top_builddir\)/src/eggdbus/eggdbus-binding-tool
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+# Check whether --with-eggdbus-glib-genmarshal was given.
|
|
||||||
+if test "${with_eggdbus_glib_genmarshal+set}" = set; then
|
|
||||||
+ withval=$with_eggdbus_glib_genmarshal; EGGDBUS_GLIB_GENMARSHAL=$withval
|
|
||||||
+else
|
|
||||||
+ EGGDBUS_GLIB_GENMARSHAL=\$\(top_builddir\)/src/eggdbus/eggdbus-glib-genmarshal
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if test "${enable_man_page}" != no; then
|
|
||||||
# Extract the first word of "xsltproc", so it can be a program name with args.
|
|
||||||
set dummy xsltproc; ac_word=$2
|
|
||||||
diff -Naur eggdbus-0.6/configure.ac eggdbus-0.6.patch/configure.ac
|
|
||||||
--- eggdbus-0.6/configure.ac 2009-06-19 23:39:32.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/configure.ac 2009-11-14 22:17:37.796265674 +0100
|
|
||||||
@@ -21,6 +21,16 @@
|
|
||||||
AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
|
|
||||||
AC_ARG_ENABLE(man-pages, [ --enable-man-pages build manual pages],enable_man_pages=$enableval,enable_man_pages=yes)
|
|
||||||
|
|
||||||
+AC_ARG_WITH(eggdbus-binding-tool,
|
|
||||||
+ AS_HELP_STRING([--with-eggdbus-binding-tool=[filename]],[Use external eggdbus-binding-tool program]),
|
|
||||||
+ [EGGDBUS_BINDING_TOOL=$withval],[EGGDBUS_BINDING_TOOL=\$\(top_builddir\)/src/eggdbus/eggdbus-binding-tool])
|
|
||||||
+AC_SUBST(EGGDBUS_BINDING_TOOL)
|
|
||||||
+
|
|
||||||
+AC_ARG_WITH(eggdbus-glib-genmarshal,
|
|
||||||
+ AS_HELP_STRING([--with-eggdbus-glib-genmarshal=[filename]],[Use external eggdbus-glib-genmarshal program]),
|
|
||||||
+ [EGGDBUS_GLIB_GENMARSHAL=$withval],[EGGDBUS_GLIB_GENMARSHAL=\$\(top_builddir\)/src/eggdbus/eggdbus-glib-genmarshal])
|
|
||||||
+AC_SUBST(EGGDBUS_GLIB_GENMARSHAL)
|
|
||||||
+
|
|
||||||
if test "${enable_man_page}" != no; then
|
|
||||||
dnl
|
|
||||||
dnl Check for xsltproc
|
|
||||||
diff -Naur eggdbus-0.6/docs/eggdbus/Makefile.in eggdbus-0.6.patch/docs/eggdbus/Makefile.in
|
|
||||||
--- eggdbus-0.6/docs/eggdbus/Makefile.in 2009-09-16 17:46:57.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/docs/eggdbus/Makefile.in 2009-11-14 22:18:01.847355855 +0100
|
|
||||||
@@ -117,6 +117,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
diff -Naur eggdbus-0.6/docs/Makefile.in eggdbus-0.6.patch/docs/Makefile.in
|
|
||||||
--- eggdbus-0.6/docs/Makefile.in 2009-07-05 01:06:58.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/docs/Makefile.in 2009-11-14 22:18:01.759355998 +0100
|
|
||||||
@@ -111,6 +111,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
diff -Naur eggdbus-0.6/docs/man/Makefile.in eggdbus-0.6.patch/docs/man/Makefile.in
|
|
||||||
--- eggdbus-0.6/docs/man/Makefile.in 2009-07-05 01:06:58.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/docs/man/Makefile.in 2009-11-14 22:18:01.930355603 +0100
|
|
||||||
@@ -95,6 +95,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
diff -Naur eggdbus-0.6/docs/tests/Makefile.in eggdbus-0.6.patch/docs/tests/Makefile.in
|
|
||||||
--- eggdbus-0.6/docs/tests/Makefile.in 2009-09-16 17:46:53.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/docs/tests/Makefile.in 2009-11-14 22:18:02.032356129 +0100
|
|
||||||
@@ -117,6 +117,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
diff -Naur eggdbus-0.6/Makefile.in eggdbus-0.6.patch/Makefile.in
|
|
||||||
--- eggdbus-0.6/Makefile.in 2009-07-05 01:06:59.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/Makefile.in 2009-11-14 22:18:02.772356388 +0100
|
|
||||||
@@ -150,6 +150,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
diff -Naur eggdbus-0.6/src/eggdbus/Makefile.am eggdbus-0.6.patch/src/eggdbus/Makefile.am
|
|
||||||
--- eggdbus-0.6/src/eggdbus/Makefile.am 2009-02-06 21:46:49.000000000 +0100
|
|
||||||
+++ eggdbus-0.6.patch/src/eggdbus/Makefile.am 2009-11-14 22:17:37.797358224 +0100
|
|
||||||
@@ -130,7 +130,7 @@
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
|
|
||||||
- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
|
|
||||||
+ EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
|
|
||||||
--namespace EggDBus \
|
|
||||||
--dbus-namespace org.freedesktop.DBus \
|
|
||||||
--interfaces-only \
|
|
||||||
diff -Naur eggdbus-0.6/src/eggdbus/Makefile.in eggdbus-0.6.patch/src/eggdbus/Makefile.in
|
|
||||||
--- eggdbus-0.6/src/eggdbus/Makefile.in 2009-07-05 01:06:59.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/src/eggdbus/Makefile.in 2009-11-14 22:18:02.469356300 +0100
|
|
||||||
@@ -206,6 +206,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
@@ -1370,7 +1372,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
|
|
||||||
- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
|
|
||||||
+ EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
|
|
||||||
--namespace EggDBus \
|
|
||||||
--dbus-namespace org.freedesktop.DBus \
|
|
||||||
--interfaces-only \
|
|
||||||
diff -Naur eggdbus-0.6/src/Makefile.in eggdbus-0.6.patch/src/Makefile.in
|
|
||||||
--- eggdbus-0.6/src/Makefile.in 2009-07-05 01:06:58.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/src/Makefile.in 2009-11-14 22:18:02.094355991 +0100
|
|
||||||
@@ -110,6 +110,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
diff -Naur eggdbus-0.6/src/tests/Makefile.am eggdbus-0.6.patch/src/tests/Makefile.am
|
|
||||||
--- eggdbus-0.6/src/tests/Makefile.am 2009-02-03 22:09:01.000000000 +0100
|
|
||||||
+++ eggdbus-0.6.patch/src/tests/Makefile.am 2009-11-14 22:17:37.798364518 +0100
|
|
||||||
@@ -25,7 +25,7 @@
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
|
|
||||||
- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
|
|
||||||
+ EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
|
|
||||||
--namespace "Test" \
|
|
||||||
--dbus-namespace "com.example" \
|
|
||||||
--include-header testtypes.h \
|
|
||||||
diff -Naur eggdbus-0.6/src/tests/Makefile.in eggdbus-0.6.patch/src/tests/Makefile.in
|
|
||||||
--- eggdbus-0.6/src/tests/Makefile.in 2009-07-05 01:06:59.000000000 +0200
|
|
||||||
+++ eggdbus-0.6.patch/src/tests/Makefile.in 2009-11-14 22:18:02.694356123 +0100
|
|
||||||
@@ -140,6 +140,8 @@
|
|
||||||
ECHO_C = @ECHO_C@
|
|
||||||
ECHO_N = @ECHO_N@
|
|
||||||
ECHO_T = @ECHO_T@
|
|
||||||
+EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
|
|
||||||
+EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
|
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
|
||||||
FGREP = @FGREP@
|
|
||||||
@@ -839,7 +841,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
|
|
||||||
- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
|
|
||||||
+ EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
|
|
||||||
--namespace "Test" \
|
|
||||||
--dbus-namespace "com.example" \
|
|
||||||
--include-header testtypes.h \
|
|
||||||
@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
|
|||||||
PKG_SITE="http://www.gtk.org/"
|
PKG_SITE="http://www.gtk.org/"
|
||||||
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
PKG_DEPENDS="zlib $ICONV libffi pcre"
|
PKG_DEPENDS="zlib $ICONV libffi pcre"
|
||||||
PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host gtk-doc Python-host"
|
PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host Python-host"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="devel"
|
PKG_SECTION="devel"
|
||||||
PKG_SHORTDESC="glib: C support library"
|
PKG_SHORTDESC="glib: C support library"
|
||||||
|
|||||||
@ -1,27 +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 $1
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
|
||||||
mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
|
|
||||||
cp m4/introspection.m4 $SYSROOT_PREFIX/usr/share/aclocal
|
|
||||||
@ -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="gobject-introspection"
|
|
||||||
PKG_VERSION="1.34.1"
|
|
||||||
PKG_REV="1"
|
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="GPL"
|
|
||||||
PKG_SITE="http://live.gnome.org/GObjectIntrospection"
|
|
||||||
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.34/$PKG_NAME-$PKG_VERSION.tar.xz"
|
|
||||||
PKG_DEPENDS=""
|
|
||||||
PKG_BUILD_DEPENDS="toolchain"
|
|
||||||
PKG_PRIORITY="optional"
|
|
||||||
PKG_SECTION="devel"
|
|
||||||
PKG_SHORTDESC="gobject-introspection: Introspection for GObject libraries"
|
|
||||||
PKG_LONGDESC="Introspection for GObject libraries."
|
|
||||||
PKG_IS_ADDON="no"
|
|
||||||
|
|
||||||
PKG_AUTORECONF="no"
|
|
||||||
@ -0,0 +1,117 @@
|
|||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c
|
||||||
|
index 3146eec..c3a112e 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c
|
||||||
|
@@ -1550,7 +1550,7 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
|
||||||
|
}
|
||||||
|
|
||||||
|
vma->vm_flags |= VM_IO;
|
||||||
|
- vma->vm_flags |= VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
|
||||||
|
pos = cam->frame[i].bufmem;
|
||||||
|
while (size > 0) { /* size is page-aligned */
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/meye.c b/linux-tbs-drivers/linux/drivers/media/video/meye.c
|
||||||
|
index 2b7b1db..c80a3c5 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/meye.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/meye.c
|
||||||
|
@@ -1708,7 +1708,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma)
|
||||||
|
|
||||||
|
vma->vm_ops = &meye_vm_ops;
|
||||||
|
vma->vm_flags &= ~VM_IO; /* not I/O memory */
|
||||||
|
- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */
|
||||||
|
vma->vm_private_data = (void *) (offset / gbufsize);
|
||||||
|
meye_vm_open(vma);
|
||||||
|
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c
|
||||||
|
index b5ef362..b8119fe 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c
|
||||||
|
@@ -896,7 +896,7 @@ static int omap_vout_mmap(struct file *file, struct vm_area_struct *vma)
|
||||||
|
|
||||||
|
q->bufs[i]->baddr = vma->vm_start;
|
||||||
|
|
||||||
|
- vma->vm_flags |= VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||||
|
vma->vm_ops = &omap_vout_vm_ops;
|
||||||
|
vma->vm_private_data = (void *) vout;
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c
|
||||||
|
index 32aa3c2..49d7042 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c
|
||||||
|
@@ -2130,7 +2130,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
|
||||||
|
}
|
||||||
|
|
||||||
|
vma->vm_flags |= VM_IO;
|
||||||
|
- vma->vm_flags |= VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
|
||||||
|
pos = cam->frame[i].bufmem;
|
||||||
|
while (size > 0) { /* size is page-aligned */
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c
|
||||||
|
index 5a74f5e..5791c67 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c
|
||||||
|
@@ -1091,7 +1091,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
|
||||||
|
|
||||||
|
/* VM_IO is eventually going to replace PageReserved altogether */
|
||||||
|
vma->vm_flags |= VM_IO;
|
||||||
|
- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */
|
||||||
|
|
||||||
|
pos = usbvision->frame[i].data;
|
||||||
|
while (size > 0) {
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c
|
||||||
|
index f163a3a..844adad 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c
|
||||||
|
@@ -586,7 +586,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||||
|
map->count = 1;
|
||||||
|
map->q = q;
|
||||||
|
vma->vm_ops = &videobuf_vm_ops;
|
||||||
|
- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */
|
||||||
|
vma->vm_private_data = map;
|
||||||
|
dprintk(1, "mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n",
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c
|
||||||
|
index 9f5632c..21375fa 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c
|
||||||
|
@@ -274,7 +274,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
||||||
|
}
|
||||||
|
|
||||||
|
vma->vm_ops = &videobuf_vm_ops;
|
||||||
|
- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
vma->vm_private_data = map;
|
||||||
|
|
||||||
|
dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n",
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c
|
||||||
|
index f542538..f330bf0 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c
|
||||||
|
@@ -176,7 +176,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
vma->vm_private_data = priv;
|
||||||
|
vma->vm_ops = vm_ops;
|
||||||
|
|
||||||
|
diff --git a/linux-tbs-drivers/linux/drivers/media/video/vino.c b/linux-tbs-drivers/linux/drivers/media/video/vino.c
|
||||||
|
index 52a0a37..7a40e12 100755
|
||||||
|
--- a/linux-tbs-drivers/linux/drivers/media/video/vino.c
|
||||||
|
+++ b/linux-tbs-drivers/linux/drivers/media/video/vino.c
|
||||||
|
@@ -3950,7 +3950,7 @@ found:
|
||||||
|
|
||||||
|
fb->map_count = 1;
|
||||||
|
|
||||||
|
- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
|
||||||
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
||||||
|
vma->vm_flags &= ~VM_IO;
|
||||||
|
vma->vm_private_data = fb;
|
||||||
|
vma->vm_file = file;
|
||||||
@ -32,3 +32,11 @@ unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
|
|||||||
tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${PKG_NAME}-${PKG_VERSION}
|
tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${PKG_NAME}-${PKG_VERSION}
|
||||||
# fix permissions
|
# fix permissions
|
||||||
chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/*
|
chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/*
|
||||||
|
|
||||||
|
echo "### Applying upstream patches ###"
|
||||||
|
|
||||||
|
for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
|
||||||
|
cat $patch | patch -d \
|
||||||
|
`echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
|
||||||
|
done
|
||||||
|
|
||||||
|
|||||||
@ -19,13 +19,12 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="linux"
|
PKG_NAME="linux"
|
||||||
PKG_VERSION="3.7.2"
|
PKG_VERSION="3.7.3"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.kernel.org"
|
PKG_SITE="http://www.kernel.org"
|
||||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
#PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/testing/$PKG_NAME-$PKG_VERSION.tar.xz"
|
|
||||||
PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER"
|
PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER"
|
||||||
PKG_BUILD_DEPENDS="toolchain module-init-tools xz cpio pciutils"
|
PKG_BUILD_DEPENDS="toolchain module-init-tools xz cpio pciutils"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-theme-Confluence"
|
PKG_NAME="xbmc-theme-Confluence"
|
||||||
PKG_VERSION="648b6fc"
|
PKG_VERSION="966a6cc"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
|||||||
@ -19,13 +19,13 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc"
|
PKG_NAME="xbmc"
|
||||||
PKG_VERSION="648b6fc"
|
PKG_VERSION="966a6cc"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.xbmc.org"
|
PKG_SITE="http://www.xbmc.org"
|
||||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl sqlite bc xbmc-addon-settings"
|
PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl sqlite xbmc-addon-settings"
|
||||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite"
|
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="mediacenter"
|
PKG_SECTION="mediacenter"
|
||||||
|
|||||||
@ -0,0 +1,24 @@
|
|||||||
|
From 61faa9f05d3d78a68c8a317420391eb77ae0ef7a Mon Sep 17 00:00:00 2001
|
||||||
|
From: xbmc <fernetmenta@online.de>
|
||||||
|
Date: Thu, 17 Jan 2013 16:03:22 +0100
|
||||||
|
Subject: [PATCH] X11: add keymapping for XF86XK_Sleep
|
||||||
|
|
||||||
|
---
|
||||||
|
xbmc/windowing/WinEventsX11.cpp | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp
|
||||||
|
index c31877e..ed31c04 100644
|
||||||
|
--- a/xbmc/windowing/WinEventsX11.cpp
|
||||||
|
+++ b/xbmc/windowing/WinEventsX11.cpp
|
||||||
|
@@ -143,6 +143,7 @@
|
||||||
|
, {XK_Break, XBMCK_BREAK}
|
||||||
|
, {XK_Menu, XBMCK_MENU}
|
||||||
|
, {XF86XK_PowerOff, XBMCK_POWER}
|
||||||
|
+, {XF86XK_Sleep, XBMCK_SLEEP}
|
||||||
|
, {XK_EcuSign, XBMCK_EURO}
|
||||||
|
, {XK_Undo, XBMCK_UNDO}
|
||||||
|
/* Media keys */
|
||||||
|
--
|
||||||
|
1.7.10
|
||||||
|
|
||||||
@ -1,168 +0,0 @@
|
|||||||
From 453e2b2c40ba023bc4f092601931ca51f64bd88b Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Tue, 15 Jan 2013 20:55:48 +0000
|
|
||||||
Subject: [PATCH] [rbp] Apply volume control at audio_mixer when possible
|
|
||||||
|
|
||||||
---
|
|
||||||
xbmc/cores/omxplayer/OMXAudio.cpp | 105 +++++++++++++++++++++++++++----------
|
|
||||||
1 file changed, 78 insertions(+), 27 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
|
|
||||||
index 5399b10..a19004a 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
|
|
||||||
@@ -37,10 +37,6 @@
|
|
||||||
#include "guilib/LocalizeStrings.h"
|
|
||||||
#include "cores/AudioEngine/Utils/AEConvert.h"
|
|
||||||
|
|
||||||
-#ifndef VOLUME_MINIMUM
|
|
||||||
-#define VOLUME_MINIMUM -6000 // -60dB
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
#define OMX_MAX_CHANNELS 10
|
|
||||||
@@ -77,6 +73,19 @@
|
|
||||||
|
|
||||||
static const uint16_t DTSFSCod [] = {0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 0, 0};
|
|
||||||
|
|
||||||
+// 7.1 downmixing coefficients
|
|
||||||
+const float downmixing_coefficients_8[OMX_AUDIO_MAXCHANNELS] = {
|
|
||||||
+ // L R
|
|
||||||
+ /* L */ 1, 0,
|
|
||||||
+ /* R */ 0, 1,
|
|
||||||
+ /* C */ 0.7071, 0.7071,
|
|
||||||
+ /* LFE */ 0.7071, 0.7071,
|
|
||||||
+ /* Ls */ 0.7071, 0,
|
|
||||||
+ /* Rs */ 0, 0.7071,
|
|
||||||
+ /* Lr */ 0.7071, 0,
|
|
||||||
+ /* Rr */ 0, 0.7071
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
|
||||||
// Construction/Destruction
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
|
||||||
@@ -198,8 +207,6 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device, OMXClock *
|
|
||||||
|
|
||||||
m_drc = 0;
|
|
||||||
|
|
||||||
- m_CurrentVolume = g_settings.m_fVolumeLevel;
|
|
||||||
-
|
|
||||||
memset(m_input_channels, 0x0, sizeof(m_input_channels));
|
|
||||||
memset(m_output_channels, 0x0, sizeof(m_output_channels));
|
|
||||||
memset(&m_wave_header, 0x0, sizeof(m_wave_header));
|
|
||||||
@@ -545,8 +552,6 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device, OMXClock *
|
|
||||||
m_first_frame = true;
|
|
||||||
m_last_pts = DVD_NOPTS_VALUE;
|
|
||||||
|
|
||||||
- SetCurrentVolume(m_CurrentVolume);
|
|
||||||
-
|
|
||||||
CLog::Log(LOGDEBUG, "COMXAudio::Initialize Ouput bps %d samplerate %d channels %d buffer size %d bytes per second %d",
|
|
||||||
(int)m_pcm_output.nBitPerSample, (int)m_pcm_output.nSamplingRate, (int)m_pcm_output.nChannels, m_BufferLen, m_BytesPerSec);
|
|
||||||
CLog::Log(LOGDEBUG, "COMXAudio::Initialize Input bps %d samplerate %d channels %d buffer size %d bytes per second %d",
|
|
||||||
@@ -694,20 +699,76 @@ bool COMXAudio::SetCurrentVolume(float fVolume)
|
|
||||||
CSingleLock lock (m_critSection);
|
|
||||||
|
|
||||||
if(!m_Initialized || m_Passthrough)
|
|
||||||
- return -1;
|
|
||||||
-
|
|
||||||
+ return false;
|
|
||||||
+ double gain = pow(10, (g_advancedSettings.m_ac3Gain - 12.0f) / 20.0);
|
|
||||||
m_CurrentVolume = fVolume;
|
|
||||||
|
|
||||||
- OMX_AUDIO_CONFIG_VOLUMETYPE volume;
|
|
||||||
- OMX_INIT_STRUCTURE(volume);
|
|
||||||
- volume.nPortIndex = m_omx_render->GetInputPort();
|
|
||||||
+ if (m_format.m_channelLayout.Count() > 2)
|
|
||||||
+ {
|
|
||||||
+ double r = fVolume;
|
|
||||||
+ const float* coeff = downmixing_coefficients_8;
|
|
||||||
+ int input_channels = 0;
|
|
||||||
+
|
|
||||||
+ // normally we normalalise the levels, can be skipped (boosted) at risk of distortion
|
|
||||||
+ if(!g_guiSettings.GetBool("audiooutput.normalizelevels"))
|
|
||||||
+ {
|
|
||||||
+ double sum_L = 0;
|
|
||||||
+ double sum_R = 0;
|
|
||||||
+
|
|
||||||
+ for(size_t i = 0; i < OMX_AUDIO_MAXCHANNELS; ++i)
|
|
||||||
+ {
|
|
||||||
+ if (m_input_channels[i] == OMX_AUDIO_ChannelMax)
|
|
||||||
+ break;
|
|
||||||
+ if(i & 1)
|
|
||||||
+ sum_R += coeff[i];
|
|
||||||
+ else
|
|
||||||
+ sum_L += coeff[i];
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ r /= max(sum_L, sum_R);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // the analogue volume is too quiet for some. Allow use of an advancedsetting to boost this (at risk of distortion)
|
|
||||||
+ r *= gain;
|
|
||||||
|
|
||||||
- volume.bLinear = OMX_TRUE;
|
|
||||||
- float hardwareVolume = std::max(VOLUME_MINIMUM, std::min(VOLUME_MAXIMUM, fVolume)) * 100.0f;
|
|
||||||
- volume.sVolume.nValue = (int)hardwareVolume;
|
|
||||||
+ OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS mix;
|
|
||||||
+ OMX_INIT_STRUCTURE(mix);
|
|
||||||
+ mix.nPortIndex = m_omx_mixer.GetInputPort();
|
|
||||||
|
|
||||||
- m_omx_render->SetConfig(OMX_IndexConfigAudioVolume, &volume);
|
|
||||||
+ assert(sizeof(mix.coeff)/sizeof(mix.coeff[0]) == 16);
|
|
||||||
|
|
||||||
+ for(size_t i = 0; i < 16; ++i)
|
|
||||||
+ mix.coeff[i] = static_cast<unsigned int>(0x10000 * (coeff[i] * r));
|
|
||||||
+
|
|
||||||
+ OMX_ERRORTYPE omx_err =
|
|
||||||
+ m_omx_mixer.SetConfig(OMX_IndexConfigBrcmAudioDownmixCoefficients, &mix);
|
|
||||||
+
|
|
||||||
+ if(omx_err != OMX_ErrorNone)
|
|
||||||
+ {
|
|
||||||
+ CLog::Log(LOGERROR, "%s::%s - error setting OMX_IndexConfigBrcmAudioDownmixCoefficients, error 0x%08x\n",
|
|
||||||
+ CLASSNAME, __func__, omx_err);
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ OMX_AUDIO_CONFIG_VOLUMETYPE volume;
|
|
||||||
+ OMX_INIT_STRUCTURE(volume);
|
|
||||||
+ volume.nPortIndex = m_omx_render->GetInputPort();
|
|
||||||
+
|
|
||||||
+ volume.bLinear = OMX_TRUE;
|
|
||||||
+ float hardwareVolume = fVolume * gain * 100.0f;
|
|
||||||
+ volume.sVolume.nValue = (int)(hardwareVolume + 0.5f);
|
|
||||||
+
|
|
||||||
+ OMX_ERRORTYPE omx_err =
|
|
||||||
+ m_omx_render->SetConfig(OMX_IndexConfigAudioVolume, &volume);
|
|
||||||
+ if(omx_err != OMX_ErrorNone)
|
|
||||||
+ {
|
|
||||||
+ CLog::Log(LOGERROR, "%s::%s - error setting OMX_IndexConfigAudioVolume, error 0x%08x\n",
|
|
||||||
+ CLASSNAME, __func__, omx_err);
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -885,16 +946,6 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if ((m_pcm_input.nChannels > m_pcm_output.nChannels) &&g_guiSettings.GetBool("audiooutput.normalizelevels"))
|
|
||||||
- {
|
|
||||||
- OMX_AUDIO_CONFIG_VOLUMETYPE volume;
|
|
||||||
- OMX_INIT_STRUCTURE(volume);
|
|
||||||
- volume.nPortIndex = m_omx_mixer.GetInputPort();
|
|
||||||
- volume.bLinear = OMX_FALSE;
|
|
||||||
- volume.sVolume.nValue = (int)(g_advancedSettings.m_ac3Gain*100.0f+0.5f);
|
|
||||||
- m_omx_mixer.SetConfig(OMX_IndexConfigAudioVolume, &volume);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
memcpy(m_pcm_input.eChannelMapping, m_input_channels, sizeof(m_input_channels));
|
|
||||||
m_pcm_input.nSamplingRate = m_format.m_sampleRate;
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.10
|
|
||||||
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
From 5f33482f3bd2993576c6f7f616df68a9d6846d81 Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Tue, 15 Jan 2013 20:46:07 +0000
|
|
||||||
Subject: [PATCH] [rbp] Fix for audio out of sync part 2
|
|
||||||
|
|
||||||
---
|
|
||||||
xbmc/cores/omxplayer/OMXAudio.cpp | 2 ++
|
|
||||||
xbmc/cores/omxplayer/OMXVideo.cpp | 24 ++++++++++++++++++------
|
|
||||||
xbmc/cores/omxplayer/OMXVideo.h | 2 +-
|
|
||||||
3 files changed, 21 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
|
|
||||||
index 5399b10..1b2a1ef 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
|
|
||||||
@@ -805,6 +805,8 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
|
|
||||||
if(m_av_clock->AudioStart())
|
|
||||||
{
|
|
||||||
omx_buffer->nFlags = OMX_BUFFERFLAG_STARTTIME;
|
|
||||||
+ if(pts == DVD_NOPTS_VALUE)
|
|
||||||
+ omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN;
|
|
||||||
|
|
||||||
m_last_pts = pts;
|
|
||||||
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
|
|
||||||
index b11aa22..0464790 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXVideo.cpp
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXVideo.cpp
|
|
||||||
@@ -84,7 +84,6 @@
|
|
||||||
m_deinterlace = false;
|
|
||||||
m_hdmi_clock_sync = false;
|
|
||||||
m_first_frame = true;
|
|
||||||
- m_contains_valid_pts= false;
|
|
||||||
}
|
|
||||||
|
|
||||||
COMXVideo::~COMXVideo()
|
|
||||||
@@ -666,6 +665,9 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b
|
|
||||||
m_deinterlace, m_hdmi_clock_sync);
|
|
||||||
|
|
||||||
m_first_frame = true;
|
|
||||||
+ // start from assuming all recent frames had valid pts
|
|
||||||
+ m_history_valid_pts = ~0;
|
|
||||||
+
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -720,6 +722,14 @@ unsigned int COMXVideo::GetSize()
|
|
||||||
return m_omx_decoder.GetInputBufferSize();
|
|
||||||
}
|
|
||||||
|
|
||||||
+static unsigned count_bits(int32_t value)
|
|
||||||
+{
|
|
||||||
+ unsigned bits = 0;
|
|
||||||
+ for(;value;++bits)
|
|
||||||
+ value &= value - 1;
|
|
||||||
+ return bits;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
|
|
||||||
{
|
|
||||||
OMX_ERRORTYPE omx_err;
|
|
||||||
@@ -754,11 +764,11 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
|
|
||||||
|
|
||||||
omx_buffer->nFlags = 0;
|
|
||||||
omx_buffer->nOffset = 0;
|
|
||||||
-
|
|
||||||
- // if a stream contains any pts values, then use those with UNKNOWNs. Otherwise try using dts.
|
|
||||||
- if(pts != DVD_NOPTS_VALUE)
|
|
||||||
- m_contains_valid_pts = true;
|
|
||||||
- if(pts == DVD_NOPTS_VALUE && !m_contains_valid_pts)
|
|
||||||
+ // some packed bitstream AVI files set almost all pts values to DVD_NOPTS_VALUE, but have a scattering of real pts values.
|
|
||||||
+ // the valid pts values match the dts values.
|
|
||||||
+ // if a stream has had more than 4 valid pts values in the last 16, the use UNKNOWN, otherwise use dts
|
|
||||||
+ m_history_valid_pts = (m_history_valid_pts << 1) | (pts != DVD_NOPTS_VALUE);
|
|
||||||
+ if(pts == DVD_NOPTS_VALUE && count_bits(m_history_valid_pts & 0xffff) < 4)
|
|
||||||
pts = dts;
|
|
||||||
|
|
||||||
if(m_av_clock->VideoStart())
|
|
||||||
@@ -766,6 +776,8 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
|
|
||||||
// only send dts on first frame to get nearly correct starttime
|
|
||||||
if(pts == DVD_NOPTS_VALUE)
|
|
||||||
pts = dts;
|
|
||||||
+ if(pts == DVD_NOPTS_VALUE)
|
|
||||||
+ omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN;
|
|
||||||
omx_buffer->nFlags = OMX_BUFFERFLAG_STARTTIME;
|
|
||||||
CLog::Log(LOGDEBUG, "OMXVideo::Decode VDec : setStartTime %f\n", (pts == DVD_NOPTS_VALUE ? 0.0 : pts) / DVD_TIME_BASE);
|
|
||||||
m_av_clock->VideoStart(false);
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXVideo.h b/xbmc/cores/omxplayer/OMXVideo.h
|
|
||||||
index 24cc6c8..180c2db 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXVideo.h
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXVideo.h
|
|
||||||
@@ -90,7 +90,7 @@ class COMXVideo
|
|
||||||
bool m_deinterlace;
|
|
||||||
bool m_hdmi_clock_sync;
|
|
||||||
bool m_first_frame;
|
|
||||||
- bool m_contains_valid_pts;
|
|
||||||
+ uint32_t m_history_valid_pts;
|
|
||||||
|
|
||||||
bool NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize);
|
|
||||||
};
|
|
||||||
--
|
|
||||||
1.7.10
|
|
||||||
|
|
||||||
@ -1,184 +0,0 @@
|
|||||||
From 9f5810f159200d9736556fe28806768d9dfd6c7b Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Mon, 14 Jan 2013 20:46:29 +0000
|
|
||||||
Subject: [PATCH] Send mute commands to players not using AE
|
|
||||||
|
|
||||||
---
|
|
||||||
xbmc/Application.cpp | 38 +++++++++++++++++++++++++-----------
|
|
||||||
xbmc/cores/IPlayer.h | 2 ++
|
|
||||||
xbmc/cores/amlplayer/AMLPlayer.cpp | 5 +++++
|
|
||||||
xbmc/cores/amlplayer/AMLPlayer.h | 2 ++
|
|
||||||
xbmc/cores/omxplayer/OMXPlayer.cpp | 9 ++++++++-
|
|
||||||
xbmc/cores/omxplayer/OMXPlayer.h | 3 +++
|
|
||||||
6 files changed, 47 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
|
|
||||||
index 4c79137..b453e9f 100644
|
|
||||||
--- a/xbmc/Application.cpp
|
|
||||||
+++ b/xbmc/Application.cpp
|
|
||||||
@@ -4117,6 +4117,13 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
|
|
||||||
SetPlaySpeed(iSpeed);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // if player has volume control, set it.
|
|
||||||
+ if (m_pPlayer && m_pPlayer->ControlsVolume())
|
|
||||||
+ {
|
|
||||||
+ m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
|
|
||||||
+ m_pPlayer->SetMute(g_settings.m_bMute);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if( IsPlayingAudio() )
|
|
||||||
{
|
|
||||||
if (g_windowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
|
|
||||||
@@ -5383,10 +5390,6 @@ void CApplication::SetHardwareVolume(float hardwareVolume)
|
|
||||||
value = 1.0f;
|
|
||||||
|
|
||||||
CAEFactory::SetVolume(value);
|
|
||||||
-
|
|
||||||
- /* for platforms where we do not have AE */
|
|
||||||
- if (!CAEFactory::GetEngine() && m_pPlayer)
|
|
||||||
- m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
|
|
||||||
}
|
|
||||||
|
|
||||||
int CApplication::GetVolume() const
|
|
||||||
@@ -5401,6 +5404,13 @@ void CApplication::VolumeChanged() const
|
|
||||||
data["volume"] = GetVolume();
|
|
||||||
data["muted"] = g_settings.m_bMute;
|
|
||||||
CAnnouncementManager::Announce(Application, "xbmc", "OnVolumeChanged", data);
|
|
||||||
+
|
|
||||||
+ // if player has volume control, set it.
|
|
||||||
+ if (m_pPlayer && m_pPlayer->ControlsVolume())
|
|
||||||
+ {
|
|
||||||
+ m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
|
|
||||||
+ m_pPlayer->SetMute(g_settings.m_bMute);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
int CApplication::GetSubtitleDelay() const
|
|
||||||
@@ -5437,13 +5447,19 @@ void CApplication::SetPlaySpeed(int iSpeed)
|
|
||||||
m_iPlaySpeed = iSpeed;
|
|
||||||
|
|
||||||
m_pPlayer->ToFFRW(m_iPlaySpeed);
|
|
||||||
- if (m_iPlaySpeed == 1)
|
|
||||||
- { // restore volume
|
|
||||||
- m_pPlayer->SetVolume(VOLUME_MAXIMUM);
|
|
||||||
- }
|
|
||||||
- else
|
|
||||||
- { // mute volume
|
|
||||||
- m_pPlayer->SetVolume(VOLUME_MINIMUM);
|
|
||||||
+
|
|
||||||
+ // if player has volume control, set it.
|
|
||||||
+ if (m_pPlayer->ControlsVolume())
|
|
||||||
+ {
|
|
||||||
+ if (m_iPlaySpeed == 1)
|
|
||||||
+ { // restore volume
|
|
||||||
+ m_pPlayer->SetVolume(VOLUME_MAXIMUM);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ { // mute volume
|
|
||||||
+ m_pPlayer->SetVolume(VOLUME_MINIMUM);
|
|
||||||
+ }
|
|
||||||
+ m_pPlayer->SetMute(g_settings.m_bMute);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
|
|
||||||
index 2042026..f2aa227 100644
|
|
||||||
--- a/xbmc/cores/IPlayer.h
|
|
||||||
+++ b/xbmc/cores/IPlayer.h
|
|
||||||
@@ -114,6 +114,8 @@ class IPlayer
|
|
||||||
virtual void SeekPercentage(float fPercent = 0){}
|
|
||||||
virtual float GetPercentage(){ return 0;}
|
|
||||||
virtual float GetCachePercentage(){ return 0;}
|
|
||||||
+ virtual bool ControlsVolume(){ return false;}
|
|
||||||
+ virtual void SetMute(bool bOnOff){}
|
|
||||||
virtual void SetVolume(float volume){}
|
|
||||||
virtual void SetDynamicRangeCompression(long drc){}
|
|
||||||
virtual void GetAudioInfo( CStdString& strAudioInfo) = 0;
|
|
||||||
diff --git a/xbmc/cores/amlplayer/AMLPlayer.cpp b/xbmc/cores/amlplayer/AMLPlayer.cpp
|
|
||||||
index 13014e2..0aee9a9 100644
|
|
||||||
--- a/xbmc/cores/amlplayer/AMLPlayer.cpp
|
|
||||||
+++ b/xbmc/cores/amlplayer/AMLPlayer.cpp
|
|
||||||
@@ -777,6 +777,11 @@ float CAMLPlayer::GetPercentage()
|
|
||||||
return 0.0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
+void CAMLPlayer::SetMute(bool bOnOff)
|
|
||||||
+{
|
|
||||||
+ // TODO: set mute
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void CAMLPlayer::SetVolume(float volume)
|
|
||||||
{
|
|
||||||
CLog::Log(LOGDEBUG, "CAMLPlayer::SetVolume(%f)", volume);
|
|
||||||
diff --git a/xbmc/cores/amlplayer/AMLPlayer.h b/xbmc/cores/amlplayer/AMLPlayer.h
|
|
||||||
index 54d8fae..39c8913 100644
|
|
||||||
--- a/xbmc/cores/amlplayer/AMLPlayer.h
|
|
||||||
+++ b/xbmc/cores/amlplayer/AMLPlayer.h
|
|
||||||
@@ -80,6 +80,8 @@ class CAMLPlayer : public IPlayer, public CThread
|
|
||||||
virtual bool SeekScene(bool bPlus = true);
|
|
||||||
virtual void SeekPercentage(float fPercent = 0.0f);
|
|
||||||
virtual float GetPercentage();
|
|
||||||
+ virtual void SetMute(bool bOnOff);
|
|
||||||
+ virtual bool ControlsVolume() {return true;}
|
|
||||||
virtual void SetVolume(float volume);
|
|
||||||
virtual void SetDynamicRangeCompression(long drc) {}
|
|
||||||
virtual void GetAudioInfo(CStdString &strAudioInfo);
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
|
|
||||||
index aac591c..ea02693 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
|
|
||||||
@@ -460,6 +460,7 @@ bool COMXPlayer::OpenFile(const CFileItem &file, const CPlayerOptions &options)
|
|
||||||
m_UpdateApplication = 0;
|
|
||||||
m_offset_pts = 0;
|
|
||||||
m_current_volume = 0;
|
|
||||||
+ m_current_mute = false;
|
|
||||||
m_change_volume = true;
|
|
||||||
|
|
||||||
m_item = file;
|
|
||||||
@@ -1262,7 +1263,7 @@ void COMXPlayer::Process()
|
|
||||||
|
|
||||||
if(m_change_volume)
|
|
||||||
{
|
|
||||||
- m_player_audio.SetCurrentVolume(m_current_volume);
|
|
||||||
+ m_player_audio.SetCurrentVolume(m_current_mute ? VOLUME_MINIMUM : m_current_volume);
|
|
||||||
m_change_volume = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -4134,6 +4135,12 @@ void COMXPlayer::GetVideoRect(CRect& SrcRect, CRect& DestRect)
|
|
||||||
g_renderManager.GetVideoRect(SrcRect, DestRect);
|
|
||||||
}
|
|
||||||
|
|
||||||
+void COMXPlayer::SetMute(bool bOnOff)
|
|
||||||
+{
|
|
||||||
+ m_current_mute = bOnOff;
|
|
||||||
+ m_change_volume = true;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void COMXPlayer::SetVolume(float fVolume)
|
|
||||||
{
|
|
||||||
m_current_volume = fVolume;
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXPlayer.h b/xbmc/cores/omxplayer/OMXPlayer.h
|
|
||||||
index 3a2a63d..d606e84 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXPlayer.h
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXPlayer.h
|
|
||||||
@@ -227,6 +227,8 @@ class COMXPlayer : public IPlayer, public CThread, public IDVDPlayer
|
|
||||||
virtual float GetPercentage();
|
|
||||||
virtual float GetCachePercentage();
|
|
||||||
|
|
||||||
+ virtual void SetMute(bool bOnOff);
|
|
||||||
+ virtual bool ControlsVolume() {return true;}
|
|
||||||
virtual void SetVolume(float fVolume);
|
|
||||||
virtual void SetDynamicRangeCompression(long drc) {}
|
|
||||||
virtual void GetAudioInfo(CStdString &strAudioInfo);
|
|
||||||
@@ -484,6 +486,7 @@ class COMXPlayer : public IPlayer, public CThread, public IDVDPlayer
|
|
||||||
CEvent m_ready;
|
|
||||||
|
|
||||||
float m_current_volume;
|
|
||||||
+ bool m_current_mute;
|
|
||||||
bool m_change_volume;
|
|
||||||
CDVDOverlayContainer m_overlayContainer;
|
|
||||||
ECacheState m_caching;
|
|
||||||
--
|
|
||||||
1.7.10
|
|
||||||
|
|
||||||
@ -1,95 +0,0 @@
|
|||||||
From 67319ef389d0b664c92fa1753ba2bbdf4257dfbe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Raue <stephan@openelec.tv>
|
|
||||||
Date: Sun, 13 Jan 2013 19:21:34 +0100
|
|
||||||
Subject: [PATCH] [automake] remove long time deprecated automake macros and
|
|
||||||
variables which are removed finally in automake-1.13
|
|
||||||
|
|
||||||
Signed-off-by: Stephan Raue <stephan@openelec.tv>
|
|
||||||
---
|
|
||||||
lib/enca/configure.ac | 3 +--
|
|
||||||
lib/libdvd/libdvdcss/configure.ac | 2 +-
|
|
||||||
lib/libmad/configure.ac | 2 +-
|
|
||||||
lib/libmicrohttpd/configure.ac | 2 +-
|
|
||||||
xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in | 3 +--
|
|
||||||
5 files changed, 5 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lib/enca/configure.ac b/lib/enca/configure.ac
|
|
||||||
index e4aad8c..41434df 100644
|
|
||||||
--- a/lib/enca/configure.ac
|
|
||||||
+++ b/lib/enca/configure.ac
|
|
||||||
@@ -24,7 +24,7 @@ AC_CONFIG_FILES( \
|
|
||||||
test/Makefile \
|
|
||||||
tools/Makefile)
|
|
||||||
|
|
||||||
-AM_CONFIG_HEADER(config.h)
|
|
||||||
+AC_CONFIG_HEADERS(config.h)
|
|
||||||
AM_INIT_AUTOMAKE([1.8 gnits check-news dist-bzip2])
|
|
||||||
AM_ACLOCAL_INCLUDE(m4)
|
|
||||||
AM_MAINTAINER_MODE
|
|
||||||
@@ -40,7 +40,6 @@ AC_GNU_SOURCE
|
|
||||||
AC_AIX
|
|
||||||
AC_ISC_POSIX
|
|
||||||
AC_PROG_LIBTOOL
|
|
||||||
-AM_PROG_CC_STDC
|
|
||||||
AM_PROG_CC_C_O
|
|
||||||
AC_PROG_INSTALL
|
|
||||||
AC_PROG_LN_S
|
|
||||||
diff --git a/lib/libdvd/libdvdcss/configure.ac b/lib/libdvd/libdvdcss/configure.ac
|
|
||||||
index 1b9ff8b..a40a161 100644
|
|
||||||
--- a/lib/libdvd/libdvdcss/configure.ac
|
|
||||||
+++ b/lib/libdvd/libdvdcss/configure.ac
|
|
||||||
@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.auto)
|
|
||||||
AC_CANONICAL_SYSTEM
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE(libdvdcss, 1.2.10)
|
|
||||||
-AM_CONFIG_HEADER(config.h)
|
|
||||||
+AC_CONFIG_HEADERS(config.h)
|
|
||||||
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_STDC_HEADERS
|
|
||||||
diff --git a/lib/libmad/configure.ac b/lib/libmad/configure.ac
|
|
||||||
index bc19d8e..e137ca6 100644
|
|
||||||
--- a/lib/libmad/configure.ac
|
|
||||||
+++ b/lib/libmad/configure.ac
|
|
||||||
@@ -28,7 +28,7 @@ AC_CONFIG_SRCDIR([decoder.h])
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE
|
|
||||||
|
|
||||||
-AM_CONFIG_HEADER([config.h])
|
|
||||||
+AC_CONFIG_HEADERS([config.h])
|
|
||||||
|
|
||||||
dnl System type.
|
|
||||||
|
|
||||||
diff --git a/lib/libmicrohttpd/configure.ac b/lib/libmicrohttpd/configure.ac
|
|
||||||
index b314357..c00e55b 100644
|
|
||||||
--- a/lib/libmicrohttpd/configure.ac
|
|
||||||
+++ b/lib/libmicrohttpd/configure.ac
|
|
||||||
@@ -23,7 +23,7 @@
|
|
||||||
AC_PREREQ(2.57)
|
|
||||||
AC_INIT([libmicrohttpd], [0.4.5],[libmicrohttpd@gnu.org])
|
|
||||||
AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.5])
|
|
||||||
-AM_CONFIG_HEADER([MHD_config.h])
|
|
||||||
+AC_CONFIG_HEADERS([MHD_config.h])
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
AH_TOP([#define _GNU_SOURCE 1])
|
|
||||||
|
|
||||||
diff --git a/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in
|
|
||||||
index 4e94d4b..cc0646f 100644
|
|
||||||
--- a/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in
|
|
||||||
+++ b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in
|
|
||||||
@@ -2,11 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
|
|
||||||
|
|
||||||
AC_INIT(configure.in)
|
|
||||||
AM_INIT_AUTOMAKE(goom2, 0.1)
|
|
||||||
-AM_CONFIG_HEADER(config.h)
|
|
||||||
+AC_CONFIG_HEADERS(config.h)
|
|
||||||
|
|
||||||
AC_ISC_POSIX
|
|
||||||
AC_PROG_CC
|
|
||||||
-AM_PROG_CC_STDC
|
|
||||||
AC_HEADER_STDC
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.10
|
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ PKG_REV="1"
|
|||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="LGPL"
|
PKG_LICENSE="LGPL"
|
||||||
PKG_SITE="https://www.dlitz.net/software/pycrypto/"
|
PKG_SITE="https://www.dlitz.net/software/pycrypto/"
|
||||||
PKG_URL="http://ftp.dlitz.net/pub/dlitz/crypto/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
PKG_URL="http://pypi.python.org/packages/source/p/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||||
PKG_DEPENDS="Python distutilscross"
|
PKG_DEPENDS="Python distutilscross"
|
||||||
PKG_BUILD_DEPENDS="toolchain Python distutilscross"
|
PKG_BUILD_DEPENDS="toolchain Python distutilscross"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
|||||||
PKG_LICENSE="MIT"
|
PKG_LICENSE="MIT"
|
||||||
PKG_SITE="http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary"
|
PKG_SITE="http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary"
|
||||||
PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||||
PKG_DEPENDS="zlib sg3_utils glib systemd eggdbus expat"
|
PKG_DEPENDS="zlib sg3_utils glib systemd expat"
|
||||||
PKG_BUILD_DEPENDS="toolchain zlib sg3_utils glib systemd eggdbus expat gobject-introspection"
|
PKG_BUILD_DEPENDS="toolchain zlib sg3_utils glib systemd expat"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="security"
|
PKG_SECTION="security"
|
||||||
PKG_SHORTDESC="polkit: Authorization Toolkit"
|
PKG_SHORTDESC="polkit: Authorization Toolkit"
|
||||||
|
|||||||
@ -26,12 +26,16 @@
|
|||||||
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
|
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
|
||||||
|
|
||||||
# hack: add addons to $PATH
|
# hack: add addons to $PATH
|
||||||
for addons in `find /storage/.xbmc/addons/* -name bin -type d`; do
|
for addon in /storage/.xbmc/addons/*/bin; do
|
||||||
PATH="$PATH:$addons"
|
if [ -d "$addon" ] ; then
|
||||||
|
PATH="$PATH:$addon"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for sys in `find /usr/lib/xbmc/addons/* -name bin -type d`; do
|
for sys in /usr/lib/xbmc/addons/*/bin; do
|
||||||
PATH="$PATH:$sys"
|
if [ -d "$sys" ] ; then
|
||||||
|
PATH="$PATH:$sys"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
export PATH
|
export PATH
|
||||||
|
|||||||
@ -664,11 +664,11 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
|
|||||||
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
|
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
|
||||||
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
|
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
|
||||||
# CONFIG_CHRT is not set
|
# CONFIG_CHRT is not set
|
||||||
# CONFIG_CROND is not set
|
CONFIG_CROND=y
|
||||||
# CONFIG_FEATURE_CROND_D is not set
|
CONFIG_FEATURE_CROND_D=y
|
||||||
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
|
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
|
||||||
CONFIG_FEATURE_CROND_DIR=""
|
CONFIG_FEATURE_CROND_DIR="/storage/.cache/cron"
|
||||||
# CONFIG_CRONTAB is not set
|
CONFIG_CRONTAB=y
|
||||||
# CONFIG_DC is not set
|
# CONFIG_DC is not set
|
||||||
# CONFIG_FEATURE_DC_LIBM is not set
|
# CONFIG_FEATURE_DC_LIBM is not set
|
||||||
# CONFIG_DEVFSD is not set
|
# CONFIG_DEVFSD is not set
|
||||||
|
|||||||
@ -60,6 +60,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
# read config files
|
# read config files
|
||||||
for config in `ls /etc/profile.d/`; do
|
for config in /etc/profile.d/*; do
|
||||||
. /etc/profile.d/$config
|
if [ -f "$config" ] ; then
|
||||||
|
. $config
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
@ -68,3 +68,12 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
|
|||||||
|
|
||||||
mkdir -p $INSTALL/usr/www/error
|
mkdir -p $INSTALL/usr/www/error
|
||||||
echo "404" > $INSTALL/usr/www/error/404.html
|
echo "404" > $INSTALL/usr/www/error/404.html
|
||||||
|
|
||||||
|
# cron support
|
||||||
|
if [ "$CRON_SUPPORT" = "yes" ] ; then
|
||||||
|
mkdir -p $INSTALL/etc/init.d
|
||||||
|
cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/
|
||||||
|
else
|
||||||
|
rm -f $INSTALL/sbin/crond
|
||||||
|
rm -f $INSTALL/bin/crontab
|
||||||
|
fi
|
||||||
|
|||||||
@ -34,3 +34,8 @@ PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into
|
|||||||
PKG_IS_ADDON="no"
|
PKG_IS_ADDON="no"
|
||||||
|
|
||||||
PKG_AUTORECONF="no"
|
PKG_AUTORECONF="no"
|
||||||
|
|
||||||
|
# nano text editor
|
||||||
|
if [ "$NANO_EDITOR" = "yes" ]; then
|
||||||
|
PKG_DEPENDS="$PKG_DEPENDS nano"
|
||||||
|
fi
|
||||||
|
|||||||
@ -28,12 +28,16 @@
|
|||||||
LD_LIBRARY_PATH="/usr/lib:/lib"
|
LD_LIBRARY_PATH="/usr/lib:/lib"
|
||||||
|
|
||||||
# hack: add addons to $LD_LIBRARY_PATH
|
# hack: add addons to $LD_LIBRARY_PATH
|
||||||
for addons in `find /storage/.xbmc/addons/* -name lib -type d`; do
|
for addon in /storage/.xbmc/addons/*/lib; do
|
||||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addons"
|
if [ -d "$addon" ] ; then
|
||||||
|
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for sys in `find /usr/lib/xbmc/addons/* -name lib -type d`; do
|
for sys in /usr/lib/xbmc/addons/*/lib; do
|
||||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
|
if [ -d "$sys" ] ; then
|
||||||
|
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
export LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH
|
||||||
|
|||||||
20
packages/addons/shell/texteditor/nano/addon → packages/sysutils/busybox/scripts/09_crond
Executable file → Normal file
20
packages/addons/shell/texteditor/nano/addon → packages/sysutils/busybox/scripts/09_crond
Executable file → Normal file
@ -1,5 +1,3 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# This file is part of OpenELEC - http://www.openelec.tv
|
# This file is part of OpenELEC - http://www.openelec.tv
|
||||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||||
@ -20,7 +18,19 @@
|
|||||||
# http://www.gnu.org/copyleft/gpl.html
|
# http://www.gnu.org/copyleft/gpl.html
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
. config/options $1
|
#
|
||||||
|
# start cron daemon
|
||||||
|
#
|
||||||
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
(
|
||||||
cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin
|
if [ -f /var/config/settings.conf ]; then
|
||||||
|
. /var/config/settings.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CROND_START" == "true" ]; then
|
||||||
|
progress "Starting cron daemon"
|
||||||
|
mkdir -p /storage/.cache/cron/crontabs
|
||||||
|
crond -b
|
||||||
|
fi
|
||||||
|
)&
|
||||||
@ -24,7 +24,8 @@ PKG_REV="1"
|
|||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://secure.netroedge.com/~lm78/"
|
PKG_SITE="http://secure.netroedge.com/~lm78/"
|
||||||
PKG_URL="http://dl.lm-sensors.org/lm-sensors/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
#PKG_URL="http://dl.lm-sensors.org/lm-sensors/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
|
PKG_URL="http://ftp.gwdg.de/pub/linux/misc/lm-sensors/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
PKG_DEPENDS="$ICONV"
|
PKG_DEPENDS="$ICONV"
|
||||||
PKG_BUILD_DEPENDS="toolchain $ICONV"
|
PKG_BUILD_DEPENDS="toolchain $ICONV"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
14
packages/sysutils/remote/eventlircd/evmap/wiimote.evmap
Normal file
14
packages/sysutils/remote/eventlircd/evmap/wiimote.evmap
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
BTN_A = KEY_OK # Ok
|
||||||
|
BTN_B = KEY_EXIT # Back/Exit
|
||||||
|
|
||||||
|
KEY_UP = KEY_UP # Up
|
||||||
|
KEY_DOWN = KEY_DOWN # Down
|
||||||
|
KEY_LEFT = KEY_LEFT # Left
|
||||||
|
KEY_RIGHT = KEY_RIGHT # Right
|
||||||
|
|
||||||
|
KEY_PREVIOUS = KEY_VOLUMEDOWN # Vol-
|
||||||
|
KEY_NEXT = KEY_VOLUMEUP # Vol+
|
||||||
|
|
||||||
|
BTN_MODE = KEY_PROG1 # Home
|
||||||
|
BTN_1 = KEY_CHANNELUP # Channel Up
|
||||||
|
BTN_2 = KEY_CHANNELDOWN # Channel Down
|
||||||
@ -162,4 +162,19 @@ ENV{ID_VENDOR_ID}=="0471", ENV{ID_MODEL_ID}=="20cc", \
|
|||||||
|
|
||||||
LABEL="end-usb"
|
LABEL="end-usb"
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Ask eventlircd to handle Bluetooth HID devices that show up as event devices
|
||||||
|
# and are known to be remote controls. For simplicity, the event map file names
|
||||||
|
# have the format <BUSTYPE>_<VENDOR>_<PRODUCT>.evmap.
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
SUBSYSTEMS=="bluetooth", GOTO="begin-bluetooth"
|
||||||
|
GOTO="end-bluetooth"
|
||||||
|
LABEL="begin-bluetooth"
|
||||||
|
|
||||||
|
ATTRS{name}=="Nintendo Wii Remote", \
|
||||||
|
ENV{eventlircd_enable}="true", \
|
||||||
|
ENV{eventlircd_evmap}="wiimote.evmap"
|
||||||
|
|
||||||
|
LABEL="end-bluetooth"
|
||||||
|
|
||||||
LABEL="end"
|
LABEL="end"
|
||||||
|
|||||||
@ -32,6 +32,7 @@
|
|||||||
export CPP=${TARGET_PREFIX}cpp
|
export CPP=${TARGET_PREFIX}cpp
|
||||||
|
|
||||||
cd $PKG_BUILD
|
cd $PKG_BUILD
|
||||||
|
ac_cv_func_malloc_0_nonnull=yes \
|
||||||
./configure --host=$TARGET_NAME \
|
./configure --host=$TARGET_NAME \
|
||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
@ -47,6 +48,11 @@ cd $PKG_BUILD
|
|||||||
--disable-ima \
|
--disable-ima \
|
||||||
--disable-selinux \
|
--disable-selinux \
|
||||||
--disable-xz \
|
--disable-xz \
|
||||||
|
--enable-kmod \
|
||||||
|
--enable-blkid \
|
||||||
|
--disable-chkconfig \
|
||||||
|
--disable-bootchart \
|
||||||
|
--disable-myhostname \
|
||||||
--disable-tcpwrap \
|
--disable-tcpwrap \
|
||||||
--disable-pam \
|
--disable-pam \
|
||||||
--disable-acl \
|
--disable-acl \
|
||||||
@ -72,9 +78,8 @@ cd $PKG_BUILD
|
|||||||
--disable-manpages \
|
--disable-manpages \
|
||||||
--enable-split-usr \
|
--enable-split-usr \
|
||||||
--with-firmware-path="/storage/.config/firmware:/lib/firmware" \
|
--with-firmware-path="/storage/.config/firmware:/lib/firmware" \
|
||||||
--with-distro=other \
|
|
||||||
--with-sysvinit-path="" \
|
--with-sysvinit-path="" \
|
||||||
--with-sysvrcd-path="" \
|
--with-sysvrcnd-path="" \
|
||||||
--with-tty-gid="5" \
|
--with-tty-gid="5" \
|
||||||
--with-rootprefix="/" \
|
--with-rootprefix="/" \
|
||||||
--with-rootlibdir="/lib"
|
--with-rootlibdir="/lib"
|
||||||
|
|||||||
@ -34,42 +34,33 @@ add_group video 39
|
|||||||
# install udev
|
# install udev
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/udevadm $INSTALL/usr/bin
|
cp $PKG_BUILD/.libs/udevadm $INSTALL/usr/bin
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib
|
mkdir -p $INSTALL/lib
|
||||||
|
cp -PR $PKG_BUILD/.libs/libsystemd-daemon.so* $INSTALL/lib
|
||||||
cp -PR $PKG_BUILD/.libs/libudev.so* $INSTALL/lib
|
cp -PR $PKG_BUILD/.libs/libudev.so* $INSTALL/lib
|
||||||
cp -PR $PKG_BUILD/.libs/libgudev*.so* $INSTALL/lib
|
cp -PR $PKG_BUILD/.libs/libgudev*.so* $INSTALL/lib
|
||||||
rm -rf $INSTALL/lib/libgudev*.*T
|
rm -rf $INSTALL/lib/libgudev*.*T
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib/systemd
|
mkdir -p $INSTALL/lib/systemd
|
||||||
cp $PKG_BUILD/systemd-udevd $INSTALL/lib/systemd
|
cp $PKG_BUILD/.libs/systemd-udevd $INSTALL/lib/systemd
|
||||||
|
|
||||||
cp $PKG_BUILD/.libs/accelerometer $INSTALL/lib/udev
|
cp $PKG_BUILD/.libs/accelerometer $INSTALL/lib/udev
|
||||||
cp $PKG_BUILD/.libs/cdrom_id $INSTALL/lib/udev
|
cp $PKG_BUILD/.libs/cdrom_id $INSTALL/lib/udev
|
||||||
cp $PKG_BUILD/.libs/v4l_id $INSTALL/lib/udev
|
cp $PKG_BUILD/.libs/v4l_id $INSTALL/lib/udev
|
||||||
for i in ata_id collect mtd_probe scsi_id; do
|
|
||||||
cp $PKG_BUILD/$i $INSTALL/lib/udev
|
for i in ata_id collect scsi_id; do
|
||||||
|
cp $PKG_BUILD/.libs/$i $INSTALL/lib/udev
|
||||||
done
|
done
|
||||||
|
cp $PKG_BUILD/mtd_probe $INSTALL/lib/udev
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib/udev/rules.d
|
mkdir -p $INSTALL/lib/udev/rules.d
|
||||||
cp $PKG_BUILD/rules/50-udev-default.rules $INSTALL/lib/udev/rules.d
|
cp $PKG_BUILD/rules/*.rules $INSTALL/lib/udev/rules.d
|
||||||
cp $PKG_BUILD/rules/60-cdrom_id.rules $INSTALL/lib/udev/rules.d
|
rm -rf $INSTALL/lib/udev/rules.d/80-net-name-slot.rules
|
||||||
cp $PKG_BUILD/rules/60-persistent-alsa.rules $INSTALL/lib/udev/rules.d
|
rm -rf $INSTALL/lib/udev/rules.d/99-systemd.rules
|
||||||
cp $PKG_BUILD/rules/60-persistent-input.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/60-persistent-serial.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/60-persistent-storage-tape.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/60-persistent-storage.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/61-accelerometer.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/64-btrfs.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/75-net-description.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/75-probe_mtd.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/75-tty-description.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/78-sound-card.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/80-drivers.rules $INSTALL/lib/udev/rules.d
|
|
||||||
cp $PKG_BUILD/rules/95-udev-late.rules $INSTALL/lib/udev/rules.d
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib/udev/devices
|
mkdir -p $INSTALL/lib/udev/hwdb.d
|
||||||
|
cp $PKG_BUILD/hwdb/*.hwdb $INSTALL/lib/udev/hwdb.d
|
||||||
|
|
||||||
mkdir -p $INSTALL/etc/udev
|
mkdir -p $INSTALL/etc/udev
|
||||||
cp $PKG_BUILD/src/udev/udev.conf $INSTALL/etc/udev
|
cp $PKG_BUILD/src/udev/udev.conf $INSTALL/etc/udev
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="systemd"
|
PKG_NAME="systemd"
|
||||||
PKG_VERSION="196"
|
PKG_VERSION="197"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
|||||||
@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
|
|||||||
PKG_SITE="http://upower.freedesktop.org/"
|
PKG_SITE="http://upower.freedesktop.org/"
|
||||||
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils libusb"
|
PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils libusb"
|
||||||
PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib gobject-introspection polkit libusb"
|
PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib polkit libusb"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="system"
|
PKG_SECTION="system"
|
||||||
PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management."
|
PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management."
|
||||||
|
|||||||
@ -34,3 +34,4 @@ cd $PKG_BUILD
|
|||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
make prefix=$SYSROOT_PREFIX/usr install
|
make prefix=$SYSROOT_PREFIX/usr install
|
||||||
|
cp -P $ROOT/$PKG_DIR/files/*.m4 $SYSROOT_PREFIX/usr/share/aclocal
|
||||||
|
|||||||
@ -6,6 +6,7 @@ dnl Usage:
|
|||||||
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
||||||
AC_DEFUN([GTK_DOC_CHECK],
|
AC_DEFUN([GTK_DOC_CHECK],
|
||||||
[
|
[
|
||||||
|
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||||
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||||
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||||
|
|
||||||
@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK],
|
|||||||
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
|
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
|
||||||
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
|
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
|
||||||
AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
|
AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
|
||||||
|
dnl don't check for glib if we build glib
|
||||||
|
if test "x$PACKAGE_NAME" != "xglib"; then
|
||||||
|
dnl don't fail if someone does not have glib
|
||||||
|
PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build gtk-doc documentation])
|
AC_MSG_CHECKING([whether to build gtk-doc documentation])
|
||||||
|
|||||||
@ -0,0 +1,96 @@
|
|||||||
|
dnl -*- mode: autoconf -*-
|
||||||
|
dnl Copyright 2009 Johan Dahlin
|
||||||
|
dnl
|
||||||
|
dnl This file is free software; the author(s) gives unlimited
|
||||||
|
dnl permission to copy and/or distribute it, with or without
|
||||||
|
dnl modifications, as long as this notice is preserved.
|
||||||
|
dnl
|
||||||
|
|
||||||
|
# serial 1
|
||||||
|
|
||||||
|
m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
||||||
|
[
|
||||||
|
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||||
|
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||||
|
AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
|
||||||
|
|
||||||
|
dnl enable/disable introspection
|
||||||
|
m4_if([$2], [require],
|
||||||
|
[dnl
|
||||||
|
enable_introspection=yes
|
||||||
|
],[dnl
|
||||||
|
AC_ARG_ENABLE(introspection,
|
||||||
|
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
|
||||||
|
[Enable introspection for this build]),,
|
||||||
|
[enable_introspection=auto])
|
||||||
|
])dnl
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([for gobject-introspection])
|
||||||
|
|
||||||
|
dnl presence/version checking
|
||||||
|
AS_CASE([$enable_introspection],
|
||||||
|
[no], [dnl
|
||||||
|
found_introspection="no (disabled, use --enable-introspection to enable)"
|
||||||
|
],dnl
|
||||||
|
[yes],[dnl
|
||||||
|
PKG_CHECK_EXISTS([gobject-introspection-1.0],,
|
||||||
|
AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
|
||||||
|
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
|
||||||
|
found_introspection=yes,
|
||||||
|
AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
|
||||||
|
],dnl
|
||||||
|
[auto],[dnl
|
||||||
|
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
|
||||||
|
dnl Canonicalize enable_introspection
|
||||||
|
enable_introspection=$found_introspection
|
||||||
|
],dnl
|
||||||
|
[dnl
|
||||||
|
AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
|
||||||
|
])dnl
|
||||||
|
|
||||||
|
AC_MSG_RESULT([$found_introspection])
|
||||||
|
|
||||||
|
INTROSPECTION_SCANNER=
|
||||||
|
INTROSPECTION_COMPILER=
|
||||||
|
INTROSPECTION_GENERATE=
|
||||||
|
INTROSPECTION_GIRDIR=
|
||||||
|
INTROSPECTION_TYPELIBDIR=
|
||||||
|
if test "x$found_introspection" = "xyes"; then
|
||||||
|
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||||||
|
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||||
|
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||||
|
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||||||
|
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
||||||
|
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
||||||
|
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
||||||
|
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||||||
|
fi
|
||||||
|
AC_SUBST(INTROSPECTION_SCANNER)
|
||||||
|
AC_SUBST(INTROSPECTION_COMPILER)
|
||||||
|
AC_SUBST(INTROSPECTION_GENERATE)
|
||||||
|
AC_SUBST(INTROSPECTION_GIRDIR)
|
||||||
|
AC_SUBST(INTROSPECTION_TYPELIBDIR)
|
||||||
|
AC_SUBST(INTROSPECTION_CFLAGS)
|
||||||
|
AC_SUBST(INTROSPECTION_LIBS)
|
||||||
|
AC_SUBST(INTROSPECTION_MAKEFILE)
|
||||||
|
|
||||||
|
AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl Usage:
|
||||||
|
dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
|
||||||
|
|
||||||
|
AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
|
||||||
|
[
|
||||||
|
_GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Usage:
|
||||||
|
dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
|
||||||
|
|
||||||
|
|
||||||
|
AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
|
||||||
|
[
|
||||||
|
_GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
|
||||||
|
])
|
||||||
@ -1,32 +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 $1
|
|
||||||
|
|
||||||
cd $PKG_BUILD
|
|
||||||
|
|
||||||
./configure --host=$TARGET_NAME \
|
|
||||||
--build=$HOST_NAME \
|
|
||||||
--prefix=/usr \
|
|
||||||
--disable-nls \
|
|
||||||
|
|
||||||
make
|
|
||||||
@ -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="bc"
|
|
||||||
PKG_VERSION="1.06"
|
|
||||||
PKG_REV="1"
|
|
||||||
PKG_ARCH="any"
|
|
||||||
PKG_LICENSE="GPL"
|
|
||||||
PKG_SITE="http://www.gnu.org/software/bc/bc.html"
|
|
||||||
PKG_URL="ftp://ftp.gnu.org/gnu/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
|
||||||
PKG_DEPENDS=""
|
|
||||||
PKG_BUILD_DEPENDS="toolchain"
|
|
||||||
PKG_PRIORITY="optional"
|
|
||||||
PKG_SECTION="tools"
|
|
||||||
PKG_SHORTDESC="bc: GNU's numeric processing language and a calculator"
|
|
||||||
PKG_LONGDESC="Bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports interactive execution of statements. Bc is a utility included in the POSIX P1003.2/D11 draft standard. Since the POSIX document does not specify how bc must be implemented, this version does not use the historical method of having bc be a compiler for the dc calculator. This version has a single executable that both compiles the language and runs the resulting 'byte code'. The byte code is not the dc language."
|
|
||||||
PKG_IS_ADDON="no"
|
|
||||||
|
|
||||||
PKG_AUTORECONF="yes"
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -Naur bc-1.06/configure.in bc-1.06.patch/configure.in
|
|
||||||
--- bc-1.06/configure.in 2000-07-08 01:34:09.000000000 +0200
|
|
||||||
+++ bc-1.06.patch/configure.in 2013-01-12 09:17:40.085444318 +0100
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
|
||||||
AC_INIT(doc/bc.1)
|
|
||||||
AM_INIT_AUTOMAKE("bc", "1.06")
|
|
||||||
-AM_CONFIG_HEADER(config.h)
|
|
||||||
+AC_CONFIG_HEADERS(config.h)
|
|
||||||
|
|
||||||
AC_DEFINE(DC_VERSION,"1.3")
|
|
||||||
AC_DEFINE_UNQUOTED(BC_COPYRIGHT, dnl
|
|
||||||
@ -22,5 +22,6 @@
|
|||||||
|
|
||||||
. config/options $1
|
. config/options $1
|
||||||
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/bc/bc $INSTALL/usr/bin
|
cp $PKG_BUILD/src/nano $INSTALL/usr/bin
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user