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

also:
 - update xbmc to xbmc-a296342
 - update XVBA and VDPAU patches

Conflicts:
	packages/linux/meta
	packages/mediacenter/xbmc-addon-xvdr/meta
	packages/mediacenter/xbmc-frodo-theme-Confluence/meta
	packages/mediacenter/xbmc-frodo/meta
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-11.0.3-001-add_oe_settings_to_homescreen.patch
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.01-xvba_support_vdpau_rework-c633159.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-331-fix_playpause_problem_ticket_7338-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-806.01-cdrip-PR616.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-806.02-cdrip-PR718.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-901.01-ffmpeg-10.2-28b186f.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-901.03-ffmpeg_crystalhd_implementation.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-901.41-avfilter-depends-on-avformat.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.00-vdpau_reset_pvr_changes.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.01-xvba_support_vdpau_rework-c633159.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.02-xvba_support-gcc-4.7.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.03-fix_configure_in_VDPAU_detect.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.11-disable_interop.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.12-linuxrenderer_delete_texture_targets_on_reconfigure.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.21-backport_vdpau_and_xvba_patches-b38863d.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-903.01-fixed_still_frames_at_the_start_of_a_VTS_in_dvd_could_end_up_not_showing.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-981-toggleButtonState.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-982-UDisk-device-must-be-remount-in-DeviceChanged-event.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-983-fixed-failure-to-broswe-for-smb-shares.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-984-do-not-remount-non-optical-devices-in-DeviceChanged-event.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-990-wiimote.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999-crosscompile.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.002-268d6a0-fix_ASIC_hang.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.003-rar-PR1147.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.011-airtunes_reapply_lost_fix.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.012-airtunes_implementation_for_windows_using_libshairplay.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.013-airtunes-add_dmap_metadata_parsing.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.021-libnfs-1.3_support.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.055-search-dialogs-workaround.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.056-remove-broken-scrapers.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-801-xvba_support-d7b836a.patch
	tools/mkpkg/mkpkg_xbmc-eden

packages/devel/libcec/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="1.9.0"
+PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/meta

@@ -21,7 +21,7 @@
 PKG_NAME="linux"
 PKG_VERSION="3.6.1"
 if [ "$LINUX" = "3.2" ]; then
-  PKG_VERSION="3.2.30"
+  PKG_VERSION="3.2.31"
 fi
 PKG_REV="1"
 PKG_ARCH="any"

packages/linux/patches/linux-3.2.31-055-RC_Fix_invalid-free_region-and-or-free_irq-on-probe-failure.patch

