Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0

This commit is contained in:
Stephan Raue 2013-01-22 17:49:18 +01:00
commit b3011069c5
394 changed files with 44254 additions and 7166 deletions

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="CouchPotatoServer"
PKG_VERSION="e1d7440"
PKG_VERSION="393c14d"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View 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)

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="Headphones"
PKG_VERSION="d07dc39"
PKG_VERSION="263272c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="SABnzbd"
PKG_VERSION="0.7.3"
PKG_VERSION="0.7.9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="SickBeard"
PKG_VERSION="b7cf06e"
PKG_VERSION="e6dcfb3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -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&amp;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&amp;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&amp;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">

View File

@ -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&amp;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&amp;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&amp;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 -->

View File

@ -1,14 +1,13 @@
diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl
--- SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl 2012-03-21 04:31:18.000000000 +0100
+++ SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl 2012-03-21 06:39:45.827897872 +0100
@@ -528,45 +528,6 @@
</fieldset>
</div><!-- /notifo component-group //-->
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
index 826cf0a..02f14af 100755
--- a/data/interfaces/default/config_notifications.tmpl
+++ b/data/interfaces/default/config_notifications.tmpl
@@ -547,45 +547,6 @@
-
- <div class="component-group clearfix">
- <div class="component-group-desc">
- <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>
<div class="component-group clearfix">
<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;">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>
- </div>
- <fieldset class="component-group-list">
@ -36,32 +35,37 @@ diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl S
- </label>
- </div>
- <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
- <input type="button" value="Test Libnotify" id="testLibnotify" />
- <input type="submit" class="config_submitter" value="Save Changes" />
- <input type="button" class="btn" value="Test Libnotify" id="testLibnotify" />
- <input type="submit" class="btn config_submitter" value="Save Changes" />
- </div><!-- /content_use_libnotify //-->
-
- </fieldset>
- </div><!-- /libnotify component-group //-->
-
-
<div class="component-group clearfix">
<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>
diff -Naur SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl
--- SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:02.098433287 +0100
+++ SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:34.445056278 +0100
@@ -169,7 +169,6 @@
<li id="NAVconfig"><a href="$sbRoot/config/">Config</a>
<ul>
<li><a href="$sbRoot/config/"><img src="$sbRoot/images/menu/config_index16.png" alt="" width="16" height="16" />Help &amp; Info</a></li>
- <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
<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/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
<li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
diff -Naur SickBeard-a24eac6/sickbeard/webserve.py SickBeard-a24eac6.patch/sickbeard/webserve.py
--- SickBeard-a24eac6/sickbeard/webserve.py 2012-03-21 04:31:18.000000000 +0100
+++ SickBeard-a24eac6.patch/sickbeard/webserve.py 2012-03-21 06:35:34.447056316 +0100
@@ -593,7 +593,6 @@
- <div class="component-group clearfix">
- <div class="component-group-desc">
<img class="notifier-icon" src="$sbRoot/images/notifiers/pushover.png" alt="" title="Pushover" />
<h3><a href="http://pushover.net/" onclick="window.open(this.href, '_blank'); return false;">Pushover</a></h3>
<p>Pushover makes it easy to send real-time notifications to your Android and iOS devices.</p>
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
index fb38f17..4ead36f 100644
--- a/data/interfaces/default/inc_top.tmpl
+++ b/data/interfaces/default/inc_top.tmpl
@@ -172,8 +172,6 @@
<ul class="dropdown-menu">
<li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help &amp; Info</a></li>
<li class="divider"></li>
- <li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
- <li class="divider"></li>
<li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
<li class="divider"></li>
<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 = [

2
packages/3rdparty/lib/libhdhomerun/meta vendored Executable file → Normal file
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libhdhomerun"
PKG_VERSION="20120405"
PKG_VERSION="20130117"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

View File

@ -0,0 +1,16 @@
diff --git a/dvbdevice.c b/dvbdevice.c
index 42ec5b1..9c397d7 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -839,7 +839,11 @@ bool cDvbTuner::SetFrontend(void)
SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
if (frontendType == SYS_DVBT2) {
// DVB-T2
+#ifdef DTV_DVBT2_PLP_ID
SETCMD(DTV_DVBT2_PLP_ID, dtp.PlpId());
+#else
+ SETCMD(DTV_DVBT2_PLP_ID_LEGACY, dtp.PlpId());
+#endif
}
tuneTimeout = DVBT_TUNE_TIMEOUT;

View File

@ -0,0 +1,12 @@
diff -Naur evtest-1.30-old/configure.ac evtest-1.30-new/configure.ac
--- evtest-1.30-old/configure.ac 2012-04-26 15:15:32.000000000 -0700
+++ evtest-1.30-new/configure.ac 2013-01-03 17:00:38.000000000 -0800
@@ -2,7 +2,7 @@
AC_INIT(evtest,[1.30], [https://bugzilla.freedesktop.org/enter_bug.cgi?product=evtest], evtest)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_PROG_CC
AC_PROG_INSTALL

View File

@ -1,3 +1,6 @@
3.0.2
- update to htop-1.0.2
3.0.1
- bump addon version

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="htop"
PKG_VERSION="1.0.1"
PKG_REV="1"
PKG_VERSION="1.0.2"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://htop.sourceforge.net/"

View File

@ -37,18 +37,14 @@ if [ -z "$(pidof userhdhomerun)" ]; then
ln -s $ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
fi
# could be useful
if [ -f $ADDON_HOME/extra-wait.sh ]; then
sh $ADDON_HOME/extra-wait.sh
fi
# if not already added
# modules are not automatically loaded
modprobe dvb_hdhomerun
modprobe dvb_hdhomerun_fe
usleep 2000000
# could be useful
if [ -f $ADDON_HOME/extra-wait.sh ]; then
sh $ADDON_HOME/extra-wait.sh
if [ -f $ADDON_HOME/pre-wait.sh ]; then
sh $ADDON_HOME/pre-wait.sh
fi
mkdir -p /var/log/
@ -57,8 +53,8 @@ if [ -z "$(pidof userhdhomerun)" ]; then
userhdhomerun -f
# how much time should we wait?
usleep 1000000
if [ -f $ADDON_HOME/extra-wait.sh ]; then
sh $ADDON_HOME/extra-wait.sh
if [ -f $ADDON_HOME/post-wait.sh ]; then
sh $ADDON_HOME/post-wait.sh
fi
# save adapter names in background

View File

@ -1,3 +1,6 @@
3.0.2
- update to w_scan-20121111
3.0.1
- bump addon version

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="w_scan"
PKG_VERSION="20120605"
PKG_REV="1"
PKG_VERSION="20121111"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

View File

@ -0,0 +1,16 @@
diff --git a/scan.c b/scan.c
index c24e256..8f603f8 100644
--- a/scan.c
+++ b/scan.c
@@ -1816,7 +1816,11 @@ static int set_frontend(int frontend_fd, struct transponder * t) {
case SCAN_TERRESTRIAL:
set_cmd_sequence(DTV_DELIVERY_SYSTEM, t->param.u.terr.delivery_system);
if (t->param.u.terr.delivery_system == SYS_DVBT2) {
+#ifdef DTV_DVBT2_PLP_ID
set_cmd_sequence(DTV_DVBT2_PLP_ID, t->pids.plp_id);
+#else
+ set_cmd_sequence(DTV_DVBT2_PLP_ID_LEGACY, t->pids.plp_id);
+#endif
}
set_cmd_sequence(DTV_FREQUENCY, t->param.frequency);
set_cmd_sequence(DTV_INVERSION, t->param.inversion);

View File

@ -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
- bump addon version

View File

@ -8,6 +8,6 @@
<setting id="SABNZBD_LAUNCH" value="true" />
<setting id="SICKBEARD_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" />
</settings>

View File

@ -20,7 +20,7 @@
PKG_NAME="SABnzbd-Suite"
PKG_VERSION="3.0"
PKG_REV="1"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.openelec.tv"

View File

@ -74,6 +74,7 @@ pSickBeardSettings = os.path.join(pAddonHome, 'sickbeard.ini')
pCouchPotatoSettings = os.path.join(pAddonHome, 'couchpotato.ini')
pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini')
pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini')
pTransmission_Addon_Settings ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml'
# directories
pSabNzbdComplete = '/storage/downloads'
@ -130,6 +131,18 @@ if firstLaunch:
# 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
fSuiteSettings = open(pSuiteSettings, 'r')
data = fSuiteSettings.read()
@ -249,7 +262,7 @@ try:
# launch SABnzbd and get the API key
# ----------------------------------
if "true" in sabnzbd_launch:
if firstLaunch or "true" in sabnzbd_launch:
logging.debug('Launching SABnzbd...')
subprocess.call(sabnzbd,close_fds=True)
logging.debug('...done')
@ -260,6 +273,8 @@ try:
sabNzbdConfig.reload()
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
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:
print 'SABnzbd: exception occurred:', e
print traceback.format_exc()
@ -308,6 +323,7 @@ try:
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1'
defaultConfig['XBMC']['xbmc_update_library'] = '1'
defaultConfig['XBMC']['xbmc_update_full'] = '1'
sickBeardConfig.merge(defaultConfig)
sickBeardConfig.write()
@ -383,15 +399,13 @@ try:
# write CouchPotatoServer settings
# --------------------------
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True)
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False)
defaultConfig = ConfigObj()
defaultConfig['newznab'] = {}
defaultConfig['newznab']['api_key'] = ''
defaultConfig['core'] = {}
defaultConfig['core']['username'] = user
defaultConfig['core']['password'] = md5pwd
defaultConfig['core']['port'] = '8083'
defaultConfig['core']['launchbrowser'] = '0'
defaultConfig['core']['launch_browser'] = '0'
defaultConfig['core']['host'] = host
defaultConfig['core']['data_dir'] = pAddonHome
defaultConfig['core']['permission_folder'] = '0644'
@ -415,15 +429,26 @@ try:
defaultConfig['xbmc']['username'] = xbmcUser
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:
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']['pp_directory'] = pSabNzbdCompleteMov
defaultConfig['Renamer'] = {}
defaultConfig['Renamer']['enabled'] = 'True'
defaultConfig['Renamer']['enabled'] = '1'
defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov
defaultConfig['Renamer']['destination'] = '/storage/videos'
defaultConfig['Renamer']['separator'] = '.'
defaultConfig['Renamer']['cleanup'] = 'False'
defaultConfig['Renamer']['cleanup'] = '0'
couchPotatoServerConfig.merge(defaultConfig)
couchPotatoServerConfig.write()
@ -446,13 +471,23 @@ try:
headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
defaultConfig = ConfigObj()
defaultConfig['General'] = {}
defaultConfig['General']['launch_browser'] = '0'
defaultConfig['General']['http_port'] = '8084'
defaultConfig['General']['http_host'] = host
defaultConfig['General']['http_username'] = user
defaultConfig['General']['http_password'] = pwd
defaultConfig['General']['launch_browser'] = '0'
defaultConfig['General']['http_port'] = '8084'
defaultConfig['General']['http_host'] = host
defaultConfig['General']['http_username'] = user
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:
defaultConfig['SABnzbd'] = {}
defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
defaultConfig['SABnzbd']['sab_username'] = user
@ -460,6 +495,8 @@ try:
if firstLaunch:
defaultConfig['SABnzbd']['sab_category'] = 'music'
defaultConfig['XBMC']['xbmc_update'] = '1'
defaultConfig['XBMC']['xbmc_notify'] = '1'
defaultConfig['General']['music_dir'] = '/storage/music'
defaultConfig['General']['destination_dir'] = '/storage/music'
defaultConfig['General']['download_dir'] = '/storage/downloads/music'

View File

@ -1,6 +1,2 @@
#!/bin/sh
kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | 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
kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null

View File

@ -10,7 +10,7 @@
<setting id="SABNZBD_LAUNCH" type="bool" label="1024" 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_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 label="2010" type="lsep"/>

View File

@ -1,3 +1,7 @@
3.0.3
- update to transmission-2.76
- update libevent to libevent-2.0.21-stable
3.0.2
- update to transmission-2.74

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="transmission"
PKG_VERSION="2.74"
PKG_REV="2"
PKG_VERSION="2.76"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.transmissionbt.com/"

View File

@ -0,0 +1,12 @@
diff -Naur transmission-2.76/configure.ac transmission-2.76.patch/configure.ac
--- transmission-2.76/configure.ac 2013-01-09 03:32:09.534138180 +0200
+++ transmission-2.76.patch/configure.ac 2013-01-12 22:44:37.881897688 +0200
@@ -14,7 +14,7 @@
AC_CONFIG_MACRO_DIR([m4])
-dnl AM_CONFIG_HEADER(config.h)
+dnl AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR(libtransmission/transmission.h)
AM_INIT_AUTOMAKE([1.9 tar-pax])
LT_INIT

View File

@ -75,6 +75,12 @@ else
TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
fi
if [ "$TRANSMISSION_UTP" = "true" ]; then
TRANSMISSION_ARG="$TRANSMISSION_ARG --utp"
else
TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp"
fi
if [ ! "$(pidof transmission-daemon)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
@ -83,6 +89,11 @@ if [ ! "$(pidof transmission-daemon)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
# XXX: sysctls for uTP. we may remove this later
if [ "$TRANSMISSION_UTP" = "true" ]; then
sysctl -w net.core.wmem_max=1048576 > /dev/null 2>&1
sysctl -w net.core.rmem_max=4194304 > /dev/null 2>&1
fi
EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE
sleep 1
done &

View File

@ -29,5 +29,5 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof transmission-daemon)" ];then
killall -9 transmission-daemon
killall transmission-daemon
fi

View File

@ -16,5 +16,6 @@
<string id="3110">Other</string>
<string id="3121">Download Directory</string>
<string id="3122">Enable uTP support</string>
</strings>

View File

@ -21,5 +21,6 @@
<setting type="sep" />
<setting label="3110" type="lsep"/>
<setting id="TRANSMISSION_DL_DIR" type="folder" label="3121" value="" default="/storage/downloads" />
<setting id="TRANSMISSION_UTP" type="bool" label="3122" default="false" />
</category>
</settings>

View File

@ -6,4 +6,5 @@
<setting id="TRANSMISSION_LIMIT_GLOBAL" value="" />
<setting id="TRANSMISSION_LIMIT_TORRENT" value="" />
<setting id="TRANSMISSION_DL_DIR" value="/storage/downloads" />
<setting id="TRANSMISSION_UTP" value="false" />
</settings>

View File

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index e2a6aaf..c20a3fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AM_MAINTAINER_MODE
AC_ISC_POSIX
AC_PROG_CXX
-AM_PROG_CC_STDC
+AC_PROG_CC
AC_HEADER_STDC
AM_PROG_LIBTOOL

View File

@ -29,3 +29,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin

View File

@ -37,3 +37,6 @@ cd $PKG_BUILD
--enable-bundle
make
# compile capmt_ca.so library
$CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl

View File

@ -1,3 +1,7 @@
3.0.3
- update to TVHeadend 3.3.328
- add an option to preload capmt_ca.so library
3.0.2
- update to TVHeadend 3.2.18

View File

@ -4,4 +4,5 @@
<setting id="XMLTV_LOCATION_FILE" value="" />
<setting id="XMLTV_LOCATION_WEB" value="http://" />
<setting id="XMLTV_TYPE" value="NONE" />
<setting id="PRELOAD_CAPMT_CA" value="false" />
</settings>

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="tvheadend"
PKG_VERSION="3.2.18"
PKG_REV="2"
PKG_VERSION="3.3.328"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

View File

@ -119,6 +119,11 @@ mkdir -p $ADDON_HOME
sleep 1
continue
fi
$ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
logger -t Tvheadend "### Preloading capmt_ca.so library ###"
LD_PRELOAD=$ADDON_DIR/bin/capmt_ca.so $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
else
$ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
fi
done &
fi

View File

@ -31,5 +31,5 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof $ADDON_BIN)" ];then
killall -9 $ADDON_BIN
killall $ADDON_BIN
fi

View File

@ -12,5 +12,6 @@
<string id="1021">Unload DVB mudules before suspend</string>
<string id="1022">Wait for frontend initialization</string>
<string id="1023">Number of adapters to wait for</string>
<string id="1024">Preload capmt_ca.so library</string>
</strings>

View File

@ -15,5 +15,6 @@
<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
</category>
</settings>

View File

@ -29,6 +29,6 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof vdr.bin)" ];then
killall -9 vdr.bin
killall vdr.bin
fi

View File

@ -29,10 +29,12 @@ mkdir -p build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIBUSBDIR=$SYSROOT_PREFIX/usr \
-DWITH_SSL=1 \
-DWITH_SSL=0 \
-DHAVE_LIBCRYPTO=0 \
-DHAVE_DVBAPI=1 -DWITH_STAPI=0 \
-DMODULE_CAMD33=1 \
-DWEBIF=1 \
-DWITH_DEBUG=0 \
-DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
..

View File

@ -1,3 +1,9 @@
3.0.5
- update to oscam-8119
- use internal crypto functions
- disable ssl support
- disable debug support
3.0.4
- update to oscam-8030
- update to pcsc-lite-1.8.7

View File

@ -20,14 +20,14 @@
################################################################################
PKG_NAME="oscam"
PKG_VERSION="8030"
PKG_REV="4"
PKG_VERSION="8119"
PKG_REV="5"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="openssl"
PKG_BUILD_DEPENDS="toolchain openssl pcsc-lite"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain pcsc-lite"
PKG_PRIORITY="optional"
PKG_SECTION="service/softcam"
PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul."

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -0,0 +1,12 @@
diff -Naur alsa-lib-1.0.26-old/configure.in alsa-lib-1.0.26-new/configure.in
--- alsa-lib-1.0.26-old/configure.in 2012-09-06 01:55:14.000000000 -0700
+++ alsa-lib-1.0.26-new/configure.in 2012-12-29 06:07:44.000000000 -0800
@@ -53,7 +53,7 @@
dnl Checks for header files.
AC_HEADER_STDC
-AM_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADERS(include/config.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

View File

@ -0,0 +1,12 @@
diff -Naur alsa-utils-1.0.26-old/configure.in alsa-utils-1.0.26-new/configure.in
--- alsa-utils-1.0.26-old/configure.in 2012-09-06 01:45:44.000000000 -0700
+++ alsa-utils-1.0.26-new/configure.in 2012-12-29 08:01:59.000000000 -0800
@@ -290,7 +290,7 @@
TESTSOUND="$dir/test.wav")
AC_SUBST(TESTSOUND)
-AM_CONFIG_HEADER(include/aconfig.h)
+AC_CONFIG_HEADERS(include/aconfig.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

View File

@ -0,0 +1,12 @@
diff -Naur faad2-2.7-old/configure.in faad2-2.7-new/configure.in
--- faad2-2.7-old/configure.in 2009-02-04 16:51:03.000000000 -0800
+++ faad2-2.7-new/configure.in 2012-12-30 14:58:33.000000000 -0800
@@ -25,7 +25,7 @@
AC_PROG_MAKE_SET
AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin],
WITHXMMS=$withval, WITHXMMS=no)

