From 2eecb31fda22300c8f08ccecca68dcd639143bd8 Mon Sep 17 00:00:00 2001
From: Gujs <gujs.lists@gmail.com>
Date: Sun, 16 Oct 2011 17:15:22 +0200
Subject: [PATCH 01/25] hts-tvheadend addon: Add XMLTV support and add some
 patches until they are included into main tvheadend source

---
 .../service/multimedia/hts-tvheadend/addon    |   4 +
 .../multimedia/hts-tvheadend/changelog.txt    |   6 +
 .../hts-tvheadend/config/settings.xml         |   4 +
 .../hts-tvheadend/config/xmltv-config         |  14 +++
 .../service/multimedia/hts-tvheadend/meta     |   2 +-
 ...a646-deliver_raw_teletext_to_clients.patch | 112 ++++++++++++++++++
 ...646-fix_memory_leak_queue_protection.patch |  26 ++++
 .../hts-tvheadend/source/bin/tv_grab_file     |  59 +++++++++
 .../source/bin/tvheadend.service              |  17 +++
 .../resources/language/English/strings.xml    |  10 ++
 .../source/resources/settings.xml             |  11 ++
 11 files changed, 264 insertions(+), 1 deletion(-)
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/config/xmltv-config
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-deliver_raw_teletext_to_clients.patch
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-fix_memory_leak_queue_protection.patch
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
 create mode 100644 packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml

diff --git a/packages/addons/service/multimedia/hts-tvheadend/addon b/packages/addons/service/multimedia/hts-tvheadend/addon
index 3e0ab9a67c..ad2c079534 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/addon
+++ b/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
diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index 5487c925c2..8309cda3dc 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,9 @@
+1.00.0
+- add XMLTV tv_file_grab support
+- add XMLTV configuration support
+- add teletext support patch
+- add fix memory leak patch
+
 0.99.8
 - add suspend/wakeup script
 
diff --git a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
new file mode 100644
index 0000000000..6be91dac2a
--- /dev/null
+++ b/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>
diff --git a/packages/addons/service/multimedia/hts-tvheadend/config/xmltv-config b/packages/addons/service/multimedia/hts-tvheadend/config/xmltv-config
new file mode 100644
index 0000000000..7439a5de59
--- /dev/null
+++ b/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"
+}
diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
index a2e0000e5b..869e5f621f 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="c88a646"
-PKG_REV="8"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-deliver_raw_teletext_to_clients.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-deliver_raw_teletext_to_clients.patch
new file mode 100644
index 0000000000..614e54df3a
--- /dev/null
+++ b/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
+
diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-fix_memory_leak_queue_protection.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-fix_memory_leak_queue_protection.patch
new file mode 100644
index 0000000000..79632e6c4c
--- /dev/null
+++ b/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
+
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
new file mode 100644
index 0000000000..49a63ae2ee
--- /dev/null
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
@@ -0,0 +1,59 @@
+#!/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
+
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
index d365232e51..9c2ea0d222 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
+++ b/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_DIR" ]; 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"
 
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
new file mode 100644
index 0000000000..6eeb22a953
--- /dev/null
+++ b/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>
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
new file mode 100644
index 0000000000..c8771ebbd6
--- /dev/null
+++ b/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>

From 5603bb9d08bf618250a80c629b858ccc1389edca Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:53:23 +0200
Subject: [PATCH 02/25] rsync: update to rsync-3.0.9, prepare for OpenELEC-1.0
 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/networking/backup/rsync/changelog.txt | 4 ++++
 packages/addons/networking/backup/rsync/meta          | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/addons/networking/backup/rsync/changelog.txt b/packages/addons/networking/backup/rsync/changelog.txt
index 83597c7c7b..5bfc285858 100644
--- a/packages/addons/networking/backup/rsync/changelog.txt
+++ b/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
 
diff --git a/packages/addons/networking/backup/rsync/meta b/packages/addons/networking/backup/rsync/meta
index 56656bac76..7d36587453 100644
--- a/packages/addons/networking/backup/rsync/meta
+++ b/packages/addons/networking/backup/rsync/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="rsync"
-PKG_VERSION="3.0.8"
-PKG_REV="3"
+PKG_VERSION="3.0.9"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"