@@ -0,0 +1,149 @@
+From f27b853ea24a9b70585f9251384d97929e6551c3 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 14 May 2012 21:36:00 -0300
+Subject: [PATCH] [media] rc: Fix invalid free_region and/or free_irq on probe
+ failure
+
+fintek-cir, ite-cir and nuvoton-cir may try to free an I/O region
+and/or IRQ handler that was never allocated after a failure in their
+respective probe functions.  Add and use separate labels on the
+failure path so they will do the right cleanup after each possible
+point of failure.
+
+Compile-tested only.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ drivers/media/rc/fintek-cir.c  |   13 ++++++-------
+ drivers/media/rc/ite-cir.c     |   14 ++++++--------
+ drivers/media/rc/nuvoton-cir.c |   26 ++++++++++++--------------
+ 3 files changed, 24 insertions(+), 29 deletions(-)
+
+diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
+index 4a3a238..6aabf7a 100644
+--- a/drivers/media/rc/fintek-cir.c
++++ b/drivers/media/rc/fintek-cir.c
+@@ -556,11 +556,11 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
+ 
+ 	if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
+ 			FINTEK_DRIVER_NAME, (void *)fintek))
+-		goto failure;
++		goto failure2;
+ 
+ 	ret = rc_register_device(rdev);
+ 	if (ret)
+-		goto failure;
++		goto failure3;
+ 
+ 	device_init_wakeup(&pdev->dev, true);
+ 	fintek->rdev = rdev;
+@@ -570,12 +570,11 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
+ 
+ 	return 0;
+ 
++failure3:
++	free_irq(fintek->cir_irq, fintek);
++failure2:
++	release_region(fintek->cir_addr, fintek->cir_port_len);
+ failure:
+-	if (fintek->cir_irq)
+-		free_irq(fintek->cir_irq, fintek);
+-	if (fintek->cir_addr)
+-		release_region(fintek->cir_addr, fintek->cir_port_len);
+-
+ 	rc_free_device(rdev);
+ 	kfree(fintek);
+ 
+diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
+index 0e49c99..36fe5a3 100644
+--- a/drivers/media/rc/ite-cir.c
++++ b/drivers/media/rc/ite-cir.c
+@@ -1598,24 +1598,22 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
+ 
+ 	if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
+ 			ITE_DRIVER_NAME, (void *)itdev))
+-		goto failure;
++		goto failure2;
+ 
+ 	ret = rc_register_device(rdev);
+ 	if (ret)
+-		goto failure;
++		goto failure3;
+ 
+ 	itdev->rdev = rdev;
+ 	ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
+ 
+ 	return 0;
+ 
++failure3:
++	free_irq(itdev->cir_irq, itdev);
++failure2:
++	release_region(itdev->cir_addr, itdev->params.io_region_size);
+ failure:
+-	if (itdev->cir_irq)
+-		free_irq(itdev->cir_irq, itdev);
+-
+-	if (itdev->cir_addr)
+-		release_region(itdev->cir_addr, itdev->params.io_region_size);
+-
+ 	rc_free_device(rdev);
+ 	kfree(itdev);
+ 
+diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
+index 8b2c071..dc8a7dd 100644
+--- a/drivers/media/rc/nuvoton-cir.c
++++ b/drivers/media/rc/nuvoton-cir.c
+@@ -1075,19 +1075,19 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
+ 
+ 	if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
+ 			NVT_DRIVER_NAME, (void *)nvt))
+-		goto failure;
++		goto failure2;
+ 
+ 	if (!request_region(nvt->cir_wake_addr,
+ 			    CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+-		goto failure;
++		goto failure3;
+ 
+ 	if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
+ 			NVT_DRIVER_NAME, (void *)nvt))
+-		goto failure;
++		goto failure4;
+ 
+ 	ret = rc_register_device(rdev);
+ 	if (ret)
+-		goto failure;
++		goto failure5;
+ 
+ 	device_init_wakeup(&pdev->dev, true);
+ 	nvt->rdev = rdev;
+@@ -1099,17 +1099,15 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
+ 
+ 	return 0;
+ 
++failure5:
++	free_irq(nvt->cir_wake_irq, nvt);
++failure4:
++	release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
++failure3:
++	free_irq(nvt->cir_irq, nvt);
++failure2:
++	release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
+ failure:
+-	if (nvt->cir_irq)
+-		free_irq(nvt->cir_irq, nvt);
+-	if (nvt->cir_addr)
+-		release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
+-
+-	if (nvt->cir_wake_irq)
+-		free_irq(nvt->cir_wake_irq, nvt);
+-	if (nvt->cir_wake_addr)
+-		release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
+-
+ 	rc_free_device(rdev);
+ 	kfree(nvt);
+ 
+-- 
+1.7.7.6
+

packages/linux/patches/linux-3.2.31-215-technisat-usb2-module.patch

