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

packages/3rdparty/download/CouchPotato/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="CouchPotato"
-PKG_VERSION="6cd66ae"
+PKG_VERSION="4eec8e0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/Headphones/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="Headphones"
-PKG_VERSION="ee3326e"
+PKG_VERSION="e9a1e55"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SABnzbd/meta

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

packages/3rdparty/download/SickBeard/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="SickBeard"
-PKG_VERSION="e0e8f0e"
+PKG_VERSION="9f64728"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/addons/debugging/tools/evtest/addon

@@ -27,6 +27,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest-capture.bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/debugging/tools/evtest/changelog.txt

@@ -1,3 +1,7 @@
+1.0.0
+- update to evtest-1.29
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - change icon
 

packages/addons/debugging/tools/evtest/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="evtest"
-PKG_VERSION="1.27"
+PKG_VERSION="1.29"
-PKG_REV="3"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"

packages/addons/debugging/tools/htop/changelog.txt

@@ -1,3 +1,6 @@
+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.4
 - change icon
 

packages/addons/debugging/tools/htop/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="0.9"
-PKG_REV="4"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"

packages/addons/multimedia/libav/changelog.txt

@@ -1,3 +1,7 @@
+1.0.0
+- update to libav-0.7.2
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - update to libav-0.7 (final)
 

packages/addons/multimedia/libav/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="libav"
-PKG_VERSION="0.7"
+PKG_VERSION="0.7.2"
-PKG_REV="3"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libav.org"

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,3 +1,6 @@
+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - update to makemkv-1.6.15
 

packages/addons/multimedia/makemkv/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="makemkv"
 PKG_VERSION="1.6.15"
-PKG_REV="3"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"

packages/addons/multimedia/xbmc-addon-xvdr/addon

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_BUILD/addons/pvr.vdr.xvdr/resources $ADDON_BUILD/$PKG_ADDON_ID
+  cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+  cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $ADDON_BUILD/$PKG_ADDON_ID
+  cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $ADDON_BUILD/$PKG_ADDON_ID

packages/addons/multimedia/xbmc-addon-xvdr/build

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+# some fixes for autoreconf
+  touch NEWS AUTHORS ChangeLog
+  do_autoreconf
+
+CXXFLAGS="-DZLIB_INTERNAL=1" \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-static \
+            --enable-shared
+
+make

packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt

@@ -0,0 +1,2 @@
+1.0.0
+- initial import of xbmc-addon-xvdr-9822a8a

packages/addons/multimedia/xbmc-addon-xvdr/install

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
+  cp -PRf $PKG_BUILD/addons/pvr.vdr.xvdr/resources $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
+  cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
+#  cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
+  cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr

packages/addons/multimedia/xbmc-addon-xvdr/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xbmc-addon-xvdr"
+PKG_VERSION="9822a8a"
+PKG_REV="0"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/pipelka/xbmc-addon-xvdr"
+PKG_URL="http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/xbmc-addon-xvdr-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="zlib"
+PKG_BUILD_DEPENDS="toolchain zlib"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia/pvr"
+PKG_SHORTDESC="XVDR addon for XBMC"
+PKG_LONGDESC="This addon allows XBMC PVR to connect to the VDR server."
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_AUTORECONF="no"

packages/addons/multimedia/xbmc-addon-xvdr/source/default.py

@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon

packages/addons/networking/backup/rsync/changelog.txt

@@ -1,3 +1,7 @@
+1.0.0
+- update to rsync-3.0.9
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - change icon
 

packages/addons/networking/backup/rsync/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="rsync"
-PKG_VERSION="3.0.8"
+PKG_VERSION="3.0.9"
-PKG_REV="3"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,3 +1,11 @@
+1.0.0
+- update to unrar-4.0.7
+- update to CouchPotato-4eec8e0
+- update to Headphones-e9a1e55
+- update to SickBeard-9f64728
+- update to SABnzbd-0.6.10
+- prepare for OpenELEC-1.0 release
+
 0.99.4
 - add Headphones-ee3326e
 

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="SABnzbd-Suite"
-PKG_VERSION="0.99"
+PKG_VERSION="1.0"
-PKG_REV="4"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/downloadmanager/transmission/changelog.txt