View File

@ -0,0 +1,12 @@
diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
--- flac-1.2.1-old/configure.in 2007-09-13 08:48:42.000000000 -0700
+++ flac-1.2.1-new/configure.in 2013-01-03 19:54:10.000000000 -0800
@@ -44,7 +44,7 @@
AC_CHECK_SIZEOF(void*,0)
#@@@ new name is AC_CONFIG_HEADERS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_C_BIGENDIAN

View File

@ -0,0 +1,12 @@
diff -Naur libcdio-0.90-old/configure.ac libcdio-0.90-new/configure.ac
--- libcdio-0.90-old/configure.ac 2012-10-27 08:07:45.000000000 -0700
+++ libcdio-0.90-new/configure.ac 2012-12-30 14:12:26.000000000 -0800
@@ -26,7 +26,7 @@
AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
# Enable silent build rules by default (Automake v1.11 or later).

View File

@ -0,0 +1,12 @@
diff -Naur libmad-0.15.1b-old/configure.ac libmad-0.15.1b-new/configure.ac
--- libmad-0.15.1b-old/configure.ac 2004-01-23 01:41:32.000000000 -0800
+++ libmad-0.15.1b-new/configure.ac 2012-12-30 15:14:37.000000000 -0800
@@ -28,7 +28,7 @@
AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
dnl System type.