From 676190af15704de322000b004a4b8adb1b46b5c9 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:54:02 +0200
Subject: [PATCH 03/25] nano: update to nano-2.3.1, prepare for OpenELEC-1.0
 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/shell/texteditor/nano/changelog.txt | 4 ++++
 packages/addons/shell/texteditor/nano/meta          | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
index 92fb70e8e6..417b7aa987 100644
--- a/packages/addons/shell/texteditor/nano/changelog.txt
+++ b/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
 
diff --git a/packages/addons/shell/texteditor/nano/meta b/packages/addons/shell/texteditor/nano/meta
index 230cbc9b20..64238f56f8 100644
--- a/packages/addons/shell/texteditor/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="nano"
-PKG_VERSION="2.3.0"
-PKG_REV="4"
+PKG_VERSION="2.3.1"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"

From 9c7ed1c42f91370111aa9a683c0c7d3b4524c83b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:54:36 +0200
Subject: [PATCH 04/25] libav: update to libav-0.7.2, prepare for OpenELEC-1.0
 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/multimedia/libav/changelog.txt | 4 ++++
 packages/addons/multimedia/libav/meta          | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/addons/multimedia/libav/changelog.txt b/packages/addons/multimedia/libav/changelog.txt
index 019076164d..da5fc454c5 100644
--- a/packages/addons/multimedia/libav/changelog.txt
+++ b/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)
 
diff --git a/packages/addons/multimedia/libav/meta b/packages/addons/multimedia/libav/meta
index 67991f0694..e8abec953e 100644
--- a/packages/addons/multimedia/libav/meta
+++ b/packages/addons/multimedia/libav/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="libav"
-PKG_VERSION="0.7"
-PKG_REV="3"
+PKG_VERSION="0.7.2"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libav.org"

From d711fd89bb5b9ee126c770355f97997242732069 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:55:31 +0200
Subject: [PATCH 05/25] evtest: update to evtest-1.29, prepare for OpenELEC-1.0
 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/debugging/tools/evtest/addon         | 6 +++---
 packages/addons/debugging/tools/evtest/changelog.txt | 4 ++++
 packages/addons/debugging/tools/evtest/meta          | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/addons/debugging/tools/evtest/addon b/packages/addons/debugging/tools/evtest/addon
index 816eaeb5c5..175d4e3742 100755
--- a/packages/addons/debugging/tools/evtest/addon
+++ b/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 $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/libiconv-[0-9]*/lib/.libs/libiconv.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 -P $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/addons/debugging/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt
index dd60311c55..2efafae05f 100644
--- a/packages/addons/debugging/tools/evtest/changelog.txt
+++ b/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
 
diff --git a/packages/addons/debugging/tools/evtest/meta b/packages/addons/debugging/tools/evtest/meta
index c70e099691..8b356a35cf 100644
--- a/packages/addons/debugging/tools/evtest/meta
+++ b/packages/addons/debugging/tools/evtest/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="evtest"
-PKG_VERSION="1.27"
-PKG_REV="3"
+PKG_VERSION="1.29"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"

From ef1d296e8f20f0c69d57011f1ce663621daef23e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:56:08 +0200
Subject: [PATCH 06/25] htop: prepare for OpenELEC-1.0 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/debugging/tools/htop/changelog.txt | 3 +++
 packages/addons/debugging/tools/htop/meta          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
index 0b317e8f5a..7595cef8a7 100644
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ b/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
 
diff --git a/packages/addons/debugging/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
index fa054e23d0..8a97eaf4ab 100644
--- a/packages/addons/debugging/tools/htop/meta
+++ b/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/"

From 5fceed5705c5b2f589ee14248430d5ad78a01536 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:56:29 +0200
Subject: [PATCH 07/25] makemkv: prepare for OpenELEC-1.0 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/multimedia/makemkv/changelog.txt | 3 +++
 packages/addons/multimedia/makemkv/meta          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt
index 9589c49fe8..f1a7f2103f 100644
--- a/packages/addons/multimedia/makemkv/changelog.txt
+++ b/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
 
diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta
index 757a900b6a..0b9d84f234 100644
--- a/packages/addons/multimedia/makemkv/meta
+++ b/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"

From 57a2caedc27a7a06e018b07afac0ca5085b4bf1a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:57:17 +0200
Subject: [PATCH 08/25] transmission: update to transmission-2.41, prepare for
 OpenELEC-1.0 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../addons/service/downloadmanager/transmission/changelog.txt | 4 ++++
 packages/addons/service/downloadmanager/transmission/meta     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt
index 4de1cdf8b0..c090896e08 100644
--- a/packages/addons/service/downloadmanager/transmission/changelog.txt
+++ b/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
diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta
index af2627b927..ac8ebfc340 100644
--- a/packages/addons/service/downloadmanager/transmission/meta
+++ b/packages/addons/service/downloadmanager/transmission/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.33"
-PKG_REV="8"
+PKG_VERSION="2.41"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"

From d26f4878d7f7f3ee3939d2aeba5aace27ba070b1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:57:52 +0200
Subject: [PATCH 09/25] hts-tvheadend: prepare for OpenELEC-1.0 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/service/multimedia/hts-tvheadend/changelog.txt | 3 +++
 packages/addons/service/multimedia/hts-tvheadend/meta          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index 5487c925c2..5022c0489f 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.8
 - add suspend/wakeup script
 
diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
index a2e0000e5b..869e5f621f 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="c88a646"
-PKG_REV="8"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

From b4211a010219f0df0e6c83ff0364776da319c32b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:58:34 +0200
Subject: [PATCH 10/25] CouchPotato: update to CouchPotato-4eec8e0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/3rdparty/download/CouchPotato/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/3rdparty/download/CouchPotato/meta b/packages/3rdparty/download/CouchPotato/meta
index 7b1596dfe2..b0b6c171d6 100644
--- a/packages/3rdparty/download/CouchPotato/meta
+++ b/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"

From 96aff15d4b4be4941e5d9471e1518e71d05f6be5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:59:06 +0200
Subject: [PATCH 11/25] Headphones: update to Headphones-e9a1e55

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/3rdparty/download/Headphones/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/3rdparty/download/Headphones/meta b/packages/3rdparty/download/Headphones/meta
index 4788feece3..d75f34ae3a 100644
--- a/packages/3rdparty/download/Headphones/meta
+++ b/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"

From bb1f632e9878e058c3bcdc4f5097276cc8c0f168 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:59:32 +0200
Subject: [PATCH 12/25] SABnzbd: update to SABnzbd-0.6.10

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/3rdparty/download/SABnzbd/meta                         | 2 +-
 ...tch => SABnzbd-0.6.10-001_remove_default_settings-0.3.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/3rdparty/download/SABnzbd/patches/{SABnzbd-0.6.7-001_remove_default_settings-0.3.patch => SABnzbd-0.6.10-001_remove_default_settings-0.3.patch} (100%)

diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta
index e08671e3b9..7d393363b0 100644
--- a/packages/3rdparty/download/SABnzbd/meta
+++ b/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"
diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.7-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.10-001_remove_default_settings-0.3.patch
similarity index 100%
rename from packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.7-001_remove_default_settings-0.3.patch
rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.10-001_remove_default_settings-0.3.patch

From 2d0550c56ab5e00738630257196cb74f41a4339b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 08:59:59 +0200
Subject: [PATCH 13/25] SickBeard: update to SickBeard-9f64728

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/3rdparty/download/SickBeard/meta                       | 2 +-
 ...8-001-remove_logo_update-header_and_donate_button-0.1.patch} | 0
 ... => SickBeard-9f64728-002-remove_default_settings-0.3.patch} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/3rdparty/download/SickBeard/patches/{SickBeard-e0e8f0e-001-remove_logo_update-header_and_donate_button-0.1.patch => SickBeard-9f64728-001-remove_logo_update-header_and_donate_button-0.1.patch} (100%)
 rename packages/3rdparty/download/SickBeard/patches/{SickBeard-e0e8f0e-002-remove_default_settings-0.3.patch => SickBeard-9f64728-002-remove_default_settings-0.3.patch} (100%)

