Merge branch 'master' of git://github.com/currywurst/OpenELEC.tv into openelec-pvr

.gitignore

@@ -13,5 +13,8 @@ target/
 tools/mkpkg/*
 !tools/mkpkg/mkpkg_*
 
+# mkpkg temp
+mkpkg-temp
+
 # private working directory
 .work/

tools/mkpkg/mkpkg_tvheadend

@@ -0,0 +1,56 @@
+#!/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
+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
+  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 "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
+
+echo "CLEANUP"
+  rm -Rf tvheadend-$REV
+
+cd $MKPKG_CURRENTPATH

tools/mkpkg/mkpkg_xbmc-pvr-git

@@ -0,0 +1,103 @@
+#!/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
+################################################################################
+
+if [ -z "$VERSION" ] ; then
+  echo "Please specify the git version: ppa | master"
+  echo "(ppa recommed)"
+  echo "Example usage: VERSION=ppa mkpkg_xbmc-pvr-git"
+  exit 1
+fi
+
+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/xbmc*$VERSION*
+
+echo "getting sources if needed (or update only)"
+  if [ ! -d xbmc-pvr ]; then
+    git clone git://github.com/opdenkamp/xbmc.git xbmc-pvr
+  fi
+
+echo "updateing revision... $VERSION"
+  cd xbmc-pvr
+    git pull
+  cd $MKPKG_TMP
+  
+echo "create repo xbmc-pvr -> xbmc-pvr.$VERSION"
+  cp -R xbmc-pvr xbmc-pvr.$VERSION
+  
+if [ $VERSION != "master" ] ; then
+  cd xbmc-pvr.$VERSION
+    git checkout pvr-$VERSION
+  cd $MKPKG_TMP
+fi
+
+echo "getting version..."
+  cd xbmc-pvr.$VERSION
+    REV=$(git rev-parse --short HEAD)
+  cd $MKPKG_TMP
+  
+echo "cleaning sources..."
+  find xbmc-pvr.$VERSION -name .git -exec rm -rf {} ";"
+
+  rm -rf xbmc-pvr.$VERSION/project
+
+  for i in "Changelog" "Fake\ Episode\ Maker" \
+           "PackageMaker" "Translator" "XprPack" \
+           "HardwareConfigure" "osx" "UpdateThumbs.py" "XBMCTex"; do
+    rm -rf xbmc-pvr.$VERSION/tools/$i
+  done
+
+  for i in dll a lib so bat; do
+    find xbmc-pvr.$VERSION -name *.$i -exec rm -rf {} ";"
+  done
+  
+  # remove bundled libraries (including zlib and OSX), saves space and forces using external versions
+  for i in cximage-6.0/zlib libid3tag/zlib zlib
+  do
+    rm -rf xbmc-pvr.$VERSION/xbmc/lib/$i
+  done
+
+  # bundled win32 binaries
+  rm -r xbmc-pvr.$VERSION/xbmc/visualizations/XBMCProjectM/win32
+
+  # remove various headers 
+  rm xbmc-pvr.$VERSION/xbmc/filesystem/zlib.h
+  
+  
+echo "split xbmc-pvr.$VERSION-$REV theme and make xbmc-pvr-$VERSION-$REV.tar.gz"
+  mv xbmc-pvr.$VERSION/addons/skin.confluence xbmc-pvr-$VERSION-theme-Confluence-$REV
+  tar cvjf dest/xbmc-pvr-$VERSION-theme-Confluence-$REV.tar.bz2 xbmc-pvr-$VERSION-theme-Confluence-$REV
+  rm -rf xbmc-pvr-$VERSION-theme-Confluence-$REV
+
+echo "packing sources..."
+  mv xbmc-pvr.$VERSION xbmc-pvr-$VERSION-$REV
+  tar cvjf dest/xbmc-pvr-$VERSION-$REV.tar.bz2 xbmc-pvr-$VERSION-$REV
+
+echo "CLEANUP"
+  rm -Rf xbmc-pvr-$VERSION-$REV
+
+cd $MKPKG_CURRENTPATH