@@ -1,3 +1,7 @@
+1.0.0
+- update to transmission-2.41
+- prepare for OpenELEC-1.0 release
+
 0.99.8
 - update to transmission-2.33
 - add libevent to addon

packages/addons/service/downloadmanager/transmission/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.33"
+PKG_VERSION="2.41"
-PKG_REV="8"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"

packages/addons/service/multimedia/hts-tvheadend/addon

@@ -22,5 +22,9 @@
 
 . config/options $1
 
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
+  cp -PR $PKG_DIR/config/xmltv-config* $ADDON_BUILD/$PKG_ADDON_ID/xmltv-config
+
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/build.Linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin

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

@@ -1,3 +1,12 @@
+1.0.1
+- add XMLTV tv_file_grab support
+- add XMLTV configuration support
+- add teletext support patch
+- add fix memory leak patch
+
+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.8
 - add suspend/wakeup script
 

packages/addons/service/multimedia/hts-tvheadend/config/settings.xml

@@ -0,0 +1,4 @@
+<settings>
+    <setting id="XMLTV_LOCATION" value="" />
+    <setting id="XMLTV_TYPE" value="NONE" />
+</settings>

packages/addons/service/multimedia/hts-tvheadend/config/xmltv-config

@@ -0,0 +1,14 @@
+{
+	"grabbers": [
+		{
+			"path": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file",
+			"description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
+			"version": "0.1\n",
+			"mtime": 1318774706,
+			"capabilities": 1
+		}
+	],
+	"grab-interval": 12,
+	"grab-enabled": 1,
+	"current-grabber": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file"
+}

packages/addons/service/multimedia/hts-tvheadend/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="c88a646"
-PKG_REV="8"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-deliver_raw_teletext_to_clients.patch