@@ -0,0 +1,25 @@
+This patch adds a module-device-table-entry to the
+technisat-usb2-driver which will help udev to on-demand load the
+driver. This was obviously forgotten during initial commit.
+
+Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
+---
+ drivers/media/dvb/dvb-usb/technisat-usb2.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c
+index acefaa8..7a8c8c1 100644
+--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c
++++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c
+@@ -677,6 +677,7 @@ static struct usb_device_id technisat_usb2_id_table[] = {
+         { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_DVB_S2) },
+         { 0 }                /* Terminating entry */
+ };
++MODULE_DEVICE_TABLE(usb, technisat_usb2_id_table);
+ 
+ /* device description */
+ static struct dvb_usb_device_properties technisat_usb2_devices = {
+-- 
+1.7.9.5
+
+--

packages/mediacenter/xbmc-addon-xvdr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-xvdr"
-PKG_VERSION="d48e68e"
+PKG_VERSION="42d78a2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-d48e68e-xbmc_head_changes.patch

@@ -1,110 +0,0 @@
-diff -Naur xbmc-addon-xvdr-d48e68e/addons/library.xbmc.addon/libXBMC_addon.h xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.addon/libXBMC_addon.h
---- xbmc-addon-xvdr-d48e68e/addons/library.xbmc.addon/libXBMC_addon.h	2012-09-13 08:11:02.000000000 +0200
-+++ xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.addon/libXBMC_addon.h	2012-09-13 11:12:53.496913518 +0200
-@@ -14,9 +14,8 @@
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-- *  along with XBMC; 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
-+ *  along with XBMC; see the file COPYING.  If not, see
-+ *  <http://www.gnu.org/licenses/>.
-  *
-  */
- 
-@@ -29,37 +28,34 @@
- #ifdef _WIN32                   // windows
- #include "dlfcn-win32.h"
- #define ADDON_DLL               "\\library.xbmc.addon\\libXBMC_addon" ADDON_HELPER_EXT
--#define ADDON_HELPER_PLATFORM   "win32"
- #define ADDON_HELPER_EXT        ".dll"
- #else
- #if defined(__APPLE__)          // osx
--#define ADDON_HELPER_PLATFORM   "osx"
- #if defined(__POWERPC__)
--#define ADDON_HELPER_ARCH       "powerpc"
-+#define ADDON_HELPER_ARCH       "powerpc-osx"
- #elif defined(__arm__)
--#define ADDON_HELPER_ARCH       "arm"
-+#define ADDON_HELPER_ARCH       "arm-osx"
- #else
--#define ADDON_HELPER_ARCH       "x86"
-+#define ADDON_HELPER_ARCH       "x86-osx"
- #endif
- #else                           // linux
--#define ADDON_HELPER_PLATFORM   "linux"
- #if defined(__x86_64__)
--#define ADDON_HELPER_ARCH       "x86_64"
-+#define ADDON_HELPER_ARCH       "x86_64-linux"
- #elif defined(_POWERPC)
--#define ADDON_HELPER_ARCH       "powerpc"
-+#define ADDON_HELPER_ARCH       "powerpc-linux"
- #elif defined(_POWERPC64)
--#define ADDON_HELPER_ARCH       "powerpc64"
-+#define ADDON_HELPER_ARCH       "powerpc64-linux"
- #elif defined(__ARMEL__)
- #define ADDON_HELPER_ARCH       "arm"
- #elif defined(_MIPSEL)
--#define ADDON_HELPER_ARCH       "mipsel"
-+#define ADDON_HELPER_ARCH       "mipsel-linux"
- #else
--#define ADDON_HELPER_ARCH       "i486"
-+#define ADDON_HELPER_ARCH       "i486-linux"
- #endif
- #endif
- #include <dlfcn.h>              // linux+osx
- #define ADDON_HELPER_EXT        ".so"
--#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
- #endif
- 
- #ifdef LOG_DEBUG
-diff -Naur xbmc-addon-xvdr-d48e68e/addons/library.xbmc.gui/libXBMC_gui.h xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.gui/libXBMC_gui.h
---- xbmc-addon-xvdr-d48e68e/addons/library.xbmc.gui/libXBMC_gui.h	2012-09-13 08:11:02.000000000 +0200
-+++ xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.gui/libXBMC_gui.h	2012-09-13 11:10:40.866902690 +0200
-@@ -14,9 +14,8 @@
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-- *  along with XBMC; 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
-+ *  along with XBMC; see the file COPYING.  If not, see
-+ *  <http://www.gnu.org/licenses/>.
-  *
-  */
- 
-@@ -32,7 +31,7 @@
- #ifdef _WIN32
- #define GUI_HELPER_DLL "\\library.xbmc.gui\\libXBMC_gui" ADDON_HELPER_EXT
- #else
--#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
- #endif
- 
- #define ADDON_ACTION_PREVIOUS_MENU          10
-diff -Naur xbmc-addon-xvdr-d48e68e/addons/library.xbmc.pvr/libXBMC_pvr.h xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.pvr/libXBMC_pvr.h
---- xbmc-addon-xvdr-d48e68e/addons/library.xbmc.pvr/libXBMC_pvr.h	2012-09-13 08:11:02.000000000 +0200
-+++ xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.pvr/libXBMC_pvr.h	2012-09-13 11:10:40.866902690 +0200
-@@ -14,9 +14,8 @@
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-- *  along with XBMC; 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
-+ *  along with XBMC; see the file COPYING.  If not, see
-+ *  <http://www.gnu.org/licenses/>.
-  *
-  */
- 
-@@ -31,7 +30,7 @@
- #ifdef _WIN32
- #define PVR_HELPER_DLL "\\library.xbmc.pvr\\libXBMC_pvr" ADDON_HELPER_EXT
- #else
--#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
- #endif
- 
- #define DVD_TIME_BASE 1000000

packages/mediacenter/xbmc-pvr-addons/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-addons"
-PKG_VERSION="9e7a5ba"
+PKG_VERSION="388254a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="f13566b"
+PKG_VERSION="a296342"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="f13566b"
+PKG_VERSION="a296342"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -44,7 +44,6 @@ PKG_AUTORECONF="no"
 
 # various PVR clients
   PKG_DEPENDS="$PKG_DEPENDS xbmc-pvr-addons"
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-vuplus"
   PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr"
 
 if [ "$DISPLAYSERVER" = "xorg-server" ]; then

packages/mediacenter/xbmc/patches/xbmc-a296342-321-texturepacker-hostflags-and-rework.patch

@@ -1,7 +1,7 @@
-diff -Naur xbmc-frodo-a642b33/configure.in xbmc-frodo-a642b33.patch/configure.in
---- xbmc-frodo-a642b33/configure.in	2012-09-25 15:44:35.000000000 +0200
-+++ xbmc-frodo-a642b33.patch/configure.in	2012-09-25 16:17:31.666076439 +0200
-@@ -445,6 +445,12 @@
+diff -Naur xbmc-frodo-0ff0d2e/configure.in xbmc-frodo-0ff0d2e.patch/configure.in
+--- xbmc-frodo-0ff0d2e/configure.in	2012-10-11 15:45:44.000000000 +0200
++++ xbmc-frodo-0ff0d2e.patch/configure.in	2012-10-11 16:49:08.872850880 +0200
+@@ -452,6 +452,12 @@
    [use_texturepacker=$enableval],
    [use_texturepacker=auto])
  