diff --git a/packages/3rdparty/download/SickBeard/meta b/packages/3rdparty/download/SickBeard/meta
index 982e49778d..e2bf56b543 100644
--- a/packages/3rdparty/download/SickBeard/meta
+++ b/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"
diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-001-remove_logo_update-header_and_donate_button-0.1.patch
similarity index 100%
rename from packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-001-remove_logo_update-header_and_donate_button-0.1.patch
rename to packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-001-remove_logo_update-header_and_donate_button-0.1.patch
diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-002-remove_default_settings-0.3.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-002-remove_default_settings-0.3.patch
similarity index 100%
rename from packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-002-remove_default_settings-0.3.patch
rename to packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-002-remove_default_settings-0.3.patch

From 8f7d4a6d052b78a08ab9d69e4ac7d6fda026e1ea Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 09:00:43 +0200
Subject: [PATCH 14/25] unrar: update to unrar-4.0.7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/compress/unrar/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compress/unrar/meta b/packages/compress/unrar/meta
index 84876b19ea..c553adcc5b 100644
--- a/packages/compress/unrar/meta
+++ b/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"

From d48ab73724f32387dec15af5f3070a73f80199a2 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 09:01:29 +0200
Subject: [PATCH 15/25] SABnzbd-Suite: update to SABnzbd-Suite-1.0.0, prepare
 for OpenELEC-1.0 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../service/downloadmanager/SABnzbd-Suite/changelog.txt   | 8 ++++++++
 .../addons/service/downloadmanager/SABnzbd-Suite/meta     | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
index fff9522931..39a3873e82 100644
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
+++ b/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
 
diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
index f38c519cc4..92fe0a87d8 100644
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="SABnzbd-Suite"
-PKG_VERSION="0.99"
-PKG_REV="4"
+PKG_VERSION="1.0"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

From 16846150eeb9dca057e54080fc026d347db3bdc6 Mon Sep 17 00:00:00 2001
From: anoma <AlanNomander@gmail.com>
Date: Mon, 17 Oct 2011 16:43:25 +0200
Subject: [PATCH 16/25] OnExit blank the imonlcd panel rather than show clock

---
 packages/sysutils/lcdproc/config/LCDd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sysutils/lcdproc/config/LCDd.conf b/packages/sysutils/lcdproc/config/LCDd.conf
index 47d4764e1a..a4ec8140b9 100644
--- a/packages/sysutils/lcdproc/config/LCDd.conf
+++ b/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

From a4799ec20f71a296a93b9a95cc72d3b12e3e8510 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 17:42:04 +0200
Subject: [PATCH 17/25] wlan-firmware: update to wlan-firmware-0.0.7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/wlan-firmware/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta
index b5ef66da2d..116c3c7792 100644
--- a/packages/linux-firmware/wlan-firmware/meta
+++ b/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"

From f4d88b0a27cc41930ab63fd55aad342ab1982973 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 18:45:33 +0200
Subject: [PATCH 18/25] projects/ATV: build and install bcm_sta WLAN driver
 again

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 projects/ATV/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/ATV/options b/projects/ATV/options
index 48a08000d1..c01cf9401a 100644
--- a/projects/ATV/options
+++ b/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"

From 3e6236519757f82fef63d4f9d96b891e77e79a2f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 17 Oct 2011 21:07:35 +0200
Subject: [PATCH 19/25] xbmc: fix internet connection check on various
 locations

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 ...10.1-Dharma-457-fix_connection_check-0.1.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-457-fix_connection_check-0.1.patch

diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-457-fix_connection_check-0.1.patch
new file mode 100644
index 0000000000..06304e56ae
--- /dev/null
+++ b/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();

From 5c9fe6b4ec79a23ee2450a6ac2892d82e843d34b Mon Sep 17 00:00:00 2001
From: Gujs <gujs.lists@gmail.com>
Date: Tue, 18 Oct 2011 00:10:14 +0200
Subject: [PATCH 20/25] hts-tvheadend: fix xmltv settins file check

---
 .../multimedia/hts-tvheadend/source/bin/tvheadend.service     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
index 9c2ea0d222..c680b8d0dd 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
@@ -32,7 +32,7 @@ if [ ! -f "$ADDON_SETTINGS" ]; then
   cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
 fi
 
