From 61796882473d409ecd1c8020927583e459d41e2e Mon Sep 17 00:00:00 2001
From: Colossus <colossus@guardians-macbook-pro.fritz.box>
Date: Sun, 24 Apr 2011 02:36:31 +0200
Subject: [PATCH 1/4] add mkpg script's for git repository from opdenkamp (ppa
 & master / xbmc-pvr) and tvheadend

---
 tools/mkpkg/mkpkg_tvheadend | 60 +++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100755 tools/mkpkg/mkpkg_tvheadend

diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
new file mode 100755
index 0000000000..5fde37a539
--- /dev/null
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -0,0 +1,60 @@
+#!/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
+################################################################################
+
+MKPKG_CURRENTPATH=$(pwd)
+MKPKG_TMP="$MKPKG_CURRENTPATH/mkpkg-temp"
+
+mkdir -p $MKPKG_TMP
+cd $MKPKG_TMP
+
+echo "deleteing old revisions..."
+  ls $MKPKG_TMP | \
+  while read I; do
+    if [ -f "${I}" ] ; then
+      case "${I}" in
+        tvheadend.tar.bz2)  rm "${I}";;
+      esac
+    elif [ -d "${I}" ] ; then
+      case "${I}" in
+        tvheadend) rm -Rf "${I}";;
+      esac
+    fi
+  done
+
+echo "getting sources if needed (or update only)"
+  if [ ! -d tvheadend ]; then
+    git clone git://github.com/andoma/tvheadend.git tvheadend
+  fi
+
+echo "updateing revision..."
+  cd tvheadend
+    git pull
+  cd $MKPKG_TMP
+
+echo "getting version..."
+  cd tvheadend
+    REV=$(git rev-parse --short HEAD)
+  cd $MKPKG_TMP
+  
+echo "packing sources..."
+  tar cvjf tvheadend-$REV.tar.bz2 tvheadend
+
+cd $MKPKG_CURRENTPATH
\ No newline at end of file

From d50cc4caf9f675e1333cb0ab5e8d350cfb75182c Mon Sep 17 00:00:00 2001
From: Colossus <colossus@guardians-macbook-pro.fritz.box>
Date: Sun, 24 Apr 2011 15:00:01 +0200
Subject: [PATCH 2/4] make package scripts for getting git sources from
 opdenkamp & tvheadend

---
 tools/mkpkg/mkpkg_tvheadend | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
index 5fde37a539..358a559993 100755
--- a/tools/mkpkg/mkpkg_tvheadend
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -24,20 +24,10 @@ MKPKG_TMP="$MKPKG_CURRENTPATH/mkpkg-temp"
 
 mkdir -p $MKPKG_TMP
 cd $MKPKG_TMP
+mkdir -p dest
 
 echo "deleteing old revisions..."
-  ls $MKPKG_TMP | \
-  while read I; do
-    if [ -f "${I}" ] ; then
-      case "${I}" in
-        tvheadend.tar.bz2)  rm "${I}";;
-      esac
-    elif [ -d "${I}" ] ; then
-      case "${I}" in
-        tvheadend) rm -Rf "${I}";;
-      esac
-    fi
-  done
+  rm -Rf dest/tvheadend*
 
 echo "getting sources if needed (or update only)"
   if [ ! -d tvheadend ]; then
@@ -53,8 +43,14 @@ echo "getting version..."
   cd tvheadend
     REV=$(git rev-parse --short HEAD)
   cd $MKPKG_TMP
+
+echo "create repo for packaging tvheadend -> tvheadend-$REV"
+  cp -R tvheadend tvheadend-$REV
   
 echo "packing sources..."
-  tar cvjf tvheadend-$REV.tar.bz2 tvheadend
+  tar cvjf dest/tvheadend-$REV.tar.bz2 --exclude ".git" --exclude ".gitignore" tvheadend-$REV
+
+echo "CLEANUP"
+  rm -Rf tvheadend-$REV
 
 cd $MKPKG_CURRENTPATH
\ No newline at end of file

From db681808c62ec1dfff6df3733ac746a0898613fc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 24 Apr 2011 18:31:20 +0200
Subject: [PATCH 3/4] mkpkg_tvheadend: simplyfing

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 tools/mkpkg/mkpkg_tvheadend | 43 +++++++++++++------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
index 358a559993..f81c7dd0ca 100755
--- a/tools/mkpkg/mkpkg_tvheadend
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -19,38 +19,25 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-MKPKG_CURRENTPATH=$(pwd)
-MKPKG_TMP="$MKPKG_CURRENTPATH/mkpkg-temp"
-
-mkdir -p $MKPKG_TMP
-cd $MKPKG_TMP
-mkdir -p dest
-
-echo "deleteing old revisions..."
-  rm -Rf dest/tvheadend*
-
-echo "getting sources if needed (or update only)"
-  if [ ! -d tvheadend ]; then
-    git clone git://github.com/andoma/tvheadend.git tvheadend
+echo "getting sources..."
+  if [ ! -d hts-tvheadend.git ]; then
+    git clone https://github.com/andoma/tvheadend.git hts-tvheadend.git
   fi
 
-echo "updateing revision..."
-  cd tvheadend
+  cd hts-tvheadend.git
     git pull
-  cd $MKPKG_TMP
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
 
-echo "getting version..."
-  cd tvheadend
-    REV=$(git rev-parse --short HEAD)
-  cd $MKPKG_TMP
+echo "copying sources..."
+  rm -rf hts-tvheadend-$GIT_REV
+  cp -R hts-tvheadend.git hts-tvheadend-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf hts-tvheadend-$GIT_REV/.git
 
-echo "create repo for packaging tvheadend -> tvheadend-$REV"
-  cp -R tvheadend tvheadend-$REV
-  
 echo "packing sources..."
-  tar cvjf dest/tvheadend-$REV.tar.bz2 --exclude ".git" --exclude ".gitignore" tvheadend-$REV
+  tar cvjf hts-tvheadend-$GIT_REV.tar.bz2 hts-tvheadend-$GIT_REV
 
-echo "CLEANUP"
-  rm -Rf tvheadend-$REV
-
-cd $MKPKG_CURRENTPATH
\ No newline at end of file
+echo "remove temporary sourcedir..."
+  rm -rf hts-tvheadend-$GIT_REV

From 115399cbe1517f390227c5e3f188c61abf7ce9fa Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 24 Apr 2011 18:59:12 +0200
Subject: [PATCH 4/4] hts-tvheadend: update to hts-tvheadend-90e3570

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/multimedia/hts-tvheadend/meta | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/multimedia/hts-tvheadend/meta b/packages/multimedia/hts-tvheadend/meta
index fa17261fc2..d9145c8059 100644
--- a/packages/multimedia/hts-tvheadend/meta
+++ b/packages/multimedia/hts-tvheadend/meta
@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="2.12"
+PKG_VERSION="90e3570"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
+# PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS="libiconv avahi"
 PKG_BUILD_DEPENDS="toolchain libiconv avahi"
 PKG_PRIORITY="optional"