@@ -14,26 +14,7 @@ diff -Naur xbmc-frodo-a642b33/configure.in xbmc-frodo-a642b33.patch/configure.in
  AC_ARG_WITH([lirc-device],
    [AS_HELP_STRING([--with-lirc-device=file],
    [specify the default LIRC device (default is /dev/lircd)])],
-@@ -584,8 +590,7 @@
-      use_cpu=cortex-a8
-      check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`]
-      if test "x$check_sdl_arch" = "xi386"; then
--       use_texturepacker_native=yes
--       USE_TEXTUREPACKER_NATIVE_ROOT="/opt/local"
-+       use_texturepacker_root="/opt/local"
-      else
-        use_texturepacker=no
-      fi
-@@ -601,8 +606,6 @@
-   *86*-apple-darwin*)
-      use_joystick=no
-      use_vtbdecoder=no
--     use_texturepacker_native=yes
--     USE_TEXTUREPACKER_NATIVE_ROOT="$prefix"
-      ARCH="x86-osx"
-      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
-      ;;
-@@ -1987,13 +1990,13 @@
+@@ -2000,13 +2006,13 @@
  
  USE_TEXTUREPACKER_NATIVE=0
  if test "x$use_texturepacker" != "xno"; then
@@ -52,9 +33,9 @@ diff -Naur xbmc-frodo-a642b33/configure.in xbmc-frodo-a642b33.patch/configure.in
    fi
  else
    final_message="$final_message\n  TexturePacker:No"
-diff -Naur xbmc-frodo-a642b33/lib/libsquish/Makefile.in xbmc-frodo-a642b33.patch/lib/libsquish/Makefile.in
---- xbmc-frodo-a642b33/lib/libsquish/Makefile.in	2012-09-25 15:45:45.000000000 +0200
-+++ xbmc-frodo-a642b33.patch/lib/libsquish/Makefile.in	2012-09-25 16:17:31.666076439 +0200
+diff -Naur xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in
+--- xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in	2012-10-11 15:47:26.000000000 +0200
++++ xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in	2012-10-11 16:49:08.873850900 +0200
 @@ -11,26 +11,25 @@
    singlecolourfit.cpp \
    squish.cpp
@@ -93,9 +74,9 @@ diff -Naur xbmc-frodo-a642b33/lib/libsquish/Makefile.in xbmc-frodo-a642b33.patch
  endif
  
  include ../../Makefile.include
-diff -Naur xbmc-frodo-a642b33/tools/TexturePacker/Makefile.in xbmc-frodo-a642b33.patch/tools/TexturePacker/Makefile.in
---- xbmc-frodo-a642b33/tools/TexturePacker/Makefile.in	2012-09-25 15:44:57.000000000 +0200
-+++ xbmc-frodo-a642b33.patch/tools/TexturePacker/Makefile.in	2012-09-25 16:19:08.889015705 +0200
+diff -Naur xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in
+--- xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in	2012-10-11 15:47:05.000000000 +0200
++++ xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in	2012-10-11 16:49:08.874850920 +0200
 @@ -1,56 +1,54 @@
 -DEFINES += -D_LINUX -DUSE_LZO_PACKING
 +DEFINES       += -D_LINUX -DUSE_LZO_PACKING

packages/network/connman/install

@@ -26,7 +26,6 @@ add_user system x 430 430 "service" "/var/run/connman" "/bin/sh"
 add_group system 430
 
 mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/services $INSTALL/etc
   cp $PKG_DIR/config/resolv.conf $INSTALL/etc
 
 mkdir -p $INSTALL/etc/connman

packages/network/iana-etc/build

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+make

packages/network/iana-etc/install

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/etc
+  cp $PKG_BUILD/protocols $INSTALL/etc
+  cp $PKG_BUILD/services $INSTALL/etc
+

packages/network/iana-etc/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="iana-etc"
+PKG_VERSION="2.30"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.linuxfromscratch.org/lfs/view/development/chapter06/iana-etc.html"
+PKG_URL="http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/iana-etc/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="iana-etc: The Iana-Etc package provides data for network services and protocols."
+PKG_LONGDESC="The Iana-Etc package provides data for network services and protocols."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/network/install

@@ -23,6 +23,7 @@
 . config/options $1
 
 $SCRIPTS/install connman
+$SCRIPTS/install iana-etc
 $SCRIPTS/install ethtool
 $SCRIPTS/install openssh
 

packages/sysutils/busybox/config/busybox.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.20.2
-# Wed Sep 26 00:23:57 2012
+# Fri Oct 12 19:25:56 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -248,7 +248,7 @@ CONFIG_MKNOD=y
 CONFIG_MV=y
 CONFIG_FEATURE_MV_LONG_OPTIONS=y
 CONFIG_NICE=y
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
 CONFIG_OD=y
 CONFIG_PRINTENV=y
 CONFIG_PRINTF=y

packages/toolchain/devel/eglibc/build

@@ -119,6 +119,7 @@ EOF
 
 cat >configparms <<EOF
 slibdir=/lib
+libdir=/usr/lib
 EOF
 
 ../configure --host=$TARGET_NAME \

packages/tools/autoupdate/scripts/autoupdate.release

@@ -92,6 +92,10 @@ if [ ! -f /var/lock/update.lock ]; then
        [ "$THIS_MINOR" -lt "$NEW_MINOR" -a \
          "$THIS_MAJOR" -eq "$NEW_MAJOR" -a \
          "$NEW_MINOR" -lt 90 ] || \
+       [ "$THIS_MINOR" -lt "$NEW_MINOR" -a \
+         "$THIS_MAJOR" -eq "$NEW_MAJOR" -a \
+         "$THIS_MINOR" -ge 90 -a \
+         "$NEW_MINOR" -ge 90 ] || \
        [ "$THIS_MINOR" -ge 90 -a \
          "$NEW_MINOR" -lt 90 -a \
          $(( $THIS_MAJOR + 1 )) -eq "$NEW_MAJOR" ]; then

projects/Generic/installer/installer.conf

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+# Disklabel for System an Storage partition
+  DISKLABEL_SYSTEM="System"
+  DISKLABEL_STORAGE="Storage"
+
+# Defaultsize of system partition (Cylinder: 16=132MB, 31=255MB)
+  PARTSIZE_SYSTEM="31"
+
+# additional parameters to extlinux
+  EXTLINUX_PARAMETERS=""
+
+# enable BIOS update function
+  BIOS_UPDATE="no"
+
+# BIOS file to program
+  BIOS_FILE=""
+
+# location for BIOS backup (with filename)
+  BIOS_BACKUP=""