config/version: set version to 3.0.4

Signed-off-by: Stephan Raue <stephan@openelec.tv>

CHANGELOG

@@ -1,20 +1,5 @@
-OpenELEC (Version 2.1)
+OpenELEC (Version 3.0)
 
-Changelog OpenELEC-2.0 to OpenELEC-2.1
+for a detailed Changelog from OpenELEC-2.0 to OpenELEC-3.0 see:
+ https://github.com/OpenELEC/OpenELEC.tv/compare/2.0.0...3.0.0
 
-Added packages:
-  - add package 'ppp'
-  - add package 'pptp'
-
-Package updates:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
-
-Added functions:
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
-
-Changed functions:
-
-Removed functions:

README.md

@@ -14,7 +14,7 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 **Installation**
 
-* Please read INSTALL for instructions on how to install.
+* Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
 
 **Known issues**
 

config/addon/addon.xml

@@ -17,6 +17,9 @@
     <description>
 @PKG_LONGDESC@
     </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
     <platform>all</platform>
   </extension>
 </addon>

config/functions

@@ -169,6 +169,11 @@ strip_linker_plugin() {
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
+strip_gold() {
+  # strip out usage from GOLD linker
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
+}
+
 fix_module_depends() {
   # modify .modinfo section in kernel module to depends on other required modules
   local MODULE="$1"
@@ -233,7 +238,7 @@ dashes="==========================="
 show_config() {
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options
@@ -247,6 +252,7 @@ show_config() {
   config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT"
   config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
+  config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
   config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
 
   # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS"

config/optimize

@@ -29,6 +29,10 @@ if [ "$LTO_SUPPORT" = yes ];then
   LD_OPTIM="$LD_OPTIM -flto"
 fi
 
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+fi
+
 if [ "$DEBUG" = yes ]; then
   TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="2.99.5"
+  OPENELEC_VERSION="3.0.4"
 
 # OS_VERSION: OS Version
   OS_VERSION="3.0"

packages/addons/driver/hdhomerun/addon

@@ -24,3 +24,4 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
   cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,23 +1,20 @@
+3.0.3
+  improved python script for modifying tuners
 3.0.2
-- added addon settings for
+  added addon settings for
     modifying tuner type (DVB-C, DVB-T, ATSC)
     setting delays
 3.0.1
-- bump addon version
-- binary files are stored with OpenELEC image
-- addon is used to start userspace program
-
+  bump addon version
+  binary files are stored with OpenELEC image
+  addon is used to start userspace program
 2.1.3
-- bump addon version for new kernel
-
+  bump addon version for new kernel
 2.1.2
-- dvbhdhomerun upgraded to 0.0.10
-
+  dvbhdhomerun upgraded to 0.0.10
 2.1.1
-- rebuild for addon version 2.1
-
+  rebuild for addon version 2.1
 2.0.1
-- starting userspace DVB drivers from Tvheadend/VDR
-
+  starting userspace DVB drivers from Tvheadend/VDR
 2.0.0
-- initial version of HDHomeRun driver
+  initial version of HDHomeRun driver

packages/addons/driver/hdhomerun/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="3.0"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

packages/addons/driver/hdhomerun/source/bin/refresh-tuners.py

@@ -1,125 +0,0 @@
-"""
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2013 ultraman/vpeter
-#
-#  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 shutil
-import xmlpp
-import xbmcaddon
-
-from xml.dom import minidom
-from array import array
-
-__settings__      = xbmcaddon.Addon(id='driver.dvb.hdhomerun')
-__cwd__           = __settings__.getAddonInfo('path')
-__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
-
-__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
-
-# make backup settings only once
-try:
-  with open(__settings_xml__ + '_orig') as f: pass
-except IOError as e:
-  shutil.copyfile(__settings_xml__, __settings_xml__ + '_orig')
-
-######################################################################################################
-
-# get supported devices on a system (name)
-tuners = []
-try:
-  for line in open(__hdhomerun_log__, 'r'):
-    line = line.strip()
-    if line.startswith('Registered tuner'):
-      name = line.split(':');
-      name = name[2].strip()
-      tuners.append(name)
-except IOError:
-  print 'Error reading log file ', __hdhomerun_log__
-
-"""
-root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
-Registered tuner, id from kernel: 0 name: 101ADD2B-0
-Registered tuner, id from kernel: 1 name: 101ADD2B-1
-Registered tuner, id from kernel: 2 name: 1031D75A-0
-Registered tuner, id from kernel: 3 name: 1031D75A-1
-"""
-
-######################################################################################################
-
-xmldoc = minidom.parse(__settings_xml__)
-category = xmldoc.getElementsByTagName('category')
-
-# remove all nodes with id started with ATTACHED_TUNER_
-for node_cat in category:
-  setting = node_cat.getElementsByTagName('setting')
-  for node_set in setting :
-    if 'id' in node_set.attributes.keys() and not node_set.getAttribute('id').find('ATTACHED_TUNER_'):
-      node_set.parentNode.removeChild(node_set)
-
-# add new ATTACHED_TUNER_ nodes for available tuners
-for node_cat in category:
-  setting = node_cat.getElementsByTagName('setting')
-  for node_set in setting :
-    if 'label' in node_set.attributes.keys() and '9010' in node_set.getAttribute('label'):
-      for ix, tuner_name in enumerate(tuners):
-        tuner_name_var = tuner_name.replace('-', '_')
-
-        node1 = xmldoc.createElement("setting")
-        node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_name_var + '_DVBMODE')
-        node1.setAttribute("label", tuner_name)
-        node1.setAttribute("type", 'labelenum')
-        node1.setAttribute("default", 'auto')
-        node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
-        node_cat.appendChild(node1)
-
-        node2 = xmldoc.createElement("setting")
-        node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_name_var + '_FULLNAME')
-        node2.setAttribute("label", '9020')
-        node2.setAttribute("type", 'bool')
-        node2.setAttribute("default", 'false')
-        node_cat.appendChild(node2)
-
-        node3 = xmldoc.createElement("setting")
-        node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_name_var + '_DISABLE')
-        node3.setAttribute("label", '9030')
-        node3.setAttribute("type", 'bool')
-        node3.setAttribute("default", 'false')
-        node_cat.appendChild(node3)
-
-      # for tuner
-      break
-
-######################################################################################################
-
-# save file back
-try:
-  outputfile=open(__settings_xml__, 'w')
-  xmlpp.pprint(xmldoc.toxml(), output=outputfile, indent=2)
-  outputfile.close()
-except IOError:
-  print 'Error writing file ', __settings_xml__
-
-######################################################################################################
-
-# dialog is closed already so just open settings again
-xbmcaddon.Addon(id='driver.dvb.hdhomerun').openSettings()

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -54,7 +54,7 @@ if [ -z "$(pidof userhdhomerun)" ]; then
     SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
     . /var/config/hdhomerun-addon.conf
 
-    for SERIAL in ${SERIALS[@]}; do
+    for SERIAL in $SERIALS; do
       SERIAL_VAR=$(echo $SERIAL | sed 's|-|_|')
       DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DVBMODE)
       FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_FULLNAME)
@@ -67,7 +67,7 @@ if [ -z "$(pidof userhdhomerun)" ]; then
       mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
       echo "" >>$DVBHDHOMERUN_CONF_TMP
       # remove empty lines at the end of file
-      sed -i '${/^$/d;}' $DVBHDHOMERUN_CONF_TMP
+      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
 
       ADDNEW=true
       if [ -n "$DVBMODE" ]; then
@@ -86,6 +86,23 @@ if [ -z "$(pidof userhdhomerun)" ]; then
       echo "" >>$DVBHDHOMERUN_CONF_TMP
     done
 
+    # remove logging from libhdhomerun library
+    awk -v val="[libhdhomerun]" '$0 == val {flag=1; next} /^enable=|^logfile=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-log
+    mv ${DVBHDHOMERUN_CONF_TMP}-log $DVBHDHOMERUN_CONF_TMP
+    echo "" >>$DVBHDHOMERUN_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+    
+    if [ "$LIBHDHOMERUN_LOG" = "true" ]; then
+      cat >>$DVBHDHOMERUN_CONF_TMP << EOF
+
+[libhdhomerun]
+enable=true
+logfile=/var/log/dvbhdhomerun_libhdhomerun.log
+
+EOF
+    fi
+
     md5_1=$(md5sum -b $DVBHDHOMERUN_CONF_TMP | awk '{print $1}')
     md5_2=$(md5sum -b $ADDON_HOME/dvbhdhomerun.conf | awk '{print $1}')
     if [ "$md5_1" != "$md5_2" ]; then

packages/addons/driver/hdhomerun/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -21,3 +21,16 @@
 import os
 import sys
 import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
+
+__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
+
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_hdhomerun_tuners
+  refresh_hdhomerun_tuners(__settings_xml__, __hdhomerun_log__)
+  __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml

@@ -3,10 +3,11 @@
   <string id="1000">General</string>
   <string id="1020">Pre wait time [sec]</string>
   <string id="1030">Post wait time [sec]</string>
+  <string id="1040">Enable libhdhomerun logging</string>
 
   <string id="9000">Tuner settings</string>
   <string id="9005">Enable modifying settings</string>
-  <string id="9010">Refresh...</string>
+  <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    use full name</string>
   <string id="9030">    disabled</string>
 </strings>

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -0,0 +1,272 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 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 shutil
+import xmlpp
+from xml.dom import minidom
+
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+
+######################################################################################################
+# backup setting.xml file only if backup doesn't exist
+def settings_backup(settings_xml):
+  try:
+    with open(settings_xml + '_orig') as f: pass
+  except IOError as e:
+    shutil.copyfile(settings_xml, settings_xml + '_orig')
+
+######################################################################################################
+# restore setting.xml file from backup
+def settings_restore(settings_xml):
+  try:
+    shutil.copyfile(settings_xml + '_orig', settings_xml)
+  except IOError as e:
+    print 'Error restoring file:', settings_xml
+
+######################################################################################################
+# get hdhomerun supported devices on a system (only name like 101ADD2B-0)
+def get_devices_hdhomerun(hdhomerun_log):
+  tuners = []
+  try:
+    for line in open(hdhomerun_log, 'r'):
+      line = line.strip()
+      if line.startswith('Registered tuner'):
+        name = line.split(':');
+        name = name[2].strip()
+        tuners.append(name)
+  except IOError:
+    print 'Error reading hdhomerun log file', hdhomerun_log
+  return tuners
+
+  """
+root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
+Registered tuner, id from kernel: 0 name: 101ADD2B-0
+Registered tuner, id from kernel: 1 name: 101ADD2B-1
+Registered tuner, id from kernel: 2 name: 1031D75A-0
+Registered tuner, id from kernel: 3 name: 1031D75A-1
+  """
+
+######################################################################################################
+# get sundtek supported devices on a system (name, serial number, type)
+def get_devices_sundtek(mediaclient_e):
+  tuners = []
+  try:
+    p = os.popen(mediaclient_e, "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        if str.startswith('device '):
+          name = str[str.find("[")+1:str.find("]")]
+          tuners.append([name, 0, 's'])
+
+        if str.startswith('[SERIAL]:'):
+          line = p.readline()
+          str = line.strip()
+          if str.startswith('ID:'):
+            id = str.split(':');
+            id = id[1].strip()
+            tuners[len(tuners)-1] = [name, id, 's']
+
+        if str.startswith('[DVB-C]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T2]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+  except IOError:
+    print 'Error getting sundtek tuners info'
+  return tuners
+
+  """
+root ~ # mediaclient -e
+**** List of Media Hardware Devices ****
+device 0: [Sundtek MediaTV Pro (USB 2.0)]  DVB-C, DVB-T, ANALOG-TV, FM-RADIO, REMOTE-CONTROL, OSS-AUDIO, RDS
+  [BUS]:
+     ID: 1-7
+  [SERIAL]:
+     ID: U110763295205
+  [DVB-C]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [DVB-T]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [ANALOG-TV]:
+     VIDEO0: /dev/video0
+     VBI0: /dev/vbi0
+  [FM-RADIO]:
+     RADIO0: /dev/radio0
+     RDS: /dev/rds0
+  [REMOTECONTROL]:
+     INPUT0: /dev/mediainput0
+  [OSS]:
+     OSS0: /dev/dsp0
+  """
+
+######################################################################################################
+# parse settings.xml file
+def parse_settings(settings_xml):
+  try:
+    xmldoc = minidom.parse(settings_xml)
+    category = xmldoc.getElementsByTagName('category')
+    return xmldoc
+  except Exception as inst:
+    print 'Error parse settings file', settings_xml
+    return None
+
+######################################################################################################
+# remove all nodes with id started with ATTACHED_TUNER_
+def remove_old_tuners(xmldoc):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'id' in node_set.attributes.keys() and not node_set.getAttribute('id').find('ATTACHED_TUNER_'):
+        node_set.parentNode.removeChild(node_set)
+
+######################################################################################################
+# add new hdhomerun tuners
+def add_hdhomerun(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_var = tuner.replace('-', '_')
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
+    node1.setAttribute("label", tuner)
+    node1.setAttribute("type", 'labelenum')
+    node1.setAttribute("default", 'auto')
+    node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_FULLNAME')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'bool')
+    node2.setAttribute("default", 'false')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'bool')
+    node3.setAttribute("default", 'false')
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new sundtek tuners
+def add_sundtek(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_name   = tuner[0]
+    tuner_serial = tuner[1]
+    tuner_type   = tuner[2]
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_DVBMODE')
+    node1.setAttribute("label", tuner_name + ", " + tuner_serial)
+    node1.setAttribute("type", 'labelenum')
+
+    if (tuner_type == 's'):
+      node1.setAttribute("default", 'DVB-S')
+      node1.setAttribute("values", 'DVB-S')
+    else:
+      node1.setAttribute("default", 'DVB-C')
+      node1.setAttribute("values", 'DVB-C|DVB-T')
+
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_IRPROT')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'labelenum')
+    node2.setAttribute("default", 'auto')
+    node2.setAttribute("values", 'auto|RC5|NEC|RC6')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_KEYMAP')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'file')
+    node3.setAttribute("mask", '*.map')
+    node3.setAttribute("default", __sundtek_userspace__)
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new ATTACHED_TUNER_ nodes for available tuners
+def add_new_tuners(xmldoc, tuners, which):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'label' in node_set.attributes.keys() and '9010' in node_set.getAttribute('label'):
+        if which == 'hdhomerun':
+          add_hdhomerun(xmldoc, node_cat, tuners)
+          break
+        elif which == 'sundtek':
+          add_sundtek(xmldoc, node_cat, tuners)
+          break
+
+
+######################################################################################################
+# save settings.xml file back
+def save_settings(settings_xml, xmldoc):
+  try:
+    outputfile = open(settings_xml, 'w')
+    xmlpp.pprint(xmldoc.toxml(), output = outputfile, indent=2)
+    outputfile.close()
+  except IOError:
+    print 'Error saving file:', settings_xml
+    settings_restore(settings_xml)
+
+######################################################################################################
+# refresh hdhomerun tuners in settings.xml file
+def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+  settings_backup(settings_xml)
+  tuners = get_devices_hdhomerun(hdhomerun_log)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No hdhomerun tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'hdhomerun')
+    save_settings(settings_xml, xmldoc)
+
+######################################################################################################
+# refresh sundtek tuners in settings.xml file
+def refresh_sundtek_tuners(settings_xml, mediaclient_e):
+  settings_backup(settings_xml)
+  tuners = get_devices_sundtek(mediaclient_e)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No sundtek tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'sundtek')
+    save_settings(settings_xml, xmldoc)

packages/addons/driver/hdhomerun/source/resources/settings.xml

@@ -4,10 +4,11 @@
     <setting type="sep" />
     <setting id="PRE_WAIT"  type="number" label="1020" default="2" />
     <setting id="POST_WAIT" type="number" label="1030" default="1" />
+    <setting id="LIBHDHOMERUN_LOG" type="bool" label="1040" default="false" />
   </category>
   <category label="9000">
     <setting type="sep" />
     <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" action="RunScript(/storage/.xbmc/addons/driver.dvb.hdhomerun/bin/refresh-tuners.py, false)" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
   </category>
 </settings>

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,5 @@
+3.0.4
+  improved python script for modifying tuners
 3.0.3
   added addon settings for modifying tuner type (DVB-C, DVB-T)
 3.0.2

packages/addons/driver/sundtek-mediatv/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="3.0"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/sundtek-mediatv/source/bin/refresh-tuners.py

@@ -1,172 +0,0 @@
-"""
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2013 ultraman/vpeter
-#
-#  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 shutil
-import xmlpp
-import xbmcaddon
-
-from xml.dom import minidom
-from array import array
-
-__settings__      = xbmcaddon.Addon(id='driver.dvb.sundtek-mediatv')
-__cwd__           = __settings__.getAddonInfo('path')
-__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
-__ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
-__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
-
-__mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
-
-# make backup settings only once
-try:
-  with open(__settings_xml__ + '_orig') as f: pass
-except IOError as e:
-  shutil.copyfile(__settings_xml__, __settings_xml__ + '_orig')
-
-######################################################################################################
-
-# get supported devices on a system (name, serial number, type)
-tuners = []
-p = os.popen(__mediaclient_e__, "r")
-while 1:
-  line = p.readline()
-  if not line:
-    break
-  else:
-    str = line.strip()
-    if str.startswith('device '):
-      name = str[str.find("[")+1:str.find("]")]
-      tuners.append([name, 0, 's'])
-
-    if str.startswith('[SERIAL]:'):
-      line = p.readline()
-      str = line.strip()
-      if str.startswith('ID:'):
-        id = str.split(':');
-        id = id[1].strip()
-        tuners[len(tuners)-1] = [name, id, 's']
-
-    if str.startswith('[DVB-C]:'):
-      tuners[len(tuners)-1] = [name, id, 'c']
-    elif str.startswith('[DVB-T]:'):
-      tuners[len(tuners)-1] = [name, id, 'c']
-    elif str.startswith('[DVB-T2]:'):
-      tuners[len(tuners)-1] = [name, id, 'c']
-
-"""
-root ~ # mediaclient -e
-**** List of Media Hardware Devices ****
-device 0: [Sundtek MediaTV Pro (USB 2.0)]  DVB-C, DVB-T, ANALOG-TV, FM-RADIO, REMOTE-CONTROL, OSS-AUDIO, RDS
-  [BUS]:
-     ID: 1-7
-  [SERIAL]:
-     ID: U110714145205
-  [DVB-C]:
-     FRONTEND: /dev/dvb/adapter0/frontend0
-     DVR: /dev/dvb/adapter0/dvr0
-     DMX: /dev/dvb/adapter0/demux0
-  [DVB-T]:
-     FRONTEND: /dev/dvb/adapter0/frontend0
-     DVR: /dev/dvb/adapter0/dvr0
-     DMX: /dev/dvb/adapter0/demux0
-  [ANALOG-TV]:
-     VIDEO0: /dev/video0
-     VBI0: /dev/vbi0
-  [FM-RADIO]:
-     RADIO0: /dev/radio0
-     RDS: /dev/rds0
-  [REMOTECONTROL]:
-     INPUT0: /dev/mediainput0
-  [OSS]:
-     OSS0: /dev/dsp0
-"""
-
-######################################################################################################
-
-xmldoc = minidom.parse(__settings_xml__)
-category = xmldoc.getElementsByTagName('category')
-
-# remove all nodes with id started with ATTACHED_TUNER_
-for node_cat in category:
-  setting = node_cat.getElementsByTagName('setting')
-  for node_set in setting :
-    if 'id' in node_set.attributes.keys() and not node_set.getAttribute('id').find('ATTACHED_TUNER_'):
-      node_set.parentNode.removeChild(node_set)
-
-# add new ATTACHED_TUNER_ nodes for available tuners
-for node_cat in category:
-  setting = node_cat.getElementsByTagName('setting')
-  for node_set in setting :
-    if 'label' in node_set.attributes.keys() and '9010' in node_set.getAttribute('label'):
-      for ix, tuner in enumerate(tuners):
-        tuner_name   = tuner[0]
-        tuner_serial = tuner[1]
-        tuner_type   = tuner[2]
-
-        node1 = xmldoc.createElement("setting")
-        node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_DVBMODE')
-        node1.setAttribute("label", tuner_name + ", " + tuner_serial)
-        node1.setAttribute("type", 'labelenum')
-
-        if (tuner_type == 's'):
-          node1.setAttribute("default", 'DVB-S')
-          node1.setAttribute("values", 'DVB-S')
-        else:
-          node1.setAttribute("default", 'DVB-C')
-          node1.setAttribute("values", 'DVB-C|DVB-T')
-
-        node_cat.appendChild(node1)
-
-        node2 = xmldoc.createElement("setting")
-        node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_IRPROT')
-        node2.setAttribute("label", '9020')
-        node2.setAttribute("type", 'labelenum')
-        node2.setAttribute("default", 'auto')
-        node2.setAttribute("values", 'auto|RC5|NEC|RC6')
-        node_cat.appendChild(node2)
-
-        node3 = xmldoc.createElement("setting")
-        node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_KEYMAP')
-        node3.setAttribute("label", '9030')
-        node3.setAttribute("type", 'text')
-        node3.setAttribute("default", 'rc_key_ok')
-        node_cat.appendChild(node3)
-
-      # for tuner
-      break
-
-######################################################################################################
-
-# save file back
-try:
-  outputfile=open(__settings_xml__, 'w')
-  xmlpp.pprint(xmldoc.toxml(), output=outputfile, indent=2)
-  outputfile.close()
-except IOError:
-  print 'Error writing file ', __settings_xml__
-
-######################################################################################################
-
-# dialog is closed already so just open settings again
-xbmcaddon.Addon(id='driver.dvb.sundtek-mediatv').openSettings()

packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh

@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -56,6 +56,9 @@ if [ ! -f "$ADDON_SETTINGS" ]; then
   cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
 fi
 
+[ ! -f $ADDON_HOME/rc_key_enter.map ] && mv $ADDON_HOME/rc_key_enter $ADDON_HOME/rc_key_enter.map
+[ ! -f $ADDON_HOME/rc_key_ok.map ] && mv $ADDON_HOME/rc_key_ok $ADDON_HOME/rc_key_ok.map
+
 mkdir -p /var/config
 cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
 . /var/config/sundtek-addon.conf
@@ -131,7 +134,7 @@ if [ ! -f $ADDON_HOME/driver-version.txt ]; then
 fi
 
 # enable to install same addon package version again
-rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek*
+#rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek*
 
 # add alias for /opt/bin/mediaclient
 alias_set="$(grep libmediaclient.so /storage/.profile 2>/dev/null)"
@@ -213,7 +216,7 @@ if [ -z "$(pidof mediasrv)" ]; then
     mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
     echo "" >>$SUNDTEK_CONF_TMP
     # remove empty lines at the end of file
-    sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
     # add entries
     echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
     for dev in $(seq 0 $DEVICE1_NUM); do
@@ -245,7 +248,7 @@ if [ -z "$(pidof mediasrv)" ]; then
     mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
     echo "" >>$SUNDTEK_CONF_TMP
     # remove empty lines at the end of file
-    sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
   fi
 
   if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
@@ -253,7 +256,7 @@ if [ -z "$(pidof mediasrv)" ]; then
     SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
     . /var/config/sundtek-addon.conf
 
-    for SERIAL in ${SERIALS[@]}; do
+    for SERIAL in $SERIALS; do
       DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
       IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
       KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
@@ -267,15 +270,14 @@ if [ -z "$(pidof mediasrv)" ]; then
 
       [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
 
-      KEYMAP_FILE="$ADDON_HOME/$KEYMAP"
-      [ ! -f $KEYMAP_FILE ] && KEYMAP_FILE=""
+      [ ! -f $KEYMAP ] && KEYMAP=""
 
       # remove setttings for this tuner
       awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
       mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
       echo "" >>$SUNDTEK_CONF_TMP
       # remove empty lines at the end of file
-      sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
 
       ADDNEW=true
       if [ -n "$DVBMODE" ]; then
@@ -286,9 +288,9 @@ if [ -z "$(pidof mediasrv)" ]; then
         [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
         echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
       fi
-      if [ -n "$KEYMAP_FILE" ]; then
+      if [ -n "$KEYMAP" ]; then
         [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "rcmap=$KEYMAP_FILE" >>$SUNDTEK_CONF_TMP
+        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
       fi
 
       echo "" >>$SUNDTEK_CONF_TMP

packages/addons/driver/sundtek-mediatv/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -21,3 +21,18 @@
 import os
 import sys
 import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
+
+__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
+__ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
+__mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
+
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_sundtek_tuners
+  refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
+  __settings__.openSettings()

packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml

@@ -25,7 +25,7 @@
 
   <string id="9000">Tuner settings</string>
   <string id="9005">Enable modifying settings</string>
-  <string id="9010">Refresh...</string>
+  <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    IR protocol</string>
   <string id="9030">    keymap filename</string>
 </strings>

packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py

@@ -0,0 +1,272 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 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 shutil
+import xmlpp
+from xml.dom import minidom
+
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+
+######################################################################################################
+# backup setting.xml file only if backup doesn't exist
+def settings_backup(settings_xml):
+  try:
+    with open(settings_xml + '_orig') as f: pass
+  except IOError as e:
+    shutil.copyfile(settings_xml, settings_xml + '_orig')
+
+######################################################################################################
+# restore setting.xml file from backup
+def settings_restore(settings_xml):
+  try:
+    shutil.copyfile(settings_xml + '_orig', settings_xml)
+  except IOError as e:
+    print 'Error restoring file:', settings_xml
+
+######################################################################################################
+# get hdhomerun supported devices on a system (only name like 101ADD2B-0)
+def get_devices_hdhomerun(hdhomerun_log):
+  tuners = []
+  try:
+    for line in open(hdhomerun_log, 'r'):
+      line = line.strip()
+      if line.startswith('Registered tuner'):
+        name = line.split(':');
+        name = name[2].strip()
+        tuners.append(name)
+  except IOError:
+    print 'Error reading hdhomerun log file', hdhomerun_log
+  return tuners
+
+  """
+root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
+Registered tuner, id from kernel: 0 name: 101ADD2B-0
+Registered tuner, id from kernel: 1 name: 101ADD2B-1
+Registered tuner, id from kernel: 2 name: 1031D75A-0
+Registered tuner, id from kernel: 3 name: 1031D75A-1
+  """
+
+######################################################################################################
+# get sundtek supported devices on a system (name, serial number, type)
+def get_devices_sundtek(mediaclient_e):
+  tuners = []
+  try:
+    p = os.popen(mediaclient_e, "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        if str.startswith('device '):
+          name = str[str.find("[")+1:str.find("]")]
+          tuners.append([name, 0, 's'])
+
+        if str.startswith('[SERIAL]:'):
+          line = p.readline()
+          str = line.strip()
+          if str.startswith('ID:'):
+            id = str.split(':');
+            id = id[1].strip()
+            tuners[len(tuners)-1] = [name, id, 's']
+
+        if str.startswith('[DVB-C]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T2]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+  except IOError:
+    print 'Error getting sundtek tuners info'
+  return tuners
+
+  """
+root ~ # mediaclient -e
+**** List of Media Hardware Devices ****
+device 0: [Sundtek MediaTV Pro (USB 2.0)]  DVB-C, DVB-T, ANALOG-TV, FM-RADIO, REMOTE-CONTROL, OSS-AUDIO, RDS
+  [BUS]:
+     ID: 1-7
+  [SERIAL]:
+     ID: U110763295205
+  [DVB-C]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [DVB-T]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [ANALOG-TV]:
+     VIDEO0: /dev/video0
+     VBI0: /dev/vbi0
+  [FM-RADIO]:
+     RADIO0: /dev/radio0
+     RDS: /dev/rds0
+  [REMOTECONTROL]:
+     INPUT0: /dev/mediainput0
+  [OSS]:
+     OSS0: /dev/dsp0
+  """
+
+######################################################################################################
+# parse settings.xml file
+def parse_settings(settings_xml):
+  try:
+    xmldoc = minidom.parse(settings_xml)
+    category = xmldoc.getElementsByTagName('category')
+    return xmldoc
+  except Exception as inst:
+    print 'Error parse settings file', settings_xml
+    return None
+
+######################################################################################################
+# remove all nodes with id started with ATTACHED_TUNER_
+def remove_old_tuners(xmldoc):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'id' in node_set.attributes.keys() and not node_set.getAttribute('id').find('ATTACHED_TUNER_'):
+        node_set.parentNode.removeChild(node_set)
+
+######################################################################################################
+# add new hdhomerun tuners
+def add_hdhomerun(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_var = tuner.replace('-', '_')
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
+    node1.setAttribute("label", tuner)
+    node1.setAttribute("type", 'labelenum')
+    node1.setAttribute("default", 'auto')
+    node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_FULLNAME')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'bool')
+    node2.setAttribute("default", 'false')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'bool')
+    node3.setAttribute("default", 'false')
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new sundtek tuners
+def add_sundtek(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_name   = tuner[0]
+    tuner_serial = tuner[1]
+    tuner_type   = tuner[2]
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_DVBMODE')
+    node1.setAttribute("label", tuner_name + ", " + tuner_serial)
+    node1.setAttribute("type", 'labelenum')
+
+    if (tuner_type == 's'):
+      node1.setAttribute("default", 'DVB-S')
+      node1.setAttribute("values", 'DVB-S')
+    else:
+      node1.setAttribute("default", 'DVB-C')
+      node1.setAttribute("values", 'DVB-C|DVB-T')
+
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_IRPROT')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'labelenum')
+    node2.setAttribute("default", 'auto')
+    node2.setAttribute("values", 'auto|RC5|NEC|RC6')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_KEYMAP')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'file')
+    node3.setAttribute("mask", '*.map')
+    node3.setAttribute("default", __sundtek_userspace__)
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new ATTACHED_TUNER_ nodes for available tuners
+def add_new_tuners(xmldoc, tuners, which):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'label' in node_set.attributes.keys() and '9010' in node_set.getAttribute('label'):
+        if which == 'hdhomerun':
+          add_hdhomerun(xmldoc, node_cat, tuners)
+          break
+        elif which == 'sundtek':
+          add_sundtek(xmldoc, node_cat, tuners)
+          break
+
+
+######################################################################################################
+# save settings.xml file back
+def save_settings(settings_xml, xmldoc):
+  try:
+    outputfile = open(settings_xml, 'w')
+    xmlpp.pprint(xmldoc.toxml(), output = outputfile, indent=2)
+    outputfile.close()
+  except IOError:
+    print 'Error saving file:', settings_xml
+    settings_restore(settings_xml)
+
+######################################################################################################
+# refresh hdhomerun tuners in settings.xml file
+def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+  settings_backup(settings_xml)
+  tuners = get_devices_hdhomerun(hdhomerun_log)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No hdhomerun tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'hdhomerun')
+    save_settings(settings_xml, xmldoc)
+
+######################################################################################################
+# refresh sundtek tuners in settings.xml file
+def refresh_sundtek_tuners(settings_xml, mediaclient_e):
+  settings_backup(settings_xml)
+  tuners = get_devices_sundtek(mediaclient_e)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No sundtek tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'sundtek')
+    save_settings(settings_xml, xmldoc)

packages/addons/driver/sundtek-mediatv/source/resources/settings.xml

@@ -28,6 +28,6 @@
   <category label="9000">
     <setting type="sep" />
     <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" action="RunScript(/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/bin/refresh-tuners.py, false)" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
   </category>
 </settings>

packages/addons/networking/backup/rsync/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
 PKG_URL="ftp://rsync.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_BUILD_DEPENDS="toolchain $ICONV popt"
 PKG_PRIORITY="optional"
 PKG_SECTION="network/backup"
 PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"

packages/addons/service/multimedia/boblightd/changelog.txt

@@ -1,3 +1,6 @@
+3.0.3
+- update to boblightd-465
+
 3.0.2
 - depends on libGLU
 

packages/addons/service/multimedia/boblightd/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="boblightd"
-PKG_VERSION="449"
-PKG_REV="2"
+PKG_VERSION="465"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS="libusb"
+PKG_BUILD_DEPENDS="toolchain libusb"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="boblightd: an ambilight controller."

packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch

@@ -1,13 +0,0 @@
-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

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,6 @@
+3.0.7
+- update to TVHeadend 3.3.511
+
 3.0.6
 - update to TVHeadend 3.3.491
 - disable avahi support

packages/addons/service/multimedia/tvheadend/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.3.491"
-PKG_REV="6"
+PKG_VERSION="3.3.511"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -94,7 +94,11 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
   fi
 fi
 
-TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
+if [ "$DEBUG" = "yes" ]; then
+  TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
+else
+  TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
+fi
 
 mkdir -p /var/config
   if [ -f $ADDON_DIR/settings-default.xml ]; then

packages/addons/service/multimedia/vdr-addon/addon

@@ -78,8 +78,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/libcap-[0-9]*/libcap/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/libzip-[0-9]*/lib/.libs/libzip*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/service/softcam/oscam/build

@@ -36,6 +36,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
       -DWEBIF=1 \
       -DWITH_DEBUG=0 \
       -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
+      -DSTATIC_LIBUSB=1 \
       ..
 
 make

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,3 +1,6 @@
+3.0.9
+- update to oscam-8568
+
 3.0.8
 - update to oscam-8469
 - update to pcsc-lite-1.8.8

packages/addons/service/softcam/oscam/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="8469"
-PKG_REV="8"
+PKG_VERSION="8568"
+PKG_REV="9"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"
@@ -32,6 +32,7 @@ PKG_PRIORITY="optional"
 PKG_SECTION="service/softcam"
 PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul."
 PKG_LONGDESC="OSCam is Open Source Conditional Access Modul."
+PKG_DISCLAIMER="using oscam may be illegal in your country. if in doubt, do not install"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"

packages/audio/alsa-lib/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.0.26"
+PKG_VERSION="1.0.27.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/alsa-lib/patches/alsa-lib-1.0.26-automake_1.13.patch

@@ -1,12 +0,0 @@
-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

packages/audio/alsa-lib/patches/alsa-lib-990.01-control_Simplify_usingsnd_config_get_bool.patch

@@ -1,87 +0,0 @@
-From: Takashi Iwai <tiwai <at> suse.de>
-Subject: [PATCH RFC 1/2] control: Simplify using	snd_config_get_bool()
-Newsgroups: gmane.linux.alsa.devel
-Date: 2012-10-12 15:25:23 GMT (17 weeks, 8 hours and 26 minutes ago)
-snd_config_get_bool() was improved to parse also ASCII strings now,
-so we don't have to open-code the boolean parser in
-src/control/setup.c any longer.
-
-Signed-off-by: Takashi Iwai <tiwai <at> suse.de>
----
- src/control/setup.c | 37 ++++++-------------------------------
- 1 file changed, 6 insertions(+), 31 deletions(-)
-
-diff --git a/src/control/setup.c b/src/control/setup.c
-index eecda45..bd3599d 100644
---- a/src/control/setup.c
-+++ b/src/control/setup.c
-@@ -400,7 +400,6 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da
- {
- 	snd_config_t *conf;
- 	snd_config_iterator_t i, next;
--	char *tmp;
- 	int iface = SND_CTL_ELEM_IFACE_MIXER;
- 	const char *name = NULL;
- 	long index = 0;
-@@ -464,33 +463,17 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da
- 			continue;
- 		}
- 		if (strcmp(id, "lock") == 0) {
--			if ((err = snd_config_get_ascii(n, &tmp)) < 0) {
--				SNDERR("field %s has an invalid type", id);
--				goto _err;
--			}
--			err = snd_config_get_bool_ascii(tmp);
--			if (err < 0) {
--				SNDERR("field %s is not a boolean", id);
--				free(tmp);
-+			err = snd_config_get_bool(n);
-+			if (err < 0)
- 				goto _err;
--			}
- 			lock = err;
--			free(tmp);
- 			continue;
- 		}
- 		if (strcmp(id, "preserve") == 0) {
--			if ((err = snd_config_get_ascii(n, &tmp)) < 0) {
--				SNDERR("field %s has an invalid type", id);
--				goto _err;
--			}
--			err = snd_config_get_bool_ascii(tmp);
--			if (err < 0) {
--				SNDERR("field %s is not a boolean", id);
--				free(tmp);
-+			err = snd_config_get_bool(n);
-+			if (err < 0)
- 				goto _err;
--			}
- 			preserve = err;
--			free(tmp);
- 			continue;
- 		}
- 		if (strcmp(id, "value") == 0) {
-@@ -502,18 +485,10 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da
- 			continue;
- 		}
- 		if (strcmp(id, "optional") == 0) {
--			if ((err = snd_config_get_ascii(n, &tmp)) < 0) {
--				SNDERR("field %s has an invalid type", id);
--				goto _err;
--			}
--			err = snd_config_get_bool_ascii(tmp);
--			if (err < 0) {
--				SNDERR("field %s is not a boolean", id);
--				free(tmp);
-+			err = snd_config_get_bool(n);
-+			if (err < 0)
- 				goto _err;
--			}
- 			optional = err;
--			free(tmp);
- 			continue;
- 		}
- 		SNDERR("Unknown field %s", id);
--- 
-1.7.12.2
-

packages/audio/alsa-lib/patches/alsa-lib-990.02-Add-workaround-for-conflicting-IEC958-controls-for-H.patch

@@ -1,123 +0,0 @@
-From 91e42790dd0a9489a94e3784d220d76ad2d98b36 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sat, 16 Feb 2013 18:29:59 +0200
-Subject: [PATCH] Add workaround for conflicting IEC958 controls for HD-audio
-
-When both an SPDIF and an HDMI output are present on HD-audio, both
-try to access IEC958 controls with index=0 although one of them must
-be wrong.  For avoiding this conflict, the recent kernel code (3.9 and
-3.8 stable) moves the IEC958 controls of an SPDIF with index=16 once
-when the conflict happens.
-
-In this patch, the corresponding support is added in alsa-lib side.
-The new "skip_rest" boolean flag is added to the hooked element
-definition which indicates that the rest of element array will be
-ignored once when this element is present and evaluated.  With this
-new flag, the HD-audio config takes device=1 primarily, then take
-device=0 as fallback.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- src/conf/cards/HDA-Intel.conf |   16 ++++++++++++++++
- src/control/setup.c           |   19 ++++++++++++++++---
- 2 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf
-index d4f2667..3957c12 100644
---- a/src/conf/cards/HDA-Intel.conf
-+++ b/src/conf/cards/HDA-Intel.conf
-@@ -113,6 +113,22 @@ HDA-Intel.pcm.iec958.0 {
- 			hook_args [
- 			{
- 				name "IEC958 Playback Default"
-+				index 16
-+				optional true
-+				lock true
-+				preserve true
-+				value [ $AES0 $AES1 $AES2 $AES3 ]
-+			}
-+			{
-+				name "IEC958 Playback Switch"
-+				index 16
-+				optional true
-+				value true
-+				# if this element is present, skip the rest
-+				skip_rest true
-+			}
-+			{
-+				name "IEC958 Playback Default"
- 				lock true
- 				preserve true
- 				value [ $AES0 $AES1 $AES2 $AES3 ]
-diff --git a/src/control/setup.c b/src/control/setup.c
-index eecda45..72facb0 100644
---- a/src/control/setup.c
-+++ b/src/control/setup.c
-@@ -396,7 +396,7 @@ static int snd_config_get_ctl_elem_value(snd_config_t *conf,
- 	return 0;
- }
- 
--static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_data)
-+static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_data, int *quit)
- {
- 	snd_config_t *conf;
- 	snd_config_iterator_t i, next;
-@@ -409,6 +409,7 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da
- 	int lock = 0;
- 	int preserve = 0;
- 	int optional = 0;
-+	int skip_rest = 0;
- 	snd_config_t *value = NULL, *mask = NULL;
- 	snd_sctl_elem_t *elem = NULL;
- 	int err;
-@@ -516,6 +517,13 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da
- 			free(tmp);
- 			continue;
- 		}
-+		if (strcmp(id, "skip_rest") == 0) {
-+			err = snd_config_get_bool(n);
-+			if (err < 0)
-+				goto _err;
-+			skip_rest = err;
-+			continue;
-+		}
- 		SNDERR("Unknown field %s", id);
- 		return -EINVAL;
- 	}
-@@ -564,6 +572,9 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da
- 		if (! optional)
- 			SNDERR("Cannot obtain info for CTL elem (%s,'%s',%li,%li,%li): %s", snd_ctl_elem_iface_name(iface), name, index, device, subdevice, snd_strerror(err));
- 		goto _err;
-+	} else {
-+		if (skip_rest)
-+			*quit = 1;
- 	}
- 	snd_ctl_elem_value_set_id(elem->val, elem->id);
- 	snd_ctl_elem_value_set_id(elem->old, elem->id);
-@@ -619,7 +630,7 @@ int snd_sctl_build(snd_sctl_t **sctl, snd_ctl_t *handle, snd_config_t *conf, snd
- {
- 	snd_sctl_t *h;
- 	snd_config_iterator_t i, next;
--	int err;
-+	int err, quit = 0;
- 
- 	assert(sctl);
- 	assert(handle);
-@@ -639,11 +650,13 @@ int snd_sctl_build(snd_sctl_t **sctl, snd_ctl_t *handle, snd_config_t *conf, snd
- 	INIT_LIST_HEAD(&h->elems);
- 	snd_config_for_each(i, next, conf) {
- 		snd_config_t *n = snd_config_iterator_entry(i);
--		err = add_elem(h, n, private_data);
-+		err = add_elem(h, n, private_data, &quit);
- 		if (err < 0) {
- 			free_elems(h);
- 			return err;
- 		}
-+		if (quit)
-+			break;
- 	}
- 	*sctl = h;
- 	return 0;
--- 
-1.7.10
-

packages/audio/alsa-plugins/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="alsa-plugins"
-PKG_VERSION="1.0.26"
+PKG_VERSION="1.0.27"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/alsa-utils/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="alsa-utils"
-PKG_VERSION="1.0.26"
+PKG_VERSION="1.0.27.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/alsa-utils/patches/alsa-utils-1.0.26-automake_1.13.patch

@@ -1,12 +0,0 @@
-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

packages/audio/pulseaudio/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
 PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
+PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl"
 PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/databases/mysql/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mysql"
-PKG_VERSION="5.1.67"
+PKG_VERSION="5.1.68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/databases/mysql/patches/mysql-5.1.67-automake_1.13.patch

@@ -1,12 +0,0 @@
-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

packages/databases/sqlite/build

@@ -50,15 +50,12 @@ cd $PKG_BUILD
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
             --disable-readline \
             --enable-threadsafe \
             --enable-dynamic-extensions \
             --with-gnu-ld
 
 make
-
-$STRIP .libs/sqlite3
-
 $MAKEINSTALL

packages/databases/sqlite/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3071502"
+PKG_VERSION="autoconf-3071700"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
 PKG_SITE="http://www.sqlite.org/"
-PKG_URL="http://sqlite.org/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://sqlite.org/2013/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/debug/acpica/build

@@ -30,6 +30,9 @@ cd $PKG_BUILD
 make PREFIX=/usr \
      CC="$TARGET_CC" \
      AR="$TARGET_AR" \
+     HOST=_LINUX \
+     HARDWARE_NAME=$TARGET_ARCH \
      BITS=$ACPICA_BITS \
      YACC=$ROOT/$TOOLCHAIN/bin/bison \
      CWARNINGFLAGS="-O2 $TARGET_CFLAGS"
+

packages/debug/acpica/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="acpica-unix2"
-PKG_VERSION="20130117"
+PKG_VERSION="20130328"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.acpica.org/"
 PKG_URL="https://www.acpica.org/download/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://acpica.org/sites/acpica/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain flex bison"
 PKG_PRIORITY="optional"

packages/debug/acpica/patches/acpica-unix2-20130117-01-crosscompile.patch

@@ -1,12 +0,0 @@
-diff -uNr acpica-unix2-20130117-orig/generate/unix/Makefile.common acpica-unix2-20130117/generate/unix/Makefile.common
---- acpica-unix2-20130117-orig/generate/unix/Makefile.common	2013-01-17 20:47:44.000000000 +0100
-+++ acpica-unix2-20130117/generate/unix/Makefile.common	2013-02-07 15:13:59.000000000 +0100
-@@ -6,7 +6,7 @@
- # Get the OS machine architecture. Anything with a "64" in the returned
- # string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
- #
--HARDWARE_NAME := $(shell uname -m)
-+HARDWARE_NAME=$(BITS)
- BITS=0
- 
- #

packages/debug/pmtools/build

@@ -23,8 +23,15 @@
 . config/options $1
 
 cd $PKG_BUILD
-make PREFIX=/usr \
-     CC="$TARGET_CC" \
-     AR="$TARGET_AR" \
+make CC="$TARGET_CC" \
      CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \
-     CPPFLAGS="$TARGET_CPPFLAGS" \
+     -C acpidump acpidump
+
+make CC="$TARGET_CC" \
+     CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \
+     -C acpixtract acpixtract
+
+make CC="$TARGET_CC" \
+     CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \
+     -C madt madt
+

packages/debug/pmtools/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="pmtools"
-PKG_VERSION="20071116"
+PKG_VERSION="20110323"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://lesswatts.org/projects/acpi/utilities.php"
-PKG_URL="https://lesswatts.org/patches/linux_acpi/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://mirror.linux.org.au/linux/kernel/people/lenb/acpi/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/debug/pmtools/patches/pmtools-madt.patch

@@ -0,0 +1,25 @@
+diff -Naur pmtools/madt/Makefile pmtools.patch/madt/Makefile
+--- pmtools/madt/Makefile	2005-11-11 18:07:04.000000000 +0100
++++ pmtools.patch/madt/Makefile	2007-11-16 19:48:56.000000000 +0100
+@@ -1,6 +1,16 @@
++PROG= madt
++SRCS=	madt.c
++
++all: madt
++$(PROG) : $(SRCS)
++	$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++
+ test: madt
+-	./madt < APIC
+-madt: madt.c acpi.h tables.c
+-	cc -o madt madt.c
+-clean:
+-	rm madt
++	./madt < example.APIC.dat
++	./madt < example.APIC.bad.dat
++
++CLEANFILES= $(PROG)
++
++clean : 
++	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS)) *~
++

packages/debug/pmtools/unpack

@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
 #
 #  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

packages/debug/powertop/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://01.org/powertop/"
 PKG_URL="https://01.org/powertop/sites/default/files/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="ncurses pciutils libnl"
+PKG_DEPENDS="ncurses pciutils"
 PKG_BUILD_DEPENDS="toolchain ncurses pciutils libnl"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"

packages/debug/smem/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="smem"
-PKG_VERSION="1.2"
+PKG_VERSION="1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/debug/wireless_tools/build

@@ -22,10 +22,10 @@
 
 . config/options $1
 
+# wireless_tools fails to build on some systems with LTO enabled
+  strip_lto
+
 cd $PKG_BUILD
 
-make PREFIX=/usr \
-     CC="$TARGET_CC" \
-     AR="$TARGET_AR" \
-     CFLAGS="$TARGET_CFLAGS" \
-     CPPFLAGS="$TARGET_CPPFLAGS" \
+make PREFIX=/usr CC="$CC" AR="$AR" \
+     CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall

packages/debug/wireless_tools/install

@@ -23,13 +23,8 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwconfig $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwgetid $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwevent $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwlist $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwspy $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwpriv $INSTALL/usr/bin/
-  cp $PKG_BUILD/ifrename $INSTALL/usr/bin/
-
-mkdir -p $INSTALL/usr/lib/
-  cp $PKG_BUILD/libiw.so.29 $INSTALL/usr/lib/
+  cp $PKG_BUILD/iwmulticall $INSTALL/usr/bin/iwconfig
+  ln -sf iwconfig $INSTALL/usr/bin/iwgetid
+  ln -sf iwconfig $INSTALL/usr/bin/iwlist
+  ln -sf iwconfig $INSTALL/usr/bin/iwspy
+  ln -sf iwconfig $INSTALL/usr/bin/iwpriv

packages/devel/arm-mem/build

@@ -24,4 +24,4 @@
 
 cd $PKG_BUILD
 
-make libcofi_rpi.so
+make libarmmem.so

packages/devel/arm-mem/install

@@ -26,4 +26,4 @@ mkdir -p $INSTALL/lib
   cp -P $PKG_BUILD/*.so* $INSTALL/lib
 
 mkdir -p $INSTALL/etc
-  echo "/lib/libcofi_rpi.so" >> $INSTALL/etc/ld.so.preload
+  echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload

packages/devel/arm-mem/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="libcofi"
-PKG_VERSION="7313fbe"
+PKG_NAME="arm-mem"
+PKG_VERSION="8a1fbee"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/simonjhall/copies-and-fills"
+PKG_SITE="https://github.com/bavison/arm-mem"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
-PKG_SHORTDESC="libcofi: a replacement for memcpy and memset functionality for the Raspberry Pi with the intention of gaining greater performance"
-PKG_LONGDESC="libcofi is a replacement for memcpy and memset functionality for the Raspberry Pi with the intention of gaining greater performance"
+PKG_SHORTDESC="arm-mem: ARM-accelerated versions of selected functions from string.h"
+PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/devel/attr/build

@@ -41,13 +41,13 @@ INSTALL_GROUP=root \
             --exec-prefix=/usr \
             --sysconfdir=/etc \
             --datadir=/usr/share \
-            --enable-shared \
-            --disable-static \
+            --disable-shared \
+            --enable-static \
 
 make
 
 mkdir -p $SYSROOT_PREFIX/usr/lib/
-  cp -P libattr/.libs/*.so* $SYSROOT_PREFIX/usr/lib/
+  cp libattr/.libs/libattr.a $SYSROOT_PREFIX/usr/lib/
 
 mkdir -p $SYSROOT_PREFIX/usr/include/attr
-  cp -P include/*.h $SYSROOT_PREFIX/usr/include/attr
+  cp include/*.h $SYSROOT_PREFIX/usr/include/attr

packages/devel/boost/build

@@ -34,8 +34,7 @@ sh bootstrap.sh \
 echo "using gcc : `$TARGET_CC -v 2>&1  | tail -n 1 |awk '{print $3}'` : $TARGET_CC  : <compileflags>\"$CFLAGS\" <linkflags>\"$LDFLAGS\" ;" \
   > tools/build/v2/user-config.jam
 
-$ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc  \
-  link=shared \
+$ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
   --prefix=$SYSROOT_PREFIX/usr \
   --layout=system \
   --with-thread \

packages/devel/boost/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_52_0"
+PKG_VERSION="1_53_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.boost.org/"
-PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.52.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.53.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS="zlib bzip2"
 PKG_BUILD_DEPENDS="toolchain boost-jam Python-host zlib bzip2"
 PKG_PRIORITY="optional"

packages/devel/dbus-glib/build

@@ -35,8 +35,8 @@ mkdir -p .build-target && cd .build-target
              --prefix=/usr \
              --sysconfdir=/etc \
              --localstatedir=/var \
-             --disable-static \
-             --enable-shared \
+             --enable-static \
+             --disable-shared \
              --disable-tests \
              --enable-asserts=no \
              --with-introspect-xml="$ROOT/$DBUS_DIR/.build-host/introspect.xml" \

packages/devel/elfutils/build

@@ -34,5 +34,16 @@ cd $PKG_BUILD
             --without-bzlib \
             --without-lzma \
 
-make V=1
-$MAKEINSTALL
+make V=1 -C libelf libelf.a
+make V=1 -C libebl libebl.a
+make V=1 -C libdwfl libdwfl.a
+make V=1 -C libdw libdw.a
+
+make DESTDIR="$SYSROOT_PREFIX" -C libelf install-includeHEADERS install-pkgincludeHEADERS
+make DESTDIR="$SYSROOT_PREFIX" -C libdw install-includeHEADERS install-pkgincludeHEADERS
+
+mkdir -p $SYSROOT_PREFIX/usr/lib
+  cp libelf/libelf.a $SYSROOT_PREFIX/usr/lib
+  cp libdw/libdw.a $SYSROOT_PREFIX/usr/lib
+
+  

packages/devel/elfutils/install

@@ -1,28 +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) 2010-2011 Roman Weber (roman@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/libdw/*.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libelf/*.so* $INSTALL/usr/lib

packages/devel/file/meta

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

packages/devel/glib/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 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_DEPENDS="zlib $ICONV libffi"
 PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host Python-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"

packages/devel/gmp/build

@@ -34,9 +34,8 @@ mkdir -p .objdir-target && cd .objdir-target
              --sysconfdir=/etc \
              --datadir=/usr/share \
              --localstatedir=/var \
-             --disable-static \
-             --enable-shared \
-             --disable-mpbsd \
+             --enable-static \
+             --disable-shared \
              --disable-cxx \
 
 make

packages/devel/gmp/install

@@ -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/.objdir-target/.libs/libgmp.so* $INSTALL/usr/lib

packages/devel/gmp/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="gmp"
-PKG_VERSION="5.0.5"
+PKG_VERSION="5.1.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://gmplib.org/"
-PKG_URL="http://ftp.sunet.se/pub/gnu/gmp/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.gmplib.org/pub/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/devel/gmp/patches/gmp-5.0.5-automake-1.13.patch

@@ -1,36 +0,0 @@
-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	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])
-+AC_CONFIG_HEADERS(config.h:config.in)
- AM_MAINTAINER_MODE
- 
- 
-@@ -2228,9 +2228,6 @@
- echo "      MPN_PATH=\"$path\""
- 
- 
--# Automake ansi2knr support.
--AM_C_PROTOTYPES
--
- CL_AS_NOEXECSTACK
- 
- 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	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".
- #
--AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
-+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
- 
- 
- # Libtool -version-info for libgmp.la and libmp.la.  See "Versioning" in the

packages/devel/libcap/build

@@ -33,6 +33,11 @@ make CC=$HOST_CC -C libcap _makenames
 
 setup_toolchain target
 
-make CC=$TARGET_CC CFLAGS="$TARGET_CFLAGS" lib=/lib
+make CC=$TARGET_CC CFLAGS="$TARGET_CFLAGS" lib=/lib -C libcap libcap.a
+
+mkdir -p $SYSROOT_PREFIX/usr/lib
+  cp libcap/libcap.a $SYSROOT_PREFIX/usr/lib
+
+mkdir -p $SYSROOT_PREFIX/usr/include/sys
+  cp libcap/include/sys/capability.h $SYSROOT_PREFIX/usr/include/sys
 
-$MAKEINSTALL -j1 RAISE_SETFCAP=no lib=/lib

packages/devel/libcap/install

@@ -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)
-#      Copyright (C) 2010-2011 Roman Weber (roman@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/libcap/*.so* $INSTALL/usr/lib

packages/devel/libcap/meta

@@ -29,7 +29,7 @@ PKG_LICENSE="GPL"
 PKG_SITE=""
 #PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="attr"
+PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain attr"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"

packages/devel/libcec/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="2.1.1"
+PKG_VERSION="2.1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
 PKG_URL="http://packages.pulse-eight.net/pulse/sources/libcec/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="systemd lockdev"
+PKG_DEPENDS="systemd"
 PKG_BUILD_DEPENDS="toolchain systemd lockdev"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"

packages/devel/libftdi/build

@@ -29,9 +29,12 @@ LIBS="-lusb" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
+            --disable-shared \
+            --enable-static \
             --disable-libftdipp \
             --disable-python-binding \
             --without-examples \
+            --without-docs
 
 make
 $MAKEINSTALL

packages/devel/libiconv/build

@@ -23,6 +23,8 @@
 . config/options $1
 
 cd $PKG_BUILD
+chmod +x ./configure ./preload/configure ./libcharset/configure
+
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \

packages/devel/libiconv/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="libiconv"
-PKG_VERSION="1.14"
+PKG_VERSION="20130504"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/libiconv/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
+# PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/devel/lockdev/build

@@ -28,8 +28,8 @@ mkdir -p m4 && do_autoreconf
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
 
 make
 

packages/devel/lockdev/install

@@ -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/src/.libs/*.so* $INSTALL/usr/lib

packages/devel/newt/build

@@ -32,5 +32,13 @@ cd $PKG_BUILD
             --without-python \
             --without-tcl
 
-make
-$MAKEINSTALL
+make libnewt.a
+
+mkdir -p $SYSROOT_PREFIX/usr/lib
+  cp libnewt.a $SYSROOT_PREFIX/usr/lib
+
+mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
+  cp libnewt.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+
+mkdir -p $SYSROOT_PREFIX/usr/include
+  cp newt.h $SYSROOT_PREFIX/usr/include

packages/devel/newt/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://fedorahosted.org/newt/"
 PKG_URL="https://fedorahosted.org/releases/n/e/newt/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="popt slang"
+PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain popt slang"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"

packages/devel/newt/patches/newt-libdir.patch

@@ -0,0 +1,12 @@
+diff -Naur newt-0.52.14/Makefile.in newt-0.52.14.patch/Makefile.in
+--- newt-0.52.14/Makefile.in	2011-11-11 12:00:15.000000000 +0100
++++ newt-0.52.14.patch/Makefile.in	2013-05-30 23:40:30.104284277 +0200
+@@ -5,7 +5,7 @@
+ CPP = @CPP@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ 
++CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ 
+ GNU_LD = @GNU_LD@
+ 
+ VERSION = @VERSION@

packages/devel/pcre/build

@@ -22,6 +22,10 @@
 
 . config/options $1
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
 mkdir -p m4 && do_autoreconf
 
@@ -32,8 +36,8 @@ mkdir -p .build-target && cd .build-target
              --exec-prefix=/usr \
              --sysconfdir=/etc \
              --datadir=/usr/share \
-             --enable-shared \
-             --disable-static \
+             --disable-shared \
+             --enable-static \
              --enable-utf8 \
              --enable-unicode-properties \
              --with-gnu-ld

packages/devel/pcre/install

@@ -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
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/.libs/libpcre*.so*[.0-9] $INSTALL/usr/lib
-

packages/devel/pcre/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.32"
+PKG_VERSION="8.33"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/devel/popt/build

@@ -29,8 +29,8 @@ cd $PKG_BUILD
             --exec-prefix=/usr \
             --sysconfdir=/etc \
             --datadir=/usr/share \
-            --enable-shared \
-            --disable-static \
+            --disable-shared \
+            --enable-static \
 
 make
 $MAKEINSTALL

packages/devel/slang/build

@@ -38,5 +38,5 @@ cd $PKG_BUILD
             --without-z \
             --without-x \
 
-make -C src
-$MAKEINSTALL -C src
+make -C src static
+make DESTDIR="$SYSROOT_PREFIX" -C src install-static

packages/devel/slang/install

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  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 -PR $PKG_BUILD/src/*/libslang.so* $INSTALL/usr/lib/

packages/devel/yajl/build

@@ -32,3 +32,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
 make
 
 $MAKEINSTALL
+mv $SYSROOT_PREFIX/usr/lib/libyajl_s.a $SYSROOT_PREFIX/usr/lib/libyajl.a
+rm $SYSROOT_PREFIX/usr/lib/libyajl.so*