config/version: set version to 4.0.4

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.0.0"
+  OPENELEC_VERSION="4.0.4"
 
 # OS_VERSION: OS Version
   OS_VERSION="4.0"

packages/audio/alsa/alsa-utils/scripts/soundconfig

@@ -37,101 +37,95 @@ if [ -f $HOME/.config/sound.conf ]; then
 
 else
 
+# get card num
+  card=`echo $1 | sed 's/[^0-9]*//g'`
+
 # set common mixer params
-  mixer 0 Master 100%
-  mixer 0 Front 100%
-  mixer 0 PCM 100%
-  mixer 0 Synth 100%
+  mixer $card Master 100%
+  mixer $card Front 100%
+  mixer $card PCM 100%
+  mixer $card Synth 100%
 
 # mute CD, since using digital audio instead
-  mixer 0 CD 0% mute
+  mixer $card CD 0% mute
 
 # Only unmute Line and Aux if they are possibly used.
-#  mixer 0 Line 100%
-#  mixer 0 Aux 100%
+#  mixer $card Line 100%
+#  mixer $card Aux 100%
 
 # mute mic
-  mixer 0 Mic 0% mute
+  mixer $card Mic 0% mute
 
 # ESS 1969 chipset has 2 PCM channels
-  mixer 0 PCM,1 100%
+  mixer $card PCM,1 100%
 
 # Trident/YMFPCI/emu10k1
-  mixer 0 Wave 100%
-  mixer 0 Music 100%
-  mixer 0 AC97 100%
-  mixer 0 Surround 90%
-  mixer 0 'Surround Digital' 90%
-  mixer 0 'Wave Surround' 90%
-  mixer 0 'Duplicate Front' 90%
-  mixer 0 'Sigmatel 4-Speaker Stereo' 90%
+  mixer $card Wave 100%
+  mixer $card Music 100%
+  mixer $card AC97 100%
+  mixer $card Surround 90%
+  mixer $card 'Surround Digital' 90%
+  mixer $card 'Wave Surround' 90%
+  mixer $card 'Duplicate Front' 90%
+  mixer $card 'Sigmatel 4-Speaker Stereo' 90%
 
 # CS4237B chipset:
-  mixer 0 'Master Digital' 100%
+  mixer $card 'Master Digital' 100%
 
 # DRC
-  mixer 0 'Dynamic Range Compression' 90%
+  mixer $card 'Dynamic Range Compression' 90%
 
 # Envy24 chips with analog outs
-  mixer 0 DAC 100%
-  mixer 0 DAC,0 100%
-  mixer 0 DAC,1 100%
+  mixer $card DAC 100%
+  mixer $card DAC,0 100%
+  mixer $card DAC,1 100%
 
 # some notebooks use headphone instead of master
-  mixer 0 Headphone 100%
-  mixer 0 Speaker 100%
-  mixer 0 'Internal Speaker' 0% mute
-  mixer 0 Playback 100%
-  mixer 1 Headphone 100%
-  mixer 1 Speaker 100%
-
-  mixer 0 Center 100%
-  mixer 0 LFE 100%
-  mixer 0 Center/LFE 100%
+  mixer $card Headphone 100%
+  mixer $card Speaker 100%
+  mixer $card 'Internal Speaker' 0% mute
+  mixer $card Playback 100%
+  mixer $card Headphone 100%
+  mixer $card Speaker 100%
+  mixer $card Center 100%
+  mixer $card LFE 100%
+  mixer $card Center/LFE 100%
 
 # Intel P4P800-MX  (Ubuntu bug #5813)
-  mixer 0 'Master Playback Switch' on
+  mixer $card 'Master Playback Switch' on
 
 # set digital output mixer params
-  mixer 0 'IEC958' 100% on
-  mixer 0 'IEC958 Output' 100%
-  mixer 0 'IEC958 Coaxial' 100%
-  mixer 0 'IEC958 LiveDrive' 100%
-  mixer 0 'IEC958 Optical Raw' 100%
-  mixer 0 'SPDIF Out' 100%
-  mixer 0 'SPDIF Front' 100%
-  mixer 0 'SPDIF Rear' 100%
-  mixer 0 'SPDIF Center/LFE' 100%
-  mixer 0 'Master Digital' 100%
+  mixer $card 'IEC958' 100% on
+  mixer $card 'IEC958 Output' 100%
+  mixer $card 'IEC958 Coaxial' 100%
+  mixer $card 'IEC958 LiveDrive' 100%
+  mixer $card 'IEC958 Optical Raw' 100%
+  mixer $card 'SPDIF Out' 100%
+  mixer $card 'SPDIF Front' 100%
+  mixer $card 'SPDIF Rear' 100%
+  mixer $card 'SPDIF Center/LFE' 100%
+  mixer $card 'Master Digital' 100%
 
-  mixer 0 'Analog Front' 100%
-  mixer 0 'Analog Rear' 100%
-  mixer 0 'Analog Center/LFE' 100%
+  mixer $card 'Analog Front' 100%
+  mixer $card 'Analog Rear' 100%
+  mixer $card 'Analog Center/LFE' 100%
 
 # ASRock ION 330 (and perhaps others) has 2 IEC958 channels
-  mixer 0 IEC958,0 on
-  mixer 0 IEC958,1 on
+  mixer $card IEC958,0 on
+  mixer $card IEC958,1 on
 
 # some ION2 has much more IEC958 channels ...
-  mixer 0 IEC958,2 on
-  mixer 0 IEC958,3 on
-
-# ... or "simply" more soundchips
-  mixer 1 IEC958,0 on
-  mixer 1 IEC958,1 on
-  mixer 1 IEC958,2 on
-  mixer 1 IEC958,3 on
+  mixer $card IEC958,2 on
+  mixer $card IEC958,3 on
 
 # ASRock ION 330 has Master Front set to 0
-  mixer 0 'Master Front' 100%
+  mixer $card 'Master Front' 100%
 
 # Shuttle XS35GT needs this too
-  mixer 0 'Master',0 100% on
+  mixer $card 'Master',0 100% on
 
 # and this for various Fusion devices like Zotac ZBOX
-  mixer 1 'Master',0 100% on
-  mixer 1 'Front',0 100% on
-
+  mixer $card 'Front',0 100% on
 fi
 
 exit 0

packages/audio/alsa/alsa-utils/udev.d/40-alsa.rules

@@ -17,4 +17,4 @@
 ################################################################################
 
 # When a sound device is detected, restore the volume settings
-  KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="soundconfig"
+  KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="soundconfig %k"

packages/graphics/Mesa/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="10.1.1"
+PKG_VERSION="10.1.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="680ac93"
+PKG_VERSION="f15c3b5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/lang/llvm/package.mk

@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.4"
+PKG_VERSION="3.4.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
-PKG_URL="http://llvm.org/releases/3.4/${PKG_NAME}-${PKG_VERSION}.src.tar.gz"
+PKG_URL="http://llvm.org/releases/$PKG_VERSION/${PKG_NAME}-${PKG_VERSION}.src.tar.gz"
+PKG_SOURCE_DIR="${PKG_NAME}-${PKG_VERSION}.src"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain llvm:host"
 PKG_PRIORITY="optional"

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-010-add-support-for-linux-3.10.0.patch

@@ -1,8 +1,7 @@
-diff --git a/x86-32/src/wl/sys/wl_linux.c b/x86-32/src/wl/sys/wl_linux.c
-index 9ee69e1..409bda7 100644
---- a/x86-32/src/wl/sys/wl_linux.c
-+++ b/x86-32/src/wl/sys/wl_linux.c
-@@ -2693,7 +2693,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key)
+diff -Naur bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c
+--- bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c	2013-04-14 23:10:38.000000000 +0200
++++ bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c	2014-05-14 21:47:59.249976234 +0200
+@@ -2681,7 +2681,7 @@
  void
  wl_tkip_printstats(wl_info_t *wl, bool group_key)
  {
@@ -11,7 +10,7 @@ index 9ee69e1..409bda7 100644
  	char debug_buf[512];
  	int idx;
  	if (wl->tkipmodops) {
-@@ -2855,6 +2855,7 @@ wl_linux_watchdog(void *ctx)
+@@ -2843,6 +2843,7 @@
  	return 0;
  }
  
@@ -19,7 +18,7 @@ index 9ee69e1..409bda7 100644
  static int
  wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
  {
-@@ -2909,18 +2910,89 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d
+@@ -2897,18 +2898,89 @@
  	return length;
  }
  
@@ -99,7 +98,7 @@ index 9ee69e1..409bda7 100644
 +		wl->proc_entry->read_proc = wl_proc_read;
 +		wl->proc_entry->write_proc = wl_proc_write;
 +		wl->proc_entry->data = wl;
-+	} 
++	}
 +#else
 +	wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
 +#endif