-if [ ! -f "$XMLTV_SETTINGS_DIR" ]; then
+if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
   mkdir -p $XMLTV_SETTINGS_DIR
   cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
 fi
@@ -46,4 +46,4 @@ TVHEADEND_ARG="-f -C -s -u root -g root -c $ADDON_HOME"
 mkdir -p $ADDON_HOME
   if [ ! $(pidof tvheadend) ];then
     tvheadend $TVHEADEND_ARG &>$LOG_FILE
-  fi
\ No newline at end of file
+  fi

From 4c588b1862048900dccba1f937697c543aac774d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 18 Oct 2011 01:48:36 +0200
Subject: [PATCH 21/25] hts-tvheadend: cosmetics

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/service/multimedia/hts-tvheadend/changelog.txt   | 1 -
 .../service/multimedia/hts-tvheadend/source/bin/tv_grab_file     | 1 -
 2 files changed, 2 deletions(-)
 mode change 100644 => 100755 packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file

diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index 4479aff7a5..59409030eb 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,4 +1,3 @@
-
 1.0.1
 - add XMLTV tv_file_grab support
 - add XMLTV configuration support
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
old mode 100644
new mode 100755
index 49a63ae2ee..76b9e64eb6
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
@@ -56,4 +56,3 @@ fi
 if [ "$cflag" ]; then
    printf "baseline\n"
 fi
-

From 9fbd5a5a5bc7f51cbd826009b8254d404b8a35b7 Mon Sep 17 00:00:00 2001
From: Alexander Pipelka <alexander.pipelka@gmail.com>
Date: Wed, 7 Sep 2011 20:56:03 +0200
Subject: [PATCH 22/25] xbmc: added xbmc-addon-xvdr package

---
 packages/mediacenter/xbmc-addon-xvdr/build   | 37 ++++++++++++++++++++
 packages/mediacenter/xbmc-addon-xvdr/install | 29 +++++++++++++++
 packages/mediacenter/xbmc-addon-xvdr/meta    | 36 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100755 packages/mediacenter/xbmc-addon-xvdr/build
 create mode 100755 packages/mediacenter/xbmc-addon-xvdr/install
 create mode 100644 packages/mediacenter/xbmc-addon-xvdr/meta

diff --git a/packages/mediacenter/xbmc-addon-xvdr/build b/packages/mediacenter/xbmc-addon-xvdr/build
new file mode 100755
index 0000000000..b415ce0996
--- /dev/null
+++ b/packages/mediacenter/xbmc-addon-xvdr/build
@@ -0,0 +1,37 @@
+#!/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/share/xbmc \
+            --disable-static \
+            --enable-shared
+
+make
diff --git a/packages/mediacenter/xbmc-addon-xvdr/install b/packages/mediacenter/xbmc-addon-xvdr/install
new file mode 100755
index 0000000000..59ec12b0e6
--- /dev/null
+++ b/packages/mediacenter/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
diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/mediacenter/xbmc-addon-xvdr/meta
new file mode 100644
index 0000000000..1f91892318
--- /dev/null
+++ b/packages/mediacenter/xbmc-addon-xvdr/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      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="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+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="mediacenter"
+PKG_SHORTDESC="XVDR addon for XBMC"
+PKG_LONGDESC="This addon allows XBMC PVR to connect to the VDR server."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

From 11c6a97d23e8e887466eb2cc316ee57bd41cb74b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 18 Oct 2011 03:18:56 +0200
Subject: [PATCH 23/25] xbmc-addon-xvdr: convert to addon

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../addons/multimedia/xbmc-addon-xvdr/addon   |  29 ++++++++++++++++++
 .../multimedia}/xbmc-addon-xvdr/build         |   5 +--
 .../multimedia/xbmc-addon-xvdr/changelog.txt  |   2 ++
 .../multimedia/xbmc-addon-xvdr/icon/icon.png  | Bin 0 -> 26487 bytes
 .../multimedia}/xbmc-addon-xvdr/install       |   2 +-
 .../multimedia}/xbmc-addon-xvdr/meta          |   9 +++---
 .../xbmc-addon-xvdr/source/default.py         |  23 ++++++++++++++
 7 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100755 packages/addons/multimedia/xbmc-addon-xvdr/addon
 rename packages/{mediacenter => addons/multimedia}/xbmc-addon-xvdr/build (92%)
 create mode 100644 packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
 create mode 100644 packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png
 rename packages/{mediacenter => addons/multimedia}/xbmc-addon-xvdr/install (93%)
 rename packages/{mediacenter => addons/multimedia}/xbmc-addon-xvdr/meta (90%)
 create mode 100644 packages/addons/multimedia/xbmc-addon-xvdr/source/default.py

diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/addon b/packages/addons/multimedia/xbmc-addon-xvdr/addon
new file mode 100755
index 0000000000..740fcc9230
--- /dev/null
+++ b/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
diff --git a/packages/mediacenter/xbmc-addon-xvdr/build b/packages/addons/multimedia/xbmc-addon-xvdr/build
similarity index 92%
rename from packages/mediacenter/xbmc-addon-xvdr/build
rename to packages/addons/multimedia/xbmc-addon-xvdr/build
index b415ce0996..794b360977 100755
--- a/packages/mediacenter/xbmc-addon-xvdr/build
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/build
@@ -28,9 +28,10 @@ cd $PKG_BUILD
   touch NEWS AUTHORS ChangeLog
   do_autoreconf
 
-CXXFLAGS="-DZLIB_INTERNAL=1" ./configure --host=$TARGET_NAME \
+CXXFLAGS="-DZLIB_INTERNAL=1" \
+./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
-            --prefix=/usr/share/xbmc \
+            --prefix=/usr \
             --disable-static \
             --enable-shared
 
diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt b/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
new file mode 100644
index 0000000000..c9271f76dd
--- /dev/null
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
@@ -0,0 +1,2 @@
+1.0.0
+- initial import of xbmc-addon-xvdr-9822a8a
diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png b/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8f83ae27dff8b82f477f9efb482b8a016d467dc
GIT binary patch
literal 26487
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

literal 0
HcmV?d00001

diff --git a/packages/mediacenter/xbmc-addon-xvdr/install b/packages/addons/multimedia/xbmc-addon-xvdr/install
similarity index 93%
rename from packages/mediacenter/xbmc-addon-xvdr/install
rename to packages/addons/multimedia/xbmc-addon-xvdr/install
index 59ec12b0e6..81b096dc4b 100755
--- a/packages/mediacenter/xbmc-addon-xvdr/install
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/install
@@ -25,5 +25,5 @@
 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/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
diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/addons/multimedia/xbmc-addon-xvdr/meta
similarity index 90%
rename from packages/mediacenter/xbmc-addon-xvdr/meta
rename to packages/addons/multimedia/xbmc-addon-xvdr/meta
index 1f91892318..9b3d814d96 100644
--- a/packages/mediacenter/xbmc-addon-xvdr/meta
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/meta
@@ -20,17 +20,18 @@
 
 PKG_NAME="xbmc-addon-xvdr"
 PKG_VERSION="9822a8a"
-PKG_REV="1"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE=""
+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="mediacenter"
+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="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="no"
diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py b/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/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

From fbea5df192e95e8828d38e9df367494fbfe0ff8d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 18 Oct 2011 03:20:14 +0200
Subject: [PATCH 24/25] scripts/create_addon: dont create an addon.xml if its
 shipped with addon

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 scripts/create_addon | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/create_addon b/scripts/create_addon
index 9d64210415..c183c017da 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -53,7 +53,8 @@ if [ -f $PKG_DIR/addon ]; then
   $PKG_DIR/addon $@ >&$VERBOSE_OUT
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp config/addon/addon.xml $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" \
            -e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|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 ***"
-      exit 1
+      echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***"
     fi
 
     if [ -f $PKG_DIR/icon/icon.png ]; then

From 3e85aeebeca23200de9ad74ea2025c932e94a7fc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 18 Oct 2011 03:51:07 +0200
Subject: [PATCH 25/25] hts-tvheadend: set to version 1.0.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/service/multimedia/hts-tvheadend/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
index 869e5f621f..e82fbf6a6f 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="c88a646"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"