View File

@ -0,0 +1,12 @@
diff -Naur libogg-1.3.0-old/configure.in libogg-1.3.0-new/configure.in
--- libogg-1.3.0-old/configure.in 2011-08-04 10:11:08.000000000 -0700
+++ libogg-1.3.0-new/configure.in 2013-01-03 19:50:49.000000000 -0800
@@ -19,7 +19,7 @@
AM_PROG_CC_C_O
dnl config.h
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
dnl Set some options based on environment

View File

@ -0,0 +1,12 @@
diff -Naur libvorbis-1.3.3-old/configure.ac libvorbis-1.3.3-new/configure.ac
--- libvorbis-1.3.3-old/configure.ac 2012-02-03 14:00:34.000000000 -0800
+++ libvorbis-1.3.3-new/configure.ac 2013-01-03 20:10:21.000000000 -0800
@@ -13,7 +13,7 @@
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")

View File

@ -1,8 +1,8 @@
diff -Naur libvorbis-1.3.2-old/configure.ac libvorbis-1.3.2-new/configure.ac
--- libvorbis-1.3.2-old/configure.ac 2010-11-01 12:27:12.000000000 -0700
+++ libvorbis-1.3.2-new/configure.ac 2010-11-01 14:50:03.000000000 -0700
diff -Naur libvorbis-1.3.3-old/configure.ac libvorbis-1.3.3-new/configure.ac
--- libvorbis-1.3.3-old/configure.ac 2012-02-03 14:00:34.000000000 -0800
+++ libvorbis-1.3.3-new/configure.ac 2012-02-09 12:56:02.000000000 -0800
@@ -8,6 +8,7 @@
AC_INIT([libvorbis],[1.3.2],[vorbis-dev@xiph.org])
AC_INIT([libvorbis],[1.3.3],[vorbis-dev@xiph.org])
AC_CONFIG_SRCDIR([lib/mdct.c])
+AC_CONFIG_MACRO_DIR([m4])
@ -10,19 +10,19 @@ diff -Naur libvorbis-1.3.2-old/configure.ac libvorbis-1.3.2-new/configure.ac
AC_CANONICAL_TARGET([])
@@ -16,7 +17,6 @@
AM_CONFIG_HEADER([config.h])
AC_CONFIG_HEADERS([config.h])
dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
dnl Library versioning
dnl - library source changed -> increment REVISION
diff -Naur libvorbis-1.3.2-old/Makefile.am libvorbis-1.3.2-new/Makefile.am
--- libvorbis-1.3.2-old/Makefile.am 2010-03-25 18:56:25.000000000 -0700
+++ libvorbis-1.3.2-new/Makefile.am 2010-11-01 14:50:03.000000000 -0700
@@ -2,6 +2,8 @@
AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
diff -Naur libvorbis-1.3.3-old/Makefile.am libvorbis-1.3.3-new/Makefile.am
--- libvorbis-1.3.3-old/Makefile.am 2010-12-21 00:46:03.000000000 -0800
+++ libvorbis-1.3.3-new/Makefile.am 2012-02-09 12:56:02.000000000 -0800
@@ -3,6 +3,8 @@
#AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
+ACLOCAL_AMFLAGS = -I m4
+