@@ -0,0 +1,112 @@
+From 3b407aa2053b1db3316873acd05c64319676eb34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
+Date: Fri, 30 Sep 2011 12:56:01 +0200
+Subject: [PATCH] Deliver raw teletext to clients that are able to display it (e.g. XBMC)
+
+---
+ src/parsers.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/tsdemux.c |    7 +++----
+ 2 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/src/parsers.c b/src/parsers.c
+index 9b7337d..68c7996 100644
+--- a/src/parsers.c
++++ b/src/parsers.c
+@@ -102,6 +102,9 @@ static void parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data
+ static void parse_subtitles(service_t *t, elementary_stream_t *st, 
+ 			    const uint8_t *data, int len, int start);
+ 
++static void parse_teletext(service_t *t, elementary_stream_t *st, 
++			    const uint8_t *data, int len, int start);
++
+ static int parse_mpa(service_t *t, elementary_stream_t *st, size_t len,
+ 		     uint32_t next_startcode, int sc_offset);
+ 
+@@ -158,6 +161,10 @@ parse_mpeg_ts(service_t *t, elementary_stream_t *st, const uint8_t *data,
+     parse_aac(t, st, data, len, start);
+     break;
+ 
++  case SCT_TELETEXT:
++    parse_teletext(t, st, data, len, start);
++    break;
++
+   default:
+     break;
+   }
+@@ -1232,6 +1239,54 @@ parse_subtitles(service_t *t, elementary_stream_t *st, const uint8_t *data,
+   }
+ }
+ 
++/**
++ * Teletext parser
++ */
++static void
++parse_teletext(service_t *t, elementary_stream_t *st, const uint8_t *data,
++		int len, int start)
++{
++  th_pkt_t *pkt;
++  int psize, hlen;
++  const uint8_t *buf;
++  const uint8_t *d;
++  if(start) {
++    st->es_parser_state = 1;
++    st->es_buf.sb_err = 0;
++    st->es_parser_ptr = 0;
++    sbuf_reset(&st->es_buf);    
++  }
++
++  if(st->es_parser_state == 0)
++    return;
++
++  sbuf_append(&st->es_buf, data, len);
++
++  if(st->es_buf.sb_ptr < 6)
++    return;
++  d = st->es_buf.sb_data;
++
++  psize = d[4] << 8 | d[5];
++
++  if(st->es_buf.sb_ptr != psize + 6)
++    return;
++
++  st->es_parser_state = 0;
++
++  hlen = parse_pes_header(t, st, d + 6, st->es_buf.sb_ptr - 6);
++  if(hlen < 0)
++    return;
++
++  psize -= hlen;
++  buf = d + 6 + hlen;
++  
++  if(psize >= 46) {
++
++      pkt = pkt_alloc(buf, psize, st->es_curpts, st->es_curdts);
++      pkt->pkt_commercial = t->s_tt_commercial_advice;
++      parser_deliver(t, st, pkt);
++  }	
++}
+ 
+ /**
+  *
+diff --git a/src/tsdemux.c b/src/tsdemux.c
+index 897fe1d..5fdaf8b 100644
+--- a/src/tsdemux.c
++++ b/src/tsdemux.c
+@@ -110,11 +110,10 @@ ts_recv_packet0(service_t *t, elementary_stream_t *st, const uint8_t *tsb)
+ 			   got_section, st);
+     break;
+ 
+-  case SCT_TELETEXT:
+-    teletext_input(t, st, tsb);
+-    break;
+-
+   default:
++    if(st->es_type == SCT_TELETEXT)
++      teletext_input(t, st, tsb);
++
+     if(off > 188)
+       break;
+ 
+-- 
+1.7.3.1
+

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-fix_memory_leak_queue_protection.patch

@@ -0,0 +1,26 @@
+From 60e5a1014c52e926fb7dbb12392f60a473e44d2c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
+Date: Fri, 30 Sep 2011 13:23:46 +0200
+Subject: [PATCH] Fix memory leak in queue size protection
+
+---
+ src/htsp.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/htsp.c b/src/htsp.c
+index 8bb803b..f786a88 100644
+--- a/src/htsp.c
++++ b/src/htsp.c
+@@ -1508,6 +1508,9 @@ htsp_stream_deliver(htsp_subscription_t *hs, th_pkt_t *pkt)
+ 
+     hs->hs_dropstats[pkt->pkt_frametype]++;
+ 
++    // destroy the already created htsmsg to avoid memory leaks
++    htsmsg_destroy(m);
++
+     /* Queue size protection */
+     pkt_ref_dec(pkt);
+     return;
+-- 
+1.7.3.1
+

packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+XMLTV_LOCATION=`grep XMLTV_LOCATION $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+
+dflag=
+vflag=
+cflag=
+
+if [[ $# -lt 1 ]]; then
+  if [ "$XMLTV_TYPE" = "FILE" ]; then
+    cat "$XMLTV_LOCATION"
+    exit 0
+  elif [ "$XMLTV_TYPE" = "WEB" ]; then
+    wget -qO - "$XMLTV_LOCATION"
+    exit 0
+  fi
+fi
+
+for arg; do
+    delim=""
+    case "$arg" in
+    #translate --gnu-long-options to -g (short options)
+       --description) args="${args}-d ";;
+       --version) args="${args}-v ";;
+       --capabilities) args="${args}-c ";;
+       #pass through anything else
+       *) [[ "${arg:0:1}" == "-" ]] || delim="\""
+           args="${args}${delim}${arg}${delim} ";;
+    esac
+done
+
+#Reset the positional parameters to the short options
+eval set -- $args
+
+while getopts "dvc" option; do
+    case $option in
+        d)  dflag=1;;
+        v)  vflag=1;;
+        c)  cflag=1;;
+        \?) printf "unknown option: -%s\n" $OPTARG
+            printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
+            exit 2
+            ;;
+    esac >&2
+done
+
+if [ "$dflag" ]; then
+   printf "tv_grab_file is a simple grabber that just read the local or web XMLTV formated file\n"
+fi
+if [ "$vflag" ]; then
+   printf "0.1\n"
+fi
+if [ "$cflag" ]; then
+   printf "baseline\n"
+fi

packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service

@@ -23,6 +23,23 @@
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 LOG_FILE="$ADDON_HOME/service.log"
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file"
+XMLTV_SETTINGS_DIR="$ADDON_HOME/xmltv"
+XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
+
+if [ ! -f "$ADDON_SETTINGS" ]; then
+  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+fi
+
+if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
+  mkdir -p $XMLTV_SETTINGS_DIR
+  cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+fi
+
+if [ ! -f "$XMLTV_FILE" ]; then
+  chmod +x $XMLTV_FILE
+fi
 
 TVHEADEND_ARG="-f -C -s -u root -g root -c $ADDON_HOME"
 

packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd-Suite -->
+	<string id="1000">XMLTV</string>
+	<string id="1011">XMLTV configuration</string>
+	<string id="1011">XMLTV source type</string>
+	<string id="1012">XMLTV location</string>
+
+</strings>

packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+
+   <!-- HTS TVHEADEND -->
+    <category label="1000">
+		<setting label="1010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|WEB" sort="yes" default="NONE"/>
+		<setting id="XMLTV_LOCATION" type="text" label="1012" default="" enable="!eq(-1,1)"/>
+    </category>
+</settings>

packages/addons/shell/texteditor/nano/changelog.txt

@@ -1,3 +1,7 @@
+1.0.0
+- update to nano-2.3.1
+- prepare for OpenELEC-1.0 release
+
 0.99.4
 - change icon
 

packages/addons/shell/texteditor/nano/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="nano"
-PKG_VERSION="2.3.0"
+PKG_VERSION="2.3.1"
-PKG_REV="4"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"

packages/compress/unrar/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="unrar"
-PKG_VERSION="4.0.4"
+PKG_VERSION="4.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="free"

packages/linux-firmware/wlan-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.6"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-457-fix_connection_check-0.1.patch

@@ -0,0 +1,15 @@
+diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/FileCurl.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileCurl.cpp
+--- xbmc-10.1-Dharma/xbmc/FileSystem/FileCurl.cpp	2011-03-08 02:49:14.000000000 +0100
++++ xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileCurl.cpp	2011-10-17 19:21:04.180783870 +0200
+@@ -803,9 +803,9 @@
+ // Detect whether we are "online" or not! Very simple and dirty!
+ bool CFileCurl::IsInternet(bool checkDNS /* = true */)
+ {
+-  CStdString strURL = "http://www.google.com";
++  CStdString strURL = "http://www.openelec.tv";
+   if (!checkDNS)
+-    strURL = "http://74.125.19.103"; // www.google.com ip
++    strURL = "http://212.101.13.10"; // www.openelec.tv ip
+ 
+   bool found = Exists(strURL);
+   Close();

packages/sysutils/lcdproc/config/LCDd.conf

@@ -577,7 +577,7 @@ Protocol=0
 
 # Set the exit behavior [legal: 0=leave shutdown message, 1=show the big clock,
 # 2=blank device; default: 1]
-#OnExit=2
+OnExit=2
 
 # Select the output device to use [default: /dev/lcd0]
 Device=/dev/lcd0

projects/ATV/options

@@ -145,7 +145,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+  ADDITIONAL_DRIVERS="asix-ax887xx AF9035 bcm_sta"
 
 # build with network support (yes / no)
   NETWORK="yes"

scripts/create_addon

@@ -53,6 +53,7 @@ if [ -f $PKG_DIR/addon ]; then
   $PKG_DIR/addon $@ >&$VERBOSE_OUT
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+    if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
       cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
       $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
            -e "s|@PKG_NAME@|$PKG_NAME|g" \
@@ -63,12 +64,12 @@ if [ -f $PKG_DIR/addon ]; then
            -e "s|@OS_VERSION@|$OS_VERSION|g" \
            -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
            -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+    fi
 
     if [ -f $PKG_DIR/source/default.py ]; then
       cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
     else
-      echo "*** ERROR: you need at least $PKG_DIR/source/default.py so your addon can work ***"
+      echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***"
-      exit 1
     fi
 
     if [ -f $PKG_DIR/icon/icon.png ]; then