@@ -113,24 +112,10 @@ index 9ee69e1..409bda7 100644
 -	wl->proc_entry->data = wl;
  	return 0;
  }
-diff --git a/x86-32/src/wl/sys/wl_linux.c.orig b/x86-32/src/wl/sys/wl_linux.c.orig
-index 38206ab..9ee69e1 100644
---- a/x86-32/src/wl/sys/wl_linux.c.orig
-+++ b/x86-32/src/wl/sys/wl_linux.c.orig
-@@ -219,7 +219,7 @@ module_param(nompc, int, 0);
- #define quote_str(s) to_str(s)
- 
- #ifndef BRCM_WLAN_IFNAME
--#define BRCM_WLAN_IFNAME eth%d
-+#define BRCM_WLAN_IFNAME wlan%d
- #endif
- 
- static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);
-diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
-index 9ee69e1..409bda7 100644
---- a/x86-64/src/wl/sys/wl_linux.c
-+++ b/x86-64/src/wl/sys/wl_linux.c
-@@ -2693,7 +2693,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key)
+diff -Naur bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c
+--- bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c	2013-04-14 23:10:38.000000000 +0200
++++ bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c	2014-05-14 21:48:16.002975186 +0200
+@@ -2681,7 +2681,7 @@
  void
  wl_tkip_printstats(wl_info_t *wl, bool group_key)
  {
@@ -139,7 +124,7 @@ index 9ee69e1..409bda7 100644
  	char debug_buf[512];
  	int idx;
  	if (wl->tkipmodops) {
-@@ -2855,6 +2855,7 @@ wl_linux_watchdog(void *ctx)
+@@ -2843,6 +2843,7 @@
  	return 0;
  }
  
@@ -147,7 +132,7 @@ index 9ee69e1..409bda7 100644
  static int
  wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
  {
-@@ -2909,18 +2910,89 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d
+@@ -2897,18 +2898,89 @@
  	return length;
  }
  
@@ -227,7 +212,7 @@ index 9ee69e1..409bda7 100644
 +		wl->proc_entry->read_proc = wl_proc_read;
 +		wl->proc_entry->write_proc = wl_proc_write;
 +		wl->proc_entry->data = wl;
-+	} 
++	}
 +#else
 +	wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
 +#endif
@@ -241,16 +226,3 @@ index 9ee69e1..409bda7 100644
 -	wl->proc_entry->data = wl;
  	return 0;
  }
-diff --git a/x86-64/src/wl/sys/wl_linux.c.orig b/x86-64/src/wl/sys/wl_linux.c.orig
-index 38206ab..9ee69e1 100644
---- a/x86-64/src/wl/sys/wl_linux.c.orig
-+++ b/x86-64/src/wl/sys/wl_linux.c.orig
-@@ -219,7 +219,7 @@ module_param(nompc, int, 0);
- #define quote_str(s) to_str(s)
- 
- #ifndef BRCM_WLAN_IFNAME
--#define BRCM_WLAN_IFNAME eth%d
-+#define BRCM_WLAN_IFNAME wlan%d
- #endif
- 
- static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);

packages/linux-firmware/dvb-firmware/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.40"
+PKG_VERSION="0.0.41"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux-firmware/wlan-firmware/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.20"
+PKG_VERSION="0.0.21"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/package.mk

@@ -23,7 +23,7 @@ case "$LINUX" in
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   *)
-    PKG_VERSION="3.14.2"
+    PKG_VERSION="3.14.5"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
 esac

packages/linux/patches/3.14.5/linux-224-geniatech-t220-dvb-t2-fix.patch

@@ -0,0 +1,97 @@
+diff --git a/drivers/media/dvb-frontends/cxd2820r.h b/drivers/media/dvb-frontends/cxd2820r.h
+index 82b3d93..6095dbc 100644
+--- a/drivers/media/dvb-frontends/cxd2820r.h
++++ b/drivers/media/dvb-frontends/cxd2820r.h
+@@ -52,6 +52,12 @@ struct cxd2820r_config {
+ 	 */
+ 	u8 ts_mode;
+ 
++	/* TS clock inverted.
++	 * Default: 0
++	 * Values: 0, 1
++	 */
++	bool ts_clock_inv;
++
+ 	/* IF AGC polarity.
+ 	 * Default: 0
+ 	 * Values: 0, 1
+diff --git a/drivers/media/dvb-frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c
+index 5c6ab49..0f4657e 100644
+--- a/drivers/media/dvb-frontends/cxd2820r_c.c
++++ b/drivers/media/dvb-frontends/cxd2820r_c.c
+@@ -45,6 +45,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe)
+ 		{ 0x1008b, 0x07, 0xff },
+ 		{ 0x1001f, priv->cfg.if_agc_polarity << 7, 0x80 },
+ 		{ 0x10070, priv->cfg.ts_mode, 0xff },
++		{ 0x10071, !priv->cfg.ts_clock_inv << 4, 0x10 },
+ 	};
+ 
+ 	dev_dbg(&priv->i2c->dev, "%s: frequency=%d symbol_rate=%d\n", __func__,
+diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c
+index fa184ca..9b5a45b 100644
+--- a/drivers/media/dvb-frontends/cxd2820r_t.c
++++ b/drivers/media/dvb-frontends/cxd2820r_t.c
+@@ -46,6 +46,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
+ 		{ 0x00088, 0x01, 0xff },
+ 
+ 		{ 0x00070, priv->cfg.ts_mode, 0xff },
++		{ 0x00071, !priv->cfg.ts_clock_inv << 4, 0x10 },
+ 		{ 0x000cb, priv->cfg.if_agc_polarity << 6, 0x40 },
+ 		{ 0x000a5, 0x00, 0x01 },
+ 		{ 0x00082, 0x20, 0x60 },
+diff --git a/drivers/media/dvb-frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c
+index 2ba130e..9c0c4f4 100644
+--- a/drivers/media/dvb-frontends/cxd2820r_t2.c
++++ b/drivers/media/dvb-frontends/cxd2820r_t2.c
+@@ -47,6 +47,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe)
+ 		{ 0x02083, 0x0a, 0xff },
+ 		{ 0x020cb, priv->cfg.if_agc_polarity << 6, 0x40 },
+ 		{ 0x02070, priv->cfg.ts_mode, 0xff },
++		{ 0x02071, !priv->cfg.ts_clock_inv << 6, 0x40 },
+ 		{ 0x020b5, priv->cfg.spec_inv << 4, 0x10 },
+ 		{ 0x02567, 0x07, 0x0f },
+ 		{ 0x02569, 0x03, 0x03 },
+diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
+index ae0f56a..7135a3e 100644
+--- a/drivers/media/usb/dvb-usb/dw2102.c
++++ b/drivers/media/usb/dvb-usb/dw2102.c
+@@ -1109,6 +1109,7 @@ static struct ds3000_config su3000_ds3000_config = {
+ static struct cxd2820r_config cxd2820r_config = {
+ 	.i2c_address = 0x6c, /* (0xd8 >> 1) */
+ 	.ts_mode = 0x38,
++	.ts_clock_inv = 1,
+ };
+ 
+ static struct tda18271_config tda18271_config = {
+@@ -1387,20 +1388,27 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
+ 
+ static int t220_frontend_attach(struct dvb_usb_adapter *d)
+ {
+-	u8 obuf[3] = { 0xe, 0x80, 0 };
++	u8 obuf[3] = { 0xe, 0x87, 0 };
+ 	u8 ibuf[] = { 0 };
+ 
+ 	if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
+ 		err("command 0x0e transfer failed.");
+ 
+ 	obuf[0] = 0xe;
+-	obuf[1] = 0x83;
++	obuf[1] = 0x86;
++	obuf[2] = 1;
++
++	if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
++		err("command 0x0e transfer failed.");
++
++	obuf[0] = 0xe;
++	obuf[1] = 0x80;
+ 	obuf[2] = 0;
+ 
+ 	if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
+ 		err("command 0x0e transfer failed.");
+ 
+-	msleep(100);
++	msleep(50);
+ 
+ 	obuf[0] = 0xe;
+ 	obuf[1] = 0x80;
+

packages/mediacenter/service.openelec.settings/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.3.15"
+PKG_VERSION="0.3.17"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

packages/mediacenter/xbmc-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13-0d1d803"
+PKG_VERSION="13-84725b0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="13-0d1d803"
+PKG_VERSION="13-84725b0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-999.80.01-PR4592.patch

@@ -1,62 +0,0 @@
-From 6a926768eba981c6498f852fe26dfa6644da82ac Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Wed, 23 Apr 2014 16:33:19 +0200
-Subject: [PATCH] FIX: [linux] fix & optimize input device checking
-
----
- xbmc/input/linux/LinuxInputDevices.cpp | 12 +++++++++++-
- xbmc/input/linux/LinuxInputDevices.h   |  1 +
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
-index 4b642ae..f11ec01 100644
---- a/xbmc/input/linux/LinuxInputDevices.cpp
-+++ b/xbmc/input/linux/LinuxInputDevices.cpp
-@@ -936,6 +936,11 @@ char* CLinuxInputDevice::GetDeviceName()
-   return m_deviceName;
- }
- 
-+std::string CLinuxInputDevice::GetFileName()
-+{
-+  return m_fileName;
-+}
-+
- bool CLinuxInputDevice::IsUnplugged()
- {
-   return m_bUnplugged;
-@@ -945,6 +950,11 @@ bool CLinuxInputDevices::CheckDevice(const char *device)
- {
-   int fd;
- 
-+  // Does the device exists?
-+  struct stat buffer;
-+  if (stat(device, &buffer) != 0)
-+    return false;
-+
-   /* Check if we are able to open the device */
-   fd = open(device, O_RDWR);
-   if (fd < 0)
-@@ -1016,7 +1026,7 @@ void CLinuxInputDevices::CheckHotplugged()
- 
-     for (size_t j = 0; j < m_devices.size(); j++)
-     {
--      if (strcmp(m_devices[j]->GetDeviceName(),buf) == 0)
-+      if (m_devices[j]->GetFileName().compare(buf) == 0)
-       {
-         ispresent = true;
-         break;
-diff --git a/xbmc/input/linux/LinuxInputDevices.h b/xbmc/input/linux/LinuxInputDevices.h
-index c385ed7..a406d9c 100644
---- a/xbmc/input/linux/LinuxInputDevices.h
-+++ b/xbmc/input/linux/LinuxInputDevices.h
-@@ -42,6 +42,7 @@ class CLinuxInputDevice
-   ~CLinuxInputDevice();
-   XBMC_Event ReadEvent();
-   char* GetDeviceName();
-+  std::string GetFileName();
-   bool IsUnplugged();
-  
- private:
--- 
-1.9.1
-

packages/mediacenter/xbmc/patches/xbmc-999.80.02-revert-PR4642.patch

@@ -1,89 +0,0 @@
-From b237030e1ed5d6a983aa17b1c0bf35a42ccc77f4 Mon Sep 17 00:00:00 2001
-From: Jonathan Marshall <jmarshall@xbmc.org>
-Date: Mon, 5 May 2014 08:45:49 +1200
-Subject: [PATCH] Revert "Merge pull request #4642 from wsnipex/linking-fix"
-
-This reverts commit 0d1d80373801c330e2a5dc938cc50d0d6d3ccc6d, reversing
-changes made to 60bd97bdd8d662807076e9838ad7632b8c92d4fa.
----
- Makefile.in  |  2 +-
- configure.in | 36 ++++++++++++++----------------------
- 2 files changed, 15 insertions(+), 23 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 754f153..1db6ee2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -481,7 +481,7 @@ FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
-              lib/ffmpeg/libpostproc/libpostproc.a \
-              lib/ffmpeg/libswscale/libswscale.a
- DYNOBJSXBMC+= $(FFMPEGOBJS)
--LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
-+LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
- 
- $(FFMPEGOBJS): dvdpcodecs
- endif
-diff --git a/configure.in b/configure.in
-index f3e142f..d8d06df 100644
---- a/configure.in
-+++ b/configure.in
-@@ -880,7 +880,6 @@ if test "$use_static_ffmpeg" = "yes"; then
-   # ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker
-   # command in order to resolve any missing symbols
-   GNUTLS_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls`
--  HOGWEED_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors hogweed nettle`
-   VORBISENC_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc`
- fi 
- 
-@@ -1529,26 +1528,20 @@ fi
- 
- # libRTMP
- if test "$use_librtmp" != "no"; then
--  PKG_CHECK_MODULES([LIBRTMP], [librtmp],
--    [INCLUDES="$INCLUDES $LIBRTMP_CFLAGS"; LIBS="$LIBS $LIBRTMP_LIBS";
--      AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
--      RTMP_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors librtmp)
--      test "$use_static_ffmpeg" = "yes" && LIBS="$LIBS $RTMP_ALL_LIBS"],
--    [AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
--      [if test "$use_librtmp" = "yes"; then
--        AC_MSG_ERROR($librtmp_not_found)
--      elif test "$use_librtmp" != "no"; then
--        AC_MSG_NOTICE($librtmp_not_found)
--        use_librtmp="no"
--      fi
--      ])
--      if test "$use_librtmp" != "no"; then
--        XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp])
--      fi
--      if test "$use_librtmp" != "no"; then
--        AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
--      fi
--    ])
-+  AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
-+   [if test "$use_librtmp" = "yes"; then
-+      AC_MSG_ERROR($librtmp_not_found)
-+    elif test "$use_librtmp" != "no"; then
-+      AC_MSG_NOTICE($librtmp_not_found)
-+      use_librtmp="no"
-+    fi
-+   ])
-+  if test "$use_librtmp" != "no"; then
-+    XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp])
-+  fi
-+  if test "$use_librtmp" != "no"; then
-+    AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
-+  fi
- else
-   AC_MSG_NOTICE($librtmp_disabled)
- fi
-@@ -2674,7 +2667,6 @@ AC_SUBST(GTEST_CONFIGURED)
- AC_SUBST(USE_DOXYGEN)
- AC_SUBST(USE_PVR_ADDONS)
- AC_SUBST(GNUTLS_ALL_LIBS)
--AC_SUBST(HOGWEED_ALL_LIBS)
- AC_SUBST(VORBISENC_ALL_LIBS)
- 
- # pushd and popd are not available in other shells besides bash, so implement
--- 
-1.9.1
-

packages/mediacenter/xbmc/patches/xbmc-999.80.03-PR4641.patch

@@ -1,97 +0,0 @@
-From 55030587d56f54a56655fd9ad7e419e4077b7e57 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Fri, 2 May 2014 07:37:26 +0200
-Subject: [PATCH] VDPAU: improve error handling, Gotham
-
----
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 20 ++++++++++++++++++--
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h   |  2 ++
- 2 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index b4d2d38..8c9437c 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -948,6 +948,7 @@ bool CDecoder::ConfigVDPAU(AVCodecContext* avctx, int ref_frames)
- 
-   m_inMsgEvent.Reset();
-   m_vdpauConfigured = true;
-+  m_ErrorCount = 0;
-   return true;
- }
- 
-@@ -1078,7 +1079,11 @@ void CDecoder::FFDrawSlice(struct AVCodecContext *s,
-                                    (VdpPictureInfo const *)&(vdp->m_hwContext.info),
-                                    vdp->m_hwContext.bitstream_buffers_used,
-                                    vdp->m_hwContext.bitstream_buffers);
--  vdp->CheckStatus(vdp_st, __LINE__);
-+  if (vdp->CheckStatus(vdp_st, __LINE__))
-+    vdp->m_DecoderError = true;
-+  else
-+    vdp->m_DecoderError = false;
-+
-   uint64_t diff = CurrentHostCounter() - startTime;
-   if (diff*1000/CurrentHostFrequency() > 30)
-     CLog::Log(LOGDEBUG, "CVDPAU::DrawSlice - VdpDecoderRender long decoding: %d ms, dec: %d, proc: %d, rend: %d", (int)((diff*1000)/CurrentHostFrequency()), decoded, processed, rend);
-@@ -1093,6 +1098,9 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
- 
-   CSingleLock lock(m_DecoderSection);
- 
-+  if (m_DecoderError && pFrame)
-+    return VC_ERROR;
-+
-   if (!m_vdpauConfigured)
-     return VC_ERROR;
- 
-@@ -1264,6 +1272,8 @@ bool CDecoder::CheckStatus(VdpStatus vdp_st, int line)
-   {
-     CLog::Log(LOGERROR, " (VDPAU) Error: %s(%d) at %s:%d\n", m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), vdp_st, __FILE__, line);
- 
-+    m_ErrorCount++;
-+
-     if(m_DisplayState == VDPAU_OPEN)
-     {
-       if (vdp_st == VDP_STATUS_DISPLAY_PREEMPTED)
-@@ -1271,12 +1281,13 @@ bool CDecoder::CheckStatus(VdpStatus vdp_st, int line)
-         m_DisplayEvent.Reset();
-         m_DisplayState = VDPAU_LOST;
-       }
--      else
-+      else if (m_ErrorCount > 2)
-         m_DisplayState = VDPAU_ERROR;
-     }
- 
-     return true;
-   }
-+  m_ErrorCount = 0;
-   return false;
- }
- 
-@@ -2954,6 +2965,11 @@ bool COutput::Init()
- bool COutput::Uninit()
- {
-   m_mixer.Dispose();
-+  glFlush();
-+  while(ProcessSyncPicture())
-+  {
-+    Sleep(10);
-+  }
-   GLUnmapSurfaces();
-   ReleaseBufferPool();
-   DestroyGlxContext();
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-index 9f58e76..28258f6 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -610,6 +610,8 @@ class CDecoder
-   } m_DisplayState;
-   CCriticalSection m_DecoderSection;
-   CEvent         m_DisplayEvent;
-+  int m_ErrorCount;
-+  bool m_DecoderError;
- 
-   DllAvUtil     m_dllAvUtil;
-   ThreadIdentifier m_decoderThread;
--- 
-1.9.1
-

packages/mediacenter/xbmc/patches/xbmc-999.80.04-PR4647.patch

@@ -1,65 +0,0 @@
-From fb82cedf2ea631c0e47296f461fe8d48dfc6d7b3 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sun, 4 May 2014 09:45:52 +0200
-Subject: [PATCH] VDPAU: fix cropping for interlaced frames
-
----
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 +++++---
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h   | 1 +
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index 2468db3..575b2e3 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -39,6 +39,7 @@
- 
- using namespace VDPAU;
- #define NUM_RENDER_PICS 7
-+#define NUM_CROP_PIX 3
- 
- #define ARSIZE(x) (sizeof(x) / sizeof((x)[0]))
- 
-@@ -2382,6 +2383,7 @@ void CMixer::InitCycle()
-   }
-   m_mixerstep = 0;
- 
-+  m_processPicture.crop = false;
-   if (m_mixerInput[1].DVDPic.format == RENDER_FMT_VDPAU)
-   {
-     m_processPicture.outputSurface = m_outputSurfaces.front();
-@@ -2390,8 +2392,8 @@ void CMixer::InitCycle()
-     if (m_SeenInterlaceFlag)
-     {
-       double ratio = (double)m_mixerInput[1].DVDPic.iDisplayHeight / m_mixerInput[1].DVDPic.iHeight;
--      m_mixerInput[1].DVDPic.iHeight -= 6;
--      m_mixerInput[1].DVDPic.iDisplayHeight = lrint(ratio*m_mixerInput[1].DVDPic.iHeight);
-+      m_mixerInput[1].DVDPic.iDisplayHeight = lrint(ratio*(m_mixerInput[1].DVDPic.iHeight-NUM_CROP_PIX*2));
-+      m_processPicture.crop = true;
-     }
-   }
-   else
-@@ -3065,7 +3067,7 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture()
-       retPic->texWidth = m_config.outWidth;
-       retPic->texHeight = m_config.outHeight;
-       retPic->crop.x1 = 0;
--      retPic->crop.y1 = (m_config.outHeight - retPic->DVDPic.iHeight) / 2;
-+      retPic->crop.y1 = procPic.crop ? NUM_CROP_PIX : 0;
-       retPic->crop.x2 = m_config.outWidth;
-       retPic->crop.y2 = m_config.outHeight - retPic->crop.y1;
-     }
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-index 4d046c1..8efadc1 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -202,6 +202,7 @@ struct CVdpauProcessedPicture
-   DVDVideoPicture DVDPic;
-   VdpVideoSurface videoSurface;
-   VdpOutputSurface outputSurface;
-+  bool crop;
- };
- 
- /**
--- 
-1.9.1
-

packages/mediacenter/xbmc/patches/xbmc-999.80.05-PR4650.patch

@@ -1,25 +0,0 @@
-From d14e6a8f8d4c00e104e8f782d66e60a5a3d19376 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sun, 4 May 2014 17:49:52 +0200
-Subject: [PATCH] paplayer: fix accidently disabled seek by
- fc2b1b2c1ad0d235b91a33e430d39bd63de71f58
-
----
- xbmc/cores/paplayer/DVDPlayerCodec.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
-index 1f7287b..b960e3b 100644
---- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp
-+++ b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
-@@ -203,6 +203,7 @@ bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache)
-     {
-       // rewind stream to beginning
-       Seek(0);
-+      m_bCanSeek = true;
-     }
-     else
-     {
--- 
-1.9.1
-

packages/mediacenter/xbmc/patches/xbmc-999.80.06-PR4649.patch

@@ -1,24 +0,0 @@
-From 790ed5ba43eac186291193accff14aef58766897 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sun, 4 May 2014 16:54:58 +0200
-Subject: [PATCH] VDPAU: fix segfault if vdpau fails to open context
-
----
- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index 2468db3..d0188bb 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -134,6 +134,7 @@ bool CVDPAUContext::EnsureContext(CVDPAUContext **ctx)
-     {
-       delete m_context;
-       m_context = 0;
-+      *ctx = NULL;
-       return false;
-     }
-   }
--- 
-1.9.1
-

packages/mediacenter/xbmc/patches/xbmc-999.80.07-PR4653.patch

@@ -1,51 +0,0 @@
-From d740a5255f983085da6bc6f3747208e2da52c2a2 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Mon, 5 May 2014 15:17:19 +0200
-Subject: [PATCH 1/2] dvdplayer input stream: fix incorrectly set of EOF
-
----
- xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
-index 122e922..1b0f7e8 100644
---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
-+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
-@@ -91,7 +91,7 @@ bool CDVDInputStreamFile::Open(const char* strFile, const std::string& content)
-   if (m_pFile->GetImplemenation() && (content.empty() || content == "application/octet-stream"))
-     m_content = m_pFile->GetImplemenation()->GetContent();
- 
--  m_eof = true;
-+  m_eof = false;
-   return true;
- }
- 
--- 
-1.9.1
-
-
-From ae3325332355c2d015c8e268f07f0edd7f06bc20 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Mon, 5 May 2014 15:18:02 +0200
-Subject: [PATCH 2/2] paplayer: fix playing some mp4 files
-
----
- xbmc/cores/paplayer/DVDPlayerCodec.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
-index b960e3b..5a13093 100644
---- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp
-+++ b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
-@@ -197,8 +197,6 @@ bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache)
-   m_bCanSeek = false;
-   if (m_pInputStream->Seek(0, SEEK_POSSIBLE))
-   {
--    // reset eof flag of stream, with eof set seek returns always success
--    m_pInputStream->Seek(0, SEEK_SET);
-     if (Seek(1) != DVD_NOPTS_VALUE)
-     {
-       // rewind stream to beginning
--- 
-1.9.1
-

packages/multimedia/libva-driver-intel/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libva-driver-intel"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/multimedia/libva-driver-intel/patches/libva-driver-intel-01_Fix-green-artifacts-when-decoding-mpeg-2.patch

@@ -0,0 +1,13 @@
+diff --git a/src/i965_decoder_utils.c b/src/i965_decoder_utils.c
+index 617bc15..f579f91 100644
+--- a/src/i965_decoder_utils.c
++++ b/src/i965_decoder_utils.c
+@@ -139,7 +139,7 @@ mpeg2_set_reference_surfaces(
+         ref_frames[n++].surface_id = ref_frames[0].surface_id;
+     }
+ 
+-    if (pic_param->picture_coding_extension.bits.progressive_frame)
++    if (pic_param->picture_coding_extension.bits.frame_pred_frame_dct)
+         return;
+ 
+     ref_frames[2].surface_id = VA_INVALID_ID;

packages/multimedia/libva/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/network/bluez/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.18"
+PKG_VERSION="5.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/openvpn/package.mk

@@ -18,7 +18,7 @@
 ################################################################################
 
 PKG_NAME="openvpn"
-PKG_VERSION="2.3.3"
+PKG_VERSION="2.3.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -38,7 +38,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \
                            --enable-password-save \
                            --disable-plugins \
                            --enable-iproute2 IPROUTE=/sbin/ip \
-                           --disable-management \
+                           --enable-management \
                            --disable-socks \
                            --disable-http-proxy \
                            --disable-fragment \

packages/network/wireless-regdb/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="wireless-regdb"
-PKG_VERSION="2013.11.27"
+PKG_VERSION="2014.05.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wireless.kernel.org/en/developers/Regulatory"
-PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-2013.11.27.tar.gz"
+PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"

packages/security/gnutls/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gnutls"
-PKG_VERSION="3.2.8"
+PKG_VERSION="3.2.15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/security/nettle/package.mk

@@ -32,7 +32,7 @@ PKG_LONGDESC="Nettle is a cryptographic library that is designed to fit easily i
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-openssl"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-openssl CC_FOR_BUILD=$HOST_CC"
 
 pre_configure_target() {
 # dont build parallel
@@ -41,4 +41,4 @@ pre_configure_target() {
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
-}
+}

packages/security/nettle/patches/nettle-02-support_for_out_of_tree_build.patch

@@ -0,0 +1,46 @@
+diff -Naur nettle-2.7.1/Makefile.in nettle-2.7.1.patch/Makefile.in
+--- nettle-2.7.1/Makefile.in	2013-05-28 16:21:53.000000000 +0200
++++ nettle-2.7.1.patch/Makefile.in	2014-05-30 17:52:21.402473749 +0200
+@@ -20,7 +20,7 @@
+ 
+ include config.make
+ 
+-PRE_CPPFLAGS = -I.
++PRE_CPPFLAGS = -I. -I$(srcdir)
+ # FIXME: Add configuration of LIBEXT?
+ LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
+ SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
+@@ -229,27 +229,27 @@
+ # executable. Avoid object file targets to make it easy to run the
+ # right compiler.
+ aesdata$(EXEEXT_FOR_BUILD): aesdata.c
+-	$(CC_FOR_BUILD) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \
++	$(CC_FOR_BUILD) $(PRE_CPPFLAGS) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \
+ 	-o aesdata$(EXEEXT_FOR_BUILD)
+ 
+ desdata$(EXEEXT_FOR_BUILD): desdata.c
+-	$(CC_FOR_BUILD) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \
++	$(CC_FOR_BUILD) $(PRE_CPPFLAGS) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \
+ 	-o desdata$(EXEEXT_FOR_BUILD)
+ 
+ twofishdata$(EXEEXT_FOR_BUILD): twofishdata.c
+-	$(CC_FOR_BUILD) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \
++	$(CC_FOR_BUILD) $(PRE_CPPFLAGS) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \
+ 	-o twofishdata$(EXEEXT_FOR_BUILD)
+ 
+ shadata$(EXEEXT_FOR_BUILD): shadata.c
+-	$(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \
++	$(CC_FOR_BUILD) $(PRE_CPPFLAGS) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \
+ 	-o shadata$(EXEEXT_FOR_BUILD)
+ 
+ gcmdata$(EXEEXT_FOR_BUILD): gcmdata.c
+-	$(CC_FOR_BUILD) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \
++	$(CC_FOR_BUILD) $(PRE_CPPFLAGS) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \
+ 	-o gcmdata$(EXEEXT_FOR_BUILD)
+ 
+ eccdata$(EXEEXT_FOR_BUILD): eccdata.c mini-gmp.c mini-gmp.h
+-	$(CC_FOR_BUILD) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \
++	$(CC_FOR_BUILD) $(PRE_CPPFLAGS) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \
+ 	-o eccdata$(EXEEXT_FOR_BUILD)
+ 
+ # desCore rules

packages/security/nettle/patches/nettle-03-pkgconfig.patch

@@ -0,0 +1,9 @@
+diff -Naur nettle-2.7.1/nettle.pc.in nettle-2.7.1.patch/nettle.pc.in
+--- nettle-2.7.1/nettle.pc.in	2013-05-28 16:21:53.000000000 +0200
++++ nettle-2.7.1.patch/nettle.pc.in	2014-05-30 18:09:10.503171166 +0200
+@@ -8,4 +8,4 @@
+ URL: http://www.lysator.liu.se/~nisse/nettle
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lnettle
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/nettle

packages/sysutils/busybox/config/busybox-target.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.22.1
-# Sun Apr  6 15:00:27 2014
+# Mon May 19 23:45:50 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -25,14 +25,14 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
 CONFIG_INSTALL_NO_USR=y
-# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_LOCALE_SUPPORT=y
 CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
+CONFIG_UNICODE_USING_LOCALE=y
 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
 CONFIG_SUBST_WCHAR=63
 CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
+CONFIG_UNICODE_WIDE_WCHARS=y
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set

packages/sysutils/busybox/config/suspend-modules.conf

@@ -1 +1 @@
-SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge"
+SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac"

packages/sysutils/busybox/patches/busybox-03-make_unicode_printable.patch

@@ -0,0 +1,26 @@
+#
+# stolen from OpenWRT
+#
+# https://dev.openwrt.org/attachment/ticket/7993/701-make_unicode_printable.patch
+#
+
+--- a/libbb/printable_string.c	2013-01-13 20:06:04.210089516 +0800
++++ b/libbb/printable_string.c	2013-01-13 20:00:27.917211167 +0800
+@@ -31,8 +31,6 @@
+ 		}
+ 		if (c < ' ')
+ 			break;
+-		if (c >= 0x7f)
+-			break;
+ 		s++;
+ 	}
+ 
+@@ -45,7 +43,7 @@
+ 			unsigned char c = *d;
+ 			if (c == '\0')
+ 				break;
+-			if (c < ' ' || c >= 0x7f)
++			if (c < ' ')
+ 				*d = '?';
+ 			d++;
+ 		}

packages/sysutils/e2fsprogs/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="e2fsprogs"
-PKG_VERSION="1.42.8"
+PKG_VERSION="1.42.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -36,7 +36,8 @@ if [ "$HFSTOOLS" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
 fi
 
-PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
+PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
+                           --prefix=/usr \
                            --bindir=/bin \
                            --sbindir=/sbin \
                            --enable-verbose-makecmds \
@@ -67,3 +68,15 @@ pre_configure_target() {
 # e2fsprogs fails to build with LTO support on gcc-4.9
   strip_lto
 }
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/sbin/badblocks
+  rm -rf $INSTALL/sbin/blkid
+  rm -rf $INSTALL/sbin/dumpe2fs
+  rm -rf $INSTALL/sbin/e2freefrag
+  rm -rf $INSTALL/sbin/e2undo
+  rm -rf $INSTALL/sbin/e4defrag
+  rm -rf $INSTALL/sbin/filefrag
+  rm -rf $INSTALL/sbin/logsave
+  rm -rf $INSTALL/sbin/mklost+found
+}

packages/sysutils/e2fsprogs/patches/e2fsprogs-crosscompiling.patch

@@ -0,0 +1,14 @@
+diff -Naur e2fsprogs-1.42.10/configure.in e2fsprogs-1.42.10.patch/configure.in
+--- e2fsprogs-1.42.10/configure.in	2014-05-15 19:04:08.000000000 +0200
++++ e2fsprogs-1.42.10.patch/configure.in	2014-06-04 13:19:36.701586827 +0200
+@@ -1328,8 +1328,8 @@
+    BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
+    BUILD_LDFLAGS="$LDFLAGS"
+ else
+-   BUILD_CFLAGS=
+-   BUILD_LDFLAGS=
++   BUILD_CFLAGS="$BUILD_CFLAGS $INCLUDES -DHAVE_CONFIG_H"
++   BUILD_LDFLAGS="$BUILD_LDFLAGS"
+ fi
+ AC_SUBST(BUILD_CFLAGS)
+ AC_SUBST(BUILD_LDFLAGS)

packages/sysutils/lm_sensors/package.mk

@@ -43,4 +43,5 @@ pre_make_target() {
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/sensors-conf-convert
   rm -rf $INSTALL/usr/sbin/
+  $STRIP $INSTALL/usr/bin/sensors
 }

packages/sysutils/remote/atvclient/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="atvclient"
-PKG_VERSION="0.1"
+PKG_VERSION="50faf80"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://github.com/Evinyatar/atvclient/wiki"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
 PKG_PRIORITY="optional"
 PKG_SECTION="system/remote"

packages/sysutils/remote/atvclient/patches/atvclient-0.1-macbook_macmini_support.patch

@@ -1,31 +0,0 @@
---- a/src/atvclient.cpp
-+++ b/src/atvclient.cpp
-@@ -24,8 +24,16 @@
- 
- #include "xbmcclient.h"
- 
--#define VENDOR_APPLE		0x05ac
--#define PRODUCT_IR		0x8241
-+#define VENDOR_APPLE          0x05ac
-+#define PRODUCT_APPLE_IR_0    0x8240
-+#define PRODUCT_APPLE_IR_1    0x8241
-+#define PRODUCT_APPLE_IR_2    0x8242
-+
-+#define IS_APPLE_REMOTE(dev) ((dev->descriptor.idVendor == VENDOR_APPLE) && \
-+                              ((dev->descriptor.idProduct == PRODUCT_APPLE_IR_0) || \
-+                               (dev->descriptor.idProduct == PRODUCT_APPLE_IR_1) || \
-+                               (dev->descriptor.idProduct == PRODUCT_APPLE_IR_2)))
-+
- 
- #define LEDMODE_OFF		0
- #define LEDMODE_AMBER		1
-@@ -264,8 +272,7 @@ static usb_dev_handle *find_ir(void)
- 
- 	for (bus = usb_busses; bus; bus = bus->next) {
- 		for (dev = bus->devices; dev; dev = dev->next)
--			if (dev->descriptor.idVendor == VENDOR_APPLE
--			    && dev->descriptor.idProduct == PRODUCT_IR)
-+			    if(IS_APPLE_REMOTE(dev))
- 				return usb_open(dev);
- 	}
-

packages/sysutils/squashfs/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="squashfs"
-PKG_VERSION="4.2"
+PKG_VERSION="4.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/squashfs/patches/squashfs-4.2-gzip_fix.patch

@@ -1,12 +0,0 @@
-diff -Naur squashfs4.2-old/squashfs-tools/compressor.c squashfs4.2-new/squashfs-tools/compressor.c
---- squashfs4.2-old/squashfs-tools/compressor.c	2011-02-11 07:49:24.000000000 -0800
-+++ squashfs4.2-new/squashfs-tools/compressor.c	2011-03-04 10:27:47.000000000 -0800
-@@ -27,7 +27,7 @@
- 
- #ifndef GZIP_SUPPORT
- static struct compressor gzip_comp_ops =  {
--	NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
-+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
- };
- #else
- extern struct compressor gzip_comp_ops;

packages/sysutils/systemd/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="systemd"
-PKG_VERSION="212"
+PKG_VERSION="213"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -51,8 +51,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-ima \
                            --disable-chkconfig \
                            --disable-selinux \
+                           --disable-apparmor \
                            --disable-xz \
-                           --disable-tcpwrap \
                            --disable-pam \
                            --disable-acl \
                            --disable-xattr \
@@ -62,6 +62,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-libcryptsetup \
                            --disable-qrencode \
                            --disable-microhttpd \
+                           --disable-gnutls \
                            --disable-binfmt \
                            --disable-vconsole \
                            --disable-readahead \
@@ -69,25 +70,28 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-quotacheck \
                            --enable-tmpfiles \
                            --disable-randomseed \
-                           --enable-logind \
                            --disable-backlight \
+                           --disable-rfkill \
+                           --enable-logind \
                            --disable-machined \
                            --disable-hostnamed \
                            --disable-timedated \
+                           --disable-timesyncd \
                            --disable-localed \
                            --disable-coredump \
                            --disable-polkit \
-                           --disable-multi-seat-x \
+                           --disable-resolved \
                            --disable-networkd \
                            --disable-efi \
+                           --disable-multi-seat-x \
                            --disable-kdbus \
                            --disable-myhostname \
                            --enable-gudev \
                            --disable-manpages \
+                           --enable-split-usr \
                            --disable-tests \
                            --without-python \
                            --disable-python-devel \
-                           --enable-split-usr \
                            --with-firmware-path=/storage/.config/firmware:/lib/firmware \
                            --with-sysvinit-path= \
                            --with-sysvrcnd-path= \

packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch

@@ -1,6 +1,6 @@
-From e5ecdd5f5a72d9ca84d0e080456887f38ad4e3d4 Mon Sep 17 00:00:00 2001
+From 2444e6fe823939dd80b24913a1327218bf37a88c Mon Sep 17 00:00:00 2001
 From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 12 Mar 2014 12:42:06 +0200
+Date: Wed, 28 May 2014 20:53:33 +0300
 Subject: [PATCH] nah. no ln --relative
 
 It is unclear that systemd now requires very recent coreutils
@@ -10,14 +10,15 @@ I will not upgrade my debian wheezy machines to jessie,
 nor I will switch to fedora for no good reason. We are not going
 to tell our users to do so just to be able to build OpenELEC.
 ---
- Makefile.am |   21 ++++++---------------
- 1 files changed, 6 insertions(+), 15 deletions(-)
+ Makefile.am  |   21 ++++++---------------
+ configure.ac |    2 --
+ 2 files changed, 6 insertions(+), 17 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index bcf20df..1baf2bc 100644
+index 6ff3489..8a45728 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -207,8 +207,8 @@ define move-to-rootlibdir
+@@ -212,8 +212,8 @@ define move-to-rootlibdir
  	if test "$(libdir)" != "$(rootlibdir)"; then \
  		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
  		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
@@ -28,7 +29,7 @@ index bcf20df..1baf2bc 100644
  		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
  	fi
  endef
-@@ -267,9 +267,9 @@ install-aliases-hook:
+@@ -272,9 +272,9 @@ install-aliases-hook:
  	set -- $(SYSTEM_UNIT_ALIASES) && \
  		dir=$(systemunitdir) && $(install-aliases)
  	set -- $(USER_UNIT_ALIASES) && \
@@ -40,7 +41,7 @@ index bcf20df..1baf2bc 100644
  
  define install-aliases
  	while [ -n "$$1" ]; do \
-@@ -280,15 +280,6 @@ define install-aliases
+@@ -285,15 +285,6 @@ define install-aliases
  	done
  endef
  
@@ -56,7 +57,7 @@ index bcf20df..1baf2bc 100644
  INSTALL_EXEC_HOOKS += \
  	install-target-wants-hook \
  	install-directories-hook \
-@@ -1869,7 +1860,7 @@ systemd_dbus1_generator_LDADD = \
+@@ -1908,7 +1899,7 @@ systemd_dbus1_generator_LDADD = \
  dbus1-generator-install-hook:
  	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
  	$(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
@@ -65,7 +66,7 @@ index bcf20df..1baf2bc 100644
  
  dbus1-generator-uninstall-hook:
  	rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-@@ -2002,7 +1993,7 @@ systemd_bus_proxyd_LDADD = \
+@@ -2042,7 +2033,7 @@ systemd_bus_proxyd_LDADD = \
  bus-proxyd-install-hook:
  	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
  	$(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
@@ -74,6 +75,19 @@ index bcf20df..1baf2bc 100644
  
  bus-proxyd-uninstall-hook:
  	rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
+diff --git a/configure.ac b/configure.ac
+index 5133c12..7e3938e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,8 +76,6 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
+ 
+ AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
+ 
+-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
+-
+ M4_DEFINES=
+ 
+ # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
 -- 
 1.7.2.5
 

packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch

@@ -0,0 +1,36 @@
+diff -Naur v4l-utils-0.8.9/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.9.patch/utils/keytable/rc_keymaps/rc6_mce
+--- v4l-utils-0.8.9/utils/keytable/rc_keymaps/rc6_mce	2014-05-20 14:31:04.585559227 +0200
++++ v4l-utils-0.8.9.patch/utils/keytable/rc_keymaps/rc6_mce	2014-05-20 17:47:04.341378915 +0200
+@@ -1,4 +1,4 @@
+-# table rc6_mce, type: RC6
++# table rc6_mce, type: RC6 NEC
+ 0x800f0400 KEY_NUMERIC_0
+ 0x800f0401 KEY_NUMERIC_1
+ 0x800f0402 KEY_NUMERIC_2
+@@ -239,3 +239,26 @@
+ 0x8011129f KEY_LASTSOURCE
+ 0x8011128b KEY_SOURCE
+ 0x801112a3 KEY_SCREEN
++
++#XBOX One Remote (Protocol: NEC)
++0x80d864 KEY_MEDIA
++0x80d820 KEY_LEFT
++0x80d821 KEY_RIGHT
++0x80d81e KEY_UP
++0x80d81f KEY_DOWN
++0x80d822 KEY_OK
++0x80d823 KEY_EXIT
++0x80d80e KEY_MUTE
++0x80d810 KEY_VOLUMEUP
++0x80d811 KEY_VOLUMEDOWN
++0x80d812 KEY_CHANNELUP
++0x80d813 KEY_CHANNELDOWN
++0x80d814 KEY_FASTFORWARD
++0x80d815 KEY_REWIND
++0x80d870 KEY_PLAYPAUSE
++0x80d819 KEY_STOP
++0x80d81a KEY_NEXT
++0x80d81b KEY_PREVIOUS
++0x80d826 KEY_INFO
++0x80d86f KEY_EPG
++0x80d86e KEY_ZOOM

packages/tools/bcm2835-bootloader/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="680ac93"
+PKG_VERSION="f15c3b5"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/tools/installer/scripts/installer

@@ -70,9 +70,13 @@ get_device_unmount() {
   # provides: DEVICES
 
   DEVICES=""
-  DEVICES=$(parted -s -m -l | grep ^/dev/sd | cut -f1 -d ":")
+  DEVICES=$(parted -s -m -l | grep -E '^/dev/sd|^/dev/mmcblk' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":")
 
-  for i in $(cat /proc/mounts | grep ^/dev/sd | cut -f1 -d " " | sed "s/[0-9]//"); do
+  for i in $(cat /proc/mounts | grep -E '^/dev/sd' | cut -f1 -d " " | sed "s/[0-9].*$//"); do
+    DEVICES=$(echo $DEVICES |sed -e "s|$i||")
+  done
+
+  for i in $(cat /proc/mounts | grep -E '^/dev/mmcblk' | cut -f1 -d " " | sed "s/p.*$//"); do
     DEVICES=$(echo $DEVICES |sed -e "s|$i||")
   done
 }
@@ -190,6 +194,17 @@ do_install_quick() {
       INSTALL_DEVICE=$(cat "$TMPDIR/device_for_install")
       INSTALL_DEVICE_FULL=$(echo $DEVICE_LIST | sed "s|.*$INSTALL_DEVICE \([^ ]*\).*|$INSTALL_DEVICE \1|")
 
+      case $INSTALL_DEVICE in
+        "/dev/mmcblk"*)
+          PART1="p1"
+          PART2="p2"
+          ;;
+        *)
+          PART1="1"
+          PART2="2"
+          ;;
+      esac
+
       prompt_gpt
       prompt_ssh
       prompt_backup_unpack
@@ -262,39 +277,39 @@ do_install_quick() {
       # create filesystem
       msg_progress_install "23" "creating filesystem on ${INSTALL_DEVICE}1"
       if [ "$UEFI" = "1" ]; then
-        mkfs.vfat ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
+        mkfs.vfat ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
       else
-        mke2fs -t ext4 -m 0 ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
+        mke2fs -t ext4 -m 0 ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
       fi
 
-      msg_progress_install "25" "set uuid and disklabel $DISKLABEL_SYSTEM on ${INSTALL_DEVICE}1"
+      msg_progress_install "25" "set uuid and disklabel $DISKLABEL_SYSTEM on ${INSTALL_DEVICE}${PART1}"
       if [ "$UEFI" = "1" ]; then
-        dosfslabel ${INSTALL_DEVICE}1  $DISKLABEL_SYSTEM >> $LOGFILE 2>&1
+        dosfslabel ${INSTALL_DEVICE}${PART1}  $DISKLABEL_SYSTEM >> $LOGFILE 2>&1
       else
-        tune2fs -U random -L $DISKLABEL_SYSTEM  ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
+        tune2fs -U random -L $DISKLABEL_SYSTEM  ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
       fi
 
-      msg_progress_install "28" "creating filesystem on ${INSTALL_DEVICE}2"
-      mke2fs -t ext4 -m 0 ${INSTALL_DEVICE}2 >> $LOGFILE 2>&1
+      msg_progress_install "28" "creating filesystem on ${INSTALL_DEVICE}${PART2}"
+      mke2fs -t ext4 -m 0 ${INSTALL_DEVICE}${PART2} >> $LOGFILE 2>&1
 
-      msg_progress_install "30" "set uuid and disklabel $DISKLABEL_STORAGE on ${INSTALL_DEVICE}2"
-      tune2fs -U random -L $DISKLABEL_STORAGE  ${INSTALL_DEVICE}2 >> $LOGFILE 2>&1
+      msg_progress_install "30" "set uuid and disklabel $DISKLABEL_STORAGE on ${INSTALL_DEVICE}${PART2}"
+      tune2fs -U random -L $DISKLABEL_STORAGE  ${INSTALL_DEVICE}${PART2} >> $LOGFILE 2>&1
 
       # mount system partition
       msg_progress_install "35" "creating $TMPDIR/part1"
       mkdir -p $TMPDIR/part1 >> $LOGFILE 2>&1
 
-      msg_progress_install "40" "mounting ${INSTALL_DEVICE}1 to $TMPDIR/part1"
+      msg_progress_install "40" "mounting ${INSTALL_DEVICE}${PART1} to $TMPDIR/part1"
       if [ "$UEFI" = "1" ]; then
-        mount -t vfat ${INSTALL_DEVICE}1 $TMPDIR/part1 >> $LOGFILE 2>&1
+        mount -t vfat ${INSTALL_DEVICE}${PART1} $TMPDIR/part1 >> $LOGFILE 2>&1
       else
-        mount -t ext4 ${INSTALL_DEVICE}1 $TMPDIR/part1 >> $LOGFILE 2>&1
+        mount -t ext4 ${INSTALL_DEVICE}${PART1} $TMPDIR/part1 >> $LOGFILE 2>&1
       fi
 
       # installing extlinux
       msg_progress_install "50" "installing extlinux to $TMPDIR/part1"
       if [ "$UEFI" = "1" ]; then
-        syslinux -i ${INSTALL_DEVICE}1 >> $LOGFILE 2>&1
+        syslinux -i ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
       else
         extlinux -i $TMPDIR/part1 >> $LOGFILE 2>&1
       fi
@@ -337,8 +352,8 @@ do_install_quick() {
         msg_progress_install "89" "creating $TMPDIR/part2"
         mkdir -p $TMPDIR/part2 >> $LOGFILE 2>&1
 
-        msg_progress_install "90" "mounting ${INSTALL_DEVICE}2 to $TMPDIR/part2"
-        mount -t ext4 ${INSTALL_DEVICE}2 $TMPDIR/part2 >> $LOGFILE 2>&1
+        msg_progress_install "90" "mounting ${INSTALL_DEVICE}${PART2} to $TMPDIR/part2"
+        mount -t ext4 ${INSTALL_DEVICE}${PART2} $TMPDIR/part2 >> $LOGFILE 2>&1
 
         msg_progress_install "92" "restoring backup"
         [ -f /flash/backup.tar.bz2 ] && tar -xjf /flash/backup.tar.bz2 -C $TMPDIR/part2 >> $LOGFILE 2>&1
@@ -366,7 +381,7 @@ do_install_quick() {
 
 do_install_custom() {
   # show menu
-  MSG_TITLE="\Z4[ CUSTOM INSTALL MENU ]\Zn"
+  MSG_TITLE="\Z4[ REPAIR/UPGRADE MENU ]\Zn"
   MSG_MENU="\nUse the up/down arrows to select the correct partition where you want to overwrite KERNEL and SYSTEM files.\n\n Please select a partition:"
   MSG_CANCEL="Back"
   DIALOG_OPTIONS="--defaultno"
@@ -599,7 +614,7 @@ menu_main() {
   MSG_TITLE="\Z4[ MAIN MENU ]\Zn"
   MSG_MENU="\n\ZbQuick Install:\Zn do a default installation on a specific device \
             \Z1\Zb(this will delete ALL data on this device!)\Zn \
-            \n\ZbCustom Install:\Zn do a custom installation \
+            \n\ZbRepair / Upgrade:\Zn do repair / upgrade \
             \n\ZbSetup:\Zn change some settings to run OpenELEC \
             \n\ZbBIOS Update:\Zn backup and update your BIOS (only for OEMs) \
             \n\ZbShow logfile:\Zn show and save the logfile \
@@ -610,7 +625,7 @@ menu_main() {
   dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \
     --title "$MSG_TITLE" --menu "$MSG_MENU" 20 70 5 \
       1 "Quick Install of OpenELEC" \
-      2 "Custom Install of OpenELEC" \
+      2 "Repair / Upgrade" \
       3 "Setup OpenELEC" \
       4 "BIOS update (only for OEM's)" \
       5 "Show logfile" 2> $TMPDIR/mainmenu

packages/tools/syslinux/package.mk

@@ -88,6 +88,9 @@ makeinstall_target() {
     cp bios/extlinux/extlinux $INSTALL/usr/bin
     cp bios/linux/syslinux $INSTALL/usr/bin
 
+  $STRIP $INSTALL/usr/bin/syslinux
+  $STRIP $INSTALL/usr/bin/extlinux
+
   mkdir -p $INSTALL/usr/share/syslinux
     cp bios/mbr/mbr.bin $INSTALL/usr/share/syslinux
     cp bios/mbr/gptmbr.bin $INSTALL/usr/share/syslinux

packages/x11/driver/xf86-input-evdev/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xf86-input-evdev"
-PKG_VERSION="2.8.3"
+PKG_VERSION="2.8.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/driver/xf86-video-nvidia/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="331.67"
+PKG_VERSION="331.79"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"

packages/x11/lib/libXfont/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libXfont"
-PKG_VERSION="1.4.7"
+PKG_VERSION="1.4.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/other/fontconfig/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="fontconfig"
-PKG_VERSION="2.10.91"
+PKG_VERSION="2.11.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/proto/inputproto/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="inputproto"
-PKG_VERSION="2.3"
+PKG_VERSION="2.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

projects/ATV/linux/linux.i386.conf

@@ -3252,7 +3252,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 
 #
@@ -3262,7 +3262,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
+CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y

projects/Cuboxi/linux/linux.arm.conf

@@ -1473,6 +1473,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_CM109 is not set
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_DA9052_ONKEY is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -2872,6 +2873,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_PCA9633 is not set
 # CONFIG_LEDS_DA9052 is not set
 # CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_REGULATOR=y
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
@@ -3099,7 +3101,8 @@ CONFIG_CLKSRC_MMIO=y
 # CONFIG_EXTCON is not set
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 # CONFIG_IPACK_BUS is not set
@@ -3326,7 +3329,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
-# CONFIG_STRIP_ASM_SYMS is not set
+CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -3371,7 +3374,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging

projects/Generic/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.14.2 Kernel Configuration
+# Linux/i386 3.14.4 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1555,6 +1555,7 @@ CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2136,6 +2137,8 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -3225,7 +3228,7 @@ CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_UWB is not set
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MMC_CLKGATE is not set
@@ -3233,7 +3236,7 @@ CONFIG_MMC=m
 #
 # MMC/SD/SDIO Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
@@ -3242,10 +3245,10 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
 # CONFIG_MMC_RICOH_MMC is not set
-# CONFIG_MMC_SDHCI_ACPI is not set
+CONFIG_MMC_SDHCI_ACPI=y
 # CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
@@ -3427,9 +3430,10 @@ CONFIG_RTL8192U=m
 CONFIG_R8712U=m
 # CONFIG_R8188EU is not set
 CONFIG_R8821AE=m
-CONFIG_RTS5139=m
+CONFIG_RTS5139=y
 # CONFIG_RTS5139_DEBUG is not set
-# CONFIG_RTS5208 is not set
+CONFIG_RTS5208=y
+# CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
@@ -3810,7 +3814,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 
 #
@@ -3820,7 +3824,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
+CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y

projects/Generic/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.14.2 Kernel Configuration
+# Linux/x86_64 3.14.4 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -379,7 +379,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
+# CONFIG_AMD_NUMA is not set
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NUMA_EMU is not set
@@ -401,7 +401,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MOVABLE_NODE=y
+# CONFIG_MOVABLE_NODE is not set
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
@@ -1547,6 +1547,7 @@ CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2123,6 +2124,8 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -3203,7 +3206,7 @@ CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_UWB is not set
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MMC_CLKGATE is not set
@@ -3211,7 +3214,7 @@ CONFIG_MMC=m
 #
 # MMC/SD/SDIO Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
@@ -3220,10 +3223,10 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
 # CONFIG_MMC_RICOH_MMC is not set
-# CONFIG_MMC_SDHCI_ACPI is not set
+CONFIG_MMC_SDHCI_ACPI=y
 # CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
@@ -3405,9 +3408,10 @@ CONFIG_RTL8192U=m
 CONFIG_R8712U=m
 # CONFIG_R8188EU is not set
 CONFIG_R8821AE=m
-CONFIG_RTS5139=m
+CONFIG_RTS5139=y
 # CONFIG_RTS5139_DEBUG is not set
-# CONFIG_RTS5208 is not set
+CONFIG_RTS5208=y
+# CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
@@ -3786,7 +3790,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 
 #
@@ -3796,7 +3800,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
+CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y

projects/Generic/options

@@ -255,7 +255,13 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
-  GRAPHIC_DRIVERS="r200 r300 r600 radeonsi i915 i965 nvidia"
+  if [ "$TARGET_ARCH" = "i386" ]; then
+    # TODO: create Legacy build with OpenELEC-4.2
+    # install legacy drivers to i386 ARCH
+    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
+  elif [ "$TARGET_ARCH" = "x86_64" ]; then
+    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
+  fi
 
 # XBMC Player implementation to use (default / bcm2835-driver)
   XBMCPLAYER_DRIVER="default"

projects/RPi/linux/linux.arm.conf

@@ -2902,7 +2902,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 
 #
@@ -2912,7 +2912,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
+CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y

projects/Virtual/linux/linux.x86_64.conf

@@ -379,7 +379,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
+# CONFIG_AMD_NUMA is not set
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NUMA_EMU is not set
@@ -401,7 +401,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MOVABLE_NODE=y
+# CONFIG_MOVABLE_NODE is not set
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

scripts/image

@@ -86,15 +86,15 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   fi
   
 # create /etc/os-release
-  echo -e "NAME=$DISTRONAME" > $INSTALL/etc/os-release
-  echo -e "VERSION=$OPENELEC_VERSION" >> $INSTALL/etc/os-release
-  echo -e "ID=openelec" >> $INSTALL/etc/os-release
-  echo -e "VERSION_ID=$OS_VERSION" >> $INSTALL/etc/os-release
-  echo -e "PRETTY_NAME=$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "unofficial")) - Version: $OPENELEC_VERSION" >> $INSTALL/etc/os-release
-  echo -e "HOME_URL=http://www.openelec.tv" >> $INSTALL/etc/os-release
-  echo -e "BUG_REPORT_URL=https://github.com/OpenELEC/OpenELEC.tv" >> $INSTALL/etc/os-release
+  echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
+  echo -e "VERSION=\"$OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
+  echo -e "ID=\"openelec\"" >> $INSTALL/etc/os-release
+  echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release
+  echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "unofficial")) - Version: $OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
+  echo -e "HOME_URL=\"http://www.openelec.tv\"" >> $INSTALL/etc/os-release
+  echo -e "BUG_REPORT_URL=\"https://github.com/OpenELEC/OpenELEC.tv\"" >> $INSTALL/etc/os-release
   if [ -n "$GIT_HASH" ]; then
-	echo -e "BUILD_ID=$GIT_HASH" >> $INSTALL/etc/os-release
+	echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
   fi