View File

@ -0,0 +1,12 @@
diff -Naur mysql-5.1.67-old/configure.in mysql-5.1.67-new/configure.in
--- mysql-5.1.67-old/configure.in 2012-12-13 02:05:51.000000000 -0800
+++ mysql-5.1.67-new/configure.in 2012-12-30 08:39:00.000000000 -0800
@@ -22,7 +22,7 @@
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AC_PROG_LIBTOOL
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
# Request support for automake silent-rules if available.
# Default to verbose output. One can use the configure-time

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="sqlite"
PKG_VERSION="autoconf-3071501"
PKG_VERSION="autoconf-3071502"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="PublicDomain"

View File

@ -1,43 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
$SED 's/$(CCOPTS)//' netem/Makefile
# remove any old configfile
rm -rf ./Config
# Makefile is busted so it never passes IPT_LIB_DIR properly
$SED "s/-DIPT/-DXT/" tc/Makefile
echo "TC_CONFIG_XT:=y" >> ./Config
# arpd needs berkeleydb
$SED "/^TARGETS=/s: arpd : :" misc/Makefile
echo "IPT_LIB_DIR:=/usr/lib/xtables" >> ./Config
# use setns from our libc
echo "IP_CONFIG_SETNS:=y" >> ./Config
make CC="$TARGET_CC" CCOPTS="$TARGET_CFLAGS -D_GNU_SOURCE"

View File

@ -1,51 +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/etc/iproute2
cp -P $PKG_BUILD/etc/iproute2/* $INSTALL/etc/iproute2
mkdir -p $INSTALL/sbin
cp -P $PKG_BUILD/bridge/bridge $INSTALL/sbin
cp -P $PKG_BUILD/genl/genl $INSTALL/sbin
cp -P $PKG_BUILD/ip/ip $INSTALL/sbin
cp -P $PKG_BUILD/ip/rtmon $INSTALL/sbin
cp -P $PKG_BUILD/ip/routef $INSTALL/sbin
chmod +x $INSTALL/sbin/routef
cp -P $PKG_BUILD/ip/routel $INSTALL/sbin
chmod +x $INSTALL/sbin/routel
cp -P $PKG_BUILD/ip/rtpr $INSTALL/sbin
chmod +x $INSTALL/sbin/rtpr
cp -P $PKG_BUILD/misc/ifstat $INSTALL/sbin
cp -P $PKG_BUILD/misc/lnstat $INSTALL/sbin
ln -sf lnstat $INSTALL/sbin/ctstat
ln -sf lnstat $INSTALL/sbin/rtstat
cp -P $PKG_BUILD/misc/nstat $INSTALL/sbin
cp -P $PKG_BUILD/misc/rtacct $INSTALL/sbin
cp -P $PKG_BUILD/misc/ss $INSTALL/sbin
cp -P $PKG_BUILD/tc/tc $INSTALL/sbin
mkdir -p $INSTALL/usr/lib/tc
cp -P $PKG_BUILD/netem/*.dist $INSTALL/usr/lib/tc
cp -P $PKG_BUILD/tc/m_xt.so $INSTALL/usr/lib/tc
ln -sf m_xt.so $INSTALL/usr/lib/tc/m_ipt.so

View File

@ -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="iproute2"
PKG_VERSION="3.6.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
PKG_URL="http://kernel.org/pub/linux/utils/net/iproute2/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="iptables"
PKG_BUILD_DEPENDS="toolchain iptables"
PKG_PRIORITY="optional"
PKG_SECTION="debug"
PKG_SHORTDESC="iproute2:a collection of utilities for controlling TCP / IP networking and traffic control in Linux."
PKG_LONGDESC="Iproute2 is a collection of utilities for controlling TCP / IP networking and traffic control in Linux."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,12 @@
diff -Naur mrxvt-0.5.4/configure.ac mrxvt-0.5.4.patch/configure.ac
--- mrxvt-0.5.4/configure.ac 2008-05-12 19:21:56.000000000 +0200
+++ mrxvt-0.5.4.patch/configure.ac 2013-01-12 01:54:55.819541351 +0100
@@ -28,7 +28,7 @@
AC_INIT(mrxvt, 0.5.4, [jimmyzhou@users.sourceforge.net])
AM_INIT_AUTOMAKE(mrxvt, 0.5.4)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR([src/main.c])

View File

@ -0,0 +1,12 @@
diff -Naur strace-4.7-old/configure.ac strace-4.7-new/configure.ac
--- strace-4.7-old/configure.ac 2012-05-02 05:34:56.000000000 -0700
+++ strace-4.7-new/configure.ac 2013-01-03 21:01:04.000000000 -0800
@@ -3,7 +3,7 @@
AC_INIT([strace],[4.7])
AC_CONFIG_SRCDIR([strace.c])
AC_CONFIG_AUX_DIR([.])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign check-news dist-xz no-dist-gzip silent-rules])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST

View File

@ -0,0 +1,12 @@
diff -Naur dbus-glib-0.100-old/configure.ac dbus-glib-0.100-new/configure.ac
--- dbus-glib-0.100-old/configure.ac 2012-06-25 09:26:39.000000000 -0700
+++ dbus-glib-0.100-new/configure.ac 2012-12-29 08:54:04.000000000 -0800
@@ -8,7 +8,7 @@
AM_INIT_AUTOMAKE([1.9])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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 \

View File

@ -36,5 +36,5 @@ mkdir -p .build-host && cd .build-host
--disable-static \
--enable-fsect-man5 \
make
make install
make -C src
make -C src install

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="file"
PKG_VERSION="5.11"
PKG_VERSION="5.12"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"

View File

@ -0,0 +1,17 @@
diff --git a/src/apprentice.c b/src/apprentice.c
index 961e83d..b7d500c 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -348,11 +348,9 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
protected void
file_ms_free(struct magic_set *ms)
{
- size_t i;
if (ms == NULL)
return;
- for (i = 0; i < MAGIC_SETS; i++)
- mlist_free(ms->mlist[i]);
+ mlist_free(ms->mlist[0]);
free(ms->o.pbuf);
free(ms->o.buf);
free(ms->c.li);

View File

@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
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_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_SECTION="devel"
PKG_SHORTDESC="glib: C support library"

View File

@ -0,0 +1,11 @@
diff -Naur glib-2.34.3-old/configure.ac glib-2.34.3-new/configure.ac
--- glib-2.34.3-old/configure.ac 2012-12-29 06:22:04.000000000 -0800
+++ glib-2.34.3-new/configure.ac 2012-12-29 06:22:28.000000000 -0800
@@ -293,7 +293,6 @@
AC_HEADER_STDC
-AM_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_INSTALL

View File

@ -1,15 +1,17 @@
diff -Naur gmp-5.0.5/configure.in gmp-5.0.5.patch/configure.in
--- gmp-5.0.5/configure.in 2012-05-06 13:19:49.000000000 +0200
+++ gmp-5.0.5.patch/configure.in 2012-06-13 21:12:33.434790721 +0200
@@ -65,7 +65,7 @@
+++ gmp-5.0.5.patch/configure.in 2013-01-12 02:25:31.897257189 +0100
@@ -65,8 +65,8 @@
dnl Note that there's a copy of these options in the top-level Makefile.am,
dnl so update there too if changing anything.
dnl
-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
-AM_CONFIG_HEADER(config.h:config.in)
+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
AM_CONFIG_HEADER(config.h:config.in)
+AC_CONFIG_HEADERS(config.h:config.in)
AM_MAINTAINER_MODE
@@ -2228,9 +2228,6 @@
echo " MPN_PATH=\"$path\""
@ -22,7 +24,7 @@ diff -Naur gmp-5.0.5/configure.in gmp-5.0.5.patch/configure.in
GMP_PROG_AR
diff -Naur gmp-5.0.5/Makefile.am gmp-5.0.5.patch/Makefile.am
--- gmp-5.0.5/Makefile.am 2012-05-06 13:19:49.000000000 +0200
+++ gmp-5.0.5.patch/Makefile.am 2012-06-13 21:12:57.038224241 +0200
+++ gmp-5.0.5.patch/Makefile.am 2013-01-12 02:25:09.603364249 +0100
@@ -25,7 +25,7 @@
# Makefiles in subdirectories, but here we must omit it so automake gives
# the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".

View File

@ -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

View File

@ -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"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libevent"
PKG_VERSION="2.0.20-stable"
PKG_VERSION="2.0.21-stable"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"

View File

@ -0,0 +1,46 @@
diff --git a/configure.in b/configure.in
index 18165f3..97007b5 100644
--- a/configure.in
+++ b/configure.in
@@ -7,12 +7,13 @@ dnl
dnl Original version Dug Song <dugsong@monkey.org>
AC_PREREQ(2.59c)
-AC_INIT(event.c)
+AC_INIT([libevent], [2.0.21-stable])
+AC_CONFIG_SRCDIR([event.c])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(libevent,2.0.21-stable)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS(config.h)
AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
dnl Initialize prefix.
diff --git a/test/Makefile.am b/test/Makefile.am
index b10c41a..53e00e4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -19,8 +19,6 @@ endif
EXTRA_PROGRAMS = regress
noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
-TESTS = $(top_srcdir)/test/test.sh
-
BUILT_SOURCES =
if BUILD_REGRESS
BUILT_SOURCES += regress.gen.c regress.gen.h
diff --git a/test/Makefile.in b/test/Makefile.in
index 451bd3c..939ad57 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -315,7 +315,6 @@ AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL
EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c rpcgen_wrapper.sh test.sh
noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
-TESTS = $(top_srcdir)/test/test.sh
BUILT_SOURCES = $(am__append_2)
test_init_SOURCES = test-init.c
test_init_LDADD = ../libevent_core.la

View File

@ -0,0 +1,11 @@
diff -Naur libftdi-0.20-old/configure.in libftdi-0.20-new/configure.in
--- libftdi-0.20-old/configure.in 2012-03-19 04:20:56.000000000 -0700
+++ libftdi-0.20-new/configure.in 2012-12-31 04:49:04.000000000 -0800
@@ -1,6 +1,6 @@
AC_INIT(libftdi, 0.20)
AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_LANG_C
AC_PROG_CC

View File

@ -23,6 +23,7 @@
. config/options $1
cd $PKG_BUILD
mkdir -p m4 && do_autoreconf
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \

View File

@ -33,4 +33,4 @@ PKG_SHORTDESC="lockdev: Manage character and block device lockfiles."
PKG_LONGDESC="lockdev manages character and block device lockfiles."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_AUTORECONF="no"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bcm2835-driver"
PKG_VERSION="76d0ac3"
PKG_VERSION="ce9dbf9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="nonfree"

View File

@ -0,0 +1,12 @@
diff -Naur libpng-1.5.13-old/configure.ac libpng-1.5.13-new/configure.ac
--- libpng-1.5.13-old/configure.ac 2012-09-27 04:21:22.000000000 -0700
+++ libpng-1.5.13-new/configure.ac 2012-12-30 09:53:28.000000000 -0800
@@ -31,7 +31,7 @@
dnl End of version number stuff
AC_CONFIG_SRCDIR([pngget.c])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Checks for programs.
AC_LANG([C])

View File

@ -25,7 +25,11 @@
EGLIBC_DIR="$BUILD/eglibc-*"
mkdir -p $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/elf/ld*.so.* $INSTALL/lib
cp -PR $EGLIBC_DIR/objdir-eglibc/elf/ld*.so* $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/libc.so.6 $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/math/libm.so.6 $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/nptl/libpthread.so.0 $INSTALL/lib
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
ln -sf ld.so $INSTALL/lib/ld-linux.so.3
fi

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.20.2
# Tue Aug 7 00:21:10 2012
# Busybox version: 1.21.0
# Tue Jan 22 01:39:02 2013
#
CONFIG_HAVE_DOT_CONFIG=y
@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_UTMP is not set
# CONFIG_FEATURE_WTMP is not set
# CONFIG_FEATURE_PIDFILE is not set
CONFIG_PID_FILE_PATH=""
# CONFIG_FEATURE_SUID is not set
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
@ -95,7 +96,8 @@ CONFIG_PREFIX="./_install-initramfs"
CONFIG_FEATURE_SYSTEMD=y
# CONFIG_FEATURE_RTMINMAX is not set
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
CONFIG_MD5_SMALL=0
CONFIG_SHA3_SMALL=0
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
# CONFIG_FEATURE_USE_TERMIOS is not set
@ -263,6 +265,7 @@ CONFIG_RM=y
# CONFIG_SHA1SUM is not set
# CONFIG_SHA256SUM is not set
# CONFIG_SHA512SUM is not set
# CONFIG_SHA3SUM is not set
CONFIG_SLEEP=y
# CONFIG_FEATURE_FANCY_SLEEP is not set
# CONFIG_FEATURE_FLOAT_SLEEP is not set
@ -310,7 +313,7 @@ CONFIG_USLEEP=y
# CONFIG_FEATURE_HUMAN_READABLE is not set
#
# Common options for md5sum, sha1sum, sha256sum, sha512sum
# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
CONFIG_AWK=y
# CONFIG_FEATURE_AWK_LIBM is not set
# CONFIG_CMP is not set
@ -612,9 +614,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
CONFIG_FEATURE_VOLUMEID_REISERFS=y
CONFIG_FEATURE_VOLUMEID_FAT=y
CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_HFS=y
CONFIG_FEATURE_VOLUMEID_JFS=y
CONFIG_FEATURE_VOLUMEID_XFS=y
CONFIG_FEATURE_VOLUMEID_NILFS=y
CONFIG_FEATURE_VOLUMEID_NTFS=y
CONFIG_FEATURE_VOLUMEID_ISO9660=y
CONFIG_FEATURE_VOLUMEID_UDF=y
@ -622,6 +626,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
CONFIG_FEATURE_VOLUMEID_ROMFS=y
CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
CONFIG_FEATURE_VOLUMEID_SYSV=y
CONFIG_FEATURE_VOLUMEID_OCFS2=y
CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
@ -890,6 +895,13 @@ CONFIG_FEATURE_MIME_CHARSET=""
# CONFIG_PSTREE is not set
# CONFIG_PWDX is not set
# CONFIG_SMEMCAP is not set
# CONFIG_TOP is not set
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
# CONFIG_FEATURE_TOP_SMP_CPU is not set
# CONFIG_FEATURE_TOP_DECIMALS is not set
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
# CONFIG_FEATURE_TOPMEM is not set
# CONFIG_UPTIME is not set
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
# CONFIG_FREE is not set
@ -910,13 +922,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
# CONFIG_RENICE is not set
# CONFIG_BB_SYSCTL is not set
# CONFIG_TOP is not set
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
# CONFIG_FEATURE_TOP_SMP_CPU is not set
# CONFIG_FEATURE_TOP_DECIMALS is not set
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
# CONFIG_FEATURE_TOPMEM is not set
# CONFIG_FEATURE_SHOW_THREADS is not set
# CONFIG_WATCH is not set
@ -1011,6 +1016,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
# CONFIG_LOGREAD is not set
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
# CONFIG_FEATURE_KMSG_SYSLOG is not set
# CONFIG_KLOGD is not set
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
# CONFIG_LOGGER is not set

View File

@ -22,25 +22,29 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
MODULE_DIR=/lib/modules
UPDATE_DIR=/storage/.update
UPDATE_KERNEL="KERNEL"
UPDATE_SYSTEM="SYSTEM"
IMAGE_KERNEL="KERNEL"
IMAGE_SYSTEM="SYSTEM"
REBOOT="0"
MD5_FAILED="0"
MD5_NOCHECK="0"
NBD_DEVS="0"
# mount all needed special filesystems
/bin/busybox mount -t devtmpfs none /dev
/bin/busybox mount -t proc none /proc
/bin/busybox mount -t sysfs none /sys
# set needed variables
MODULE_DIR=/lib/modules
UPDATE_DIR=/storage/.update
UPDATE_KERNEL="KERNEL"
UPDATE_SYSTEM="SYSTEM"
IMAGE_KERNEL="KERNEL"
IMAGE_SYSTEM="SYSTEM"
REBOOT="0"
MD5_FAILED="0"
MD5_NOCHECK="0"
NBD_DEVS="0"
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
SYSTEM_TORAM_LIMIT=1024000
# load any configuration
if [ -f "/etc/initramfs.conf" ]; then
. /etc/initramfs.conf
@ -468,9 +472,6 @@ NBD_DEVS="0"
if [ -f "/flash/$IMAGE_SYSTEM" ]; then
# /flash is filesystem with system image file
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
SYSTEM_TORAM_LIMIT=1024000
if [ "$SYSTEM_TORAM" = "no" -o "$INSTALLED_MEMORY" -lt "$SYSTEM_TORAM_LIMIT" ]; then
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
else

View File

@ -27,4 +27,4 @@ $SCRIPTS/unpack linux
cd $PKG_BUILD
./configure --with-x86emu
make KDIR=$(kernel_path)
make

View File

@ -0,0 +1,18 @@
diff -Naur v86d-0.1.10/Makefile v86d-0.1.10.patch/Makefile
--- v86d-0.1.10/Makefile 2011-02-25 22:27:39.000000000 +0100
+++ v86d-0.1.10.patch/Makefile 2013-01-14 19:20:13.385465794 +0100
@@ -3,14 +3,12 @@
.PHONY: clean install install_testvbe x86emu lrmi
INSTALL = install
-KDIR ?= /lib/modules/$(shell uname -r)/source
ifeq ($(call config_opt,CONFIG_KLIBC),true)
export CC = klcc
endif
CFLAGS ?= -Wall -g -O2
-CFLAGS += -I$(KDIR)/include
ifeq ($(call config_opt,CONFIG_X86EMU),true)
CFLAGS += -Ilibs/x86emu

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="dvbhdhomerun"
PKG_VERSION="20120831"
PKG_VERSION="20130121"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/"
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain linux libhdhomerun"
PKG_PRIORITY="optional"

Some files were not shown because too many files have changed in this diff Show More