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

CHANGELOG

@@ -0,0 +1,7 @@
+OpenELEC - 1.0.1 (21.10.2011)
+- dont start wpa_supplicant in debugmode, this fixes non working wlan connections
+- update DVB firmwares
+
+OpenELEC - 1.0.0 (20.10.2011)
+- initial version
+

VERSION

@@ -1 +1 @@
-devel
+1.0.1

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/service/multimedia/hts-tvheadend/changelog.txt

@@ -1,3 +1,6 @@
+1.0.2
+- add (CH) GA Weissenstein default muxes
+
 1.0.1
 - add XMLTV tv_file_grab support
 - add XMLTV configuration support

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

@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="c88a646"
-PKG_REV="0"
+PKG_REV="2"
 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-090-add_CH-GA-Weissenstein_muxes-0.1.patch

@@ -0,0 +1,55 @@
+diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h
+--- hts-tvheadend-c88a646/src/linuxtv_muxes.h	2011-09-26 20:18:12.000000000 +0200
++++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h	2011-10-18 13:40:37.768853992 +0200
+@@ -12001,6 +12001,39 @@
+ 	{ .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5},
+ };
+ 
++static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = {
++	{ .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3},
++	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++	{ .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5},
++};
++
+ static const struct mux muxes_DVBC_ch_Rega_Sense[] = {
+ 	{ .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3},
+ 	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3},
+@@ -12881,6 +12914,11 @@
+ 
+ static const struct network networks_DVBC_ch[] = {
+ 	{
++		.name = "GA-Weissenstein",
++		.muxes = muxes_DVBC_ch_GA_Weissenstein,
++		.nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux),
++	},
++	{
+ 		.name = "Rega-Sense",
+ 		.muxes = muxes_DVBC_ch_Rega_Sense,
+ 		.nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux),

packages/linux-firmware/dvb-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.13"
+PKG_VERSION="0.0.15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.1-rc9"
+PKG_VERSION="3.1-rc10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"