config/version: set version to 4.0.5

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

config/graphic

@@ -40,14 +40,14 @@ get_graphicdrivers() {
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-driver-intel"
+      LIBVA="$LIBVA libva-intel-driver"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-driver-intel"
+      LIBVA="$LIBVA libva-intel-driver"
     fi
 
     if [ "$drv" = "nouveau" ]; then

config/version

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

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -129,6 +129,7 @@ VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
 
 cd $ADDON_DIR/config
 mkdir -p $ADDON_CONFIG_DIR
+mkdir -p "$VDR_VIDEO_DIR"
 
 for dir in `find . -type d`; do
   mkdir -p $ADDON_CONFIG_DIR/$dir

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/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080403"
+PKG_VERSION="autoconf-3080500"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/graphics/Mesa/package.mk

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

packages/graphics/Mesa/patches/Mesa-99.01-Add_LLVM_VERSION_PATCH_to_DEFINES.patch

@@ -1,26 +0,0 @@
-diff -Naur Mesa-10.1.3/configure.ac Mesa-10.1.3.patch/configure.ac
---- Mesa-10.1.3/configure.ac	2014-05-09 16:15:36.000000000 +0200
-+++ Mesa-10.1.3.patch/configure.ac	2014-05-12 11:20:15.124212119 +0200
-@@ -1602,6 +1602,13 @@
- 
-         AC_COMPUTE_INT([LLVM_VERSION_MAJOR], [LLVM_VERSION_MAJOR],
-             [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])
-+
-+        dnl In LLVM 3.4.1 patch level was defined in config.h and not
-+        dnl llvm-config.h
-+        AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH],
-+            [#include "${LLVM_INCLUDEDIR}/llvm/Config/config.h"],
-+            LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found
-+
-         AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR],
-             [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])
- 
-@@ -1627,7 +1634,7 @@
-                 LLVM_COMPONENTS="${LLVM_COMPONENTS} option"
-             fi
-         fi
--        DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT"
-+        DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DLLVM_VERSION_PATCH=$LLVM_VERSION_PATCH"
-         MESA_LLVM=1
- 
-         dnl Check for Clang internal headers

packages/graphics/Mesa/patches/Mesa-99.02-radeonsi-Enable_geometry_shaders_with_LLVM-3.4.1.patch

@@ -1,119 +0,0 @@
-From 93c2ebbd83604263fa46351a7efcde382322024b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Fri, 09 May 2014 08:24:42 +0000
-Subject: radeonsi: Enable geometry shaders with LLVM 3.4.1
-
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-
-CC: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
----
-diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
-index e0b211f..38ad077 100644
---- a/src/gallium/drivers/radeonsi/si_descriptors.c
-+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
-@@ -152,7 +152,7 @@ static void si_update_descriptors(struct si_context *sctx,
- 			7 + /* copy */
- 			(4 + desc->element_dw_size) * util_bitcount(desc->dirty_mask) + /* update */
- 			4; /* pointer update */
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 		if (desc->shader_userdata_reg >= R_00B130_SPI_SHADER_USER_DATA_VS_0 &&
- 		    desc->shader_userdata_reg < R_00B230_SPI_SHADER_USER_DATA_GS_0)
- 			desc->atom.num_dw += 4; /* second pointer update */
-@@ -177,7 +177,7 @@ static void si_emit_shader_pointer(struct si_context *sctx,
- 	radeon_emit(cs, va);
- 	radeon_emit(cs, va >> 32);
- 
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 	if (desc->shader_userdata_reg >= R_00B130_SPI_SHADER_USER_DATA_VS_0 &&
- 	    desc->shader_userdata_reg < R_00B230_SPI_SHADER_USER_DATA_GS_0) {
- 		radeon_emit(cs, PKT3(PKT3_SET_SH_REG, 2, 0));
-diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
-index e5d0a95..07c00cf 100644
---- a/src/gallium/drivers/radeonsi/si_pipe.c
-+++ b/src/gallium/drivers/radeonsi/si_pipe.c
-@@ -225,7 +225,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
- 		return 4;
- 
- 	case PIPE_CAP_GLSL_FEATURE_LEVEL:
--		return HAVE_LLVM >= 0x0305 ? 330 : 140;
-+		return (LLVM_SUPPORTS_GEOM_SHADERS) ? 330 : 140;
- 
- 	case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
- 		return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF);
-@@ -309,7 +309,7 @@ static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enu
- 	case PIPE_SHADER_VERTEX:
- 		break;
- 	case PIPE_SHADER_GEOMETRY:
--#if HAVE_LLVM < 0x0305
-+#if !(LLVM_SUPPORTS_GEOM_SHADERS)
- 		return 0;
- #endif
- 		break;
-diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
-index 1601a4b..de42477 100644
---- a/src/gallium/drivers/radeonsi/si_pipe.h
-+++ b/src/gallium/drivers/radeonsi/si_pipe.h
-@@ -39,6 +39,10 @@
- 
- #define SI_MAX_DRAW_CS_DWORDS 18
- 
-+#define LLVM_SUPPORTS_GEOM_SHADERS \
-+	((HAVE_LLVM >= 0x0305) || \
-+	(HAVE_LLVM == 0x0304 && LLVM_VERSION_PATCH >= 1))
-+
- struct si_pipe_compute;
- 
- struct si_screen {
-diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
-index 9d048c5..a98be24 100644
---- a/src/gallium/drivers/radeonsi/si_state.c
-+++ b/src/gallium/drivers/radeonsi/si_state.c
-@@ -2174,7 +2174,7 @@ static void *si_create_fs_state(struct pipe_context *ctx,
- 	return si_create_shader_state(ctx, state, PIPE_SHADER_FRAGMENT);
- }
- 
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 
- static void *si_create_gs_state(struct pipe_context *ctx,
- 				const struct pipe_shader_state *state)
-@@ -2204,7 +2204,7 @@ static void si_bind_vs_shader(struct pipe_context *ctx, void *state)
- 	sctx->vs_shader = sel;
- }
- 
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 
- static void si_bind_gs_shader(struct pipe_context *ctx, void *state)
- {
-@@ -2272,7 +2272,7 @@ static void si_delete_vs_shader(struct pipe_context *ctx, void *state)
- 	si_delete_shader_selector(ctx, sel);
- }
- 
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 
- static void si_delete_gs_shader(struct pipe_context *ctx, void *state)
- {
-@@ -2769,7 +2769,7 @@ static void si_bind_vs_sampler_states(struct pipe_context *ctx, unsigned count,
- 	si_set_sampler_states(sctx, pm4, count, states,
- 			      &sctx->samplers[PIPE_SHADER_VERTEX],
- 			      R_00B130_SPI_SHADER_USER_DATA_VS_0);
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 	si_set_sampler_states(sctx, pm4, count, states,
- 			      &sctx->samplers[PIPE_SHADER_VERTEX],
- 			      R_00B330_SPI_SHADER_USER_DATA_ES_0);
-@@ -3001,7 +3001,7 @@ void si_init_state_functions(struct si_context *sctx)
- 	sctx->b.b.bind_fs_state = si_bind_ps_shader;
- 	sctx->b.b.delete_vs_state = si_delete_vs_shader;
- 	sctx->b.b.delete_fs_state = si_delete_ps_shader;
--#if HAVE_LLVM >= 0x0305
-+#if LLVM_SUPPORTS_GEOM_SHADERS
- 	sctx->b.b.create_gs_state = si_create_gs_state;
- 	sctx->b.b.bind_gs_state = si_bind_gs_shader;
- 	sctx->b.b.delete_gs_state = si_delete_gs_shader;
---
-cgit v0.9.0.2-2-gbebe

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="97082b6"
+PKG_VERSION="e45a4a2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_more_products.patch

@@ -1,6 +1,6 @@
 diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c
 --- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c	2013-09-11 05:56:55.000000000 +0200
-+++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c	2014-04-09 02:51:25.318208735 +0200
++++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c	2014-06-08 15:44:13.239381855 +0200
 @@ -96,6 +96,7 @@
  	{USB_DEVICE(0x2019, 0xED17)},/* PCI - Edimax */ \
  	{USB_DEVICE(0x0DF6, 0x0052)},/* Sitecom - Edimax */ \
@@ -9,8 +9,11 @@ diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0
  	{USB_DEVICE(0x07B8, 0x8189)},/* Abocom - Abocom */ \
  	{USB_DEVICE(0x0EB0, 0x9071)},/* NO Brand - Etop */ \
  	{USB_DEVICE(0x06F8, 0xE033)},/* Hercules - Edimax */ \
-@@ -146,6 +147,7 @@
+@@ -144,8 +145,10 @@
+ 	{USB_DEVICE(0x07B8, 0x8178)},/* Abocom - Abocom */ \
+ 	{USB_DEVICE(0x07AA, 0x0056)},/* ATKK - Gemtek */ \
  	{USB_DEVICE(0x4855, 0x0091)},/*  - Feixun */ \
++	{USB_DEVICE(0x050D, 0x11F2)},/* Belkin - Edimax */ \
  	{USB_DEVICE(0x050D, 0x2102)},/* Belkin - Sercomm */ \
  	{USB_DEVICE(0x050D, 0x2103)},/* Belkin - Edimax */ \
 +	{USB_DEVICE(0x050D, 0x21F2)},/* Belkin - Edimax */ \

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.4"
+    PKG_VERSION="3.14.7"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
 esac

packages/linux/patches/3.14.4/linux-999.05-ALSA-hda-hdmi-Set-converter-channel-count-even-witho.patch

@@ -1,55 +0,0 @@
-From 299db7189ad00fdddae62c9841c25a4b7c835ce5 Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Mon, 5 May 2014 01:32:48 +0300
-Subject: [PATCH 1/2] ALSA: hda - hdmi: Set converter channel count even
- without sink
-
-Since commit 1df5a06a ("ALSA: hda - hdmi: Fix programmed active channel
-count") channel count is no longer being set if monitor_present is 0.
-This is because setting the count was moved after the CA value is
-determined, which is only after the monitor_present check in
-hdmi_setup_audio_infoframe().
-
-Unfortunately, in some cases, such as with a non-spec-compliant codec or
-with a problematic video driver, monitor_present is always 0. As a
-specific example, this seems to happen with gen1 ATV (SiI1390 codec),
-causing left-channel-only stereo playback (multi-channel playback has
-apparently never worked with this codec despite it reporting 8 channels,
-reason unknown).
-
-Simply setting converter channel count without setting the pin infoframe
-and channel mapping as well does not theoretically make much sense as
-this will just mean they are out-of-sync and multichannel playback will
-have a wrong channel mapping.
-
-However, adding back just setting the converter channel count even in
-no-monitor case is the safest change which at least fixes the stereo
-playback regression on SiI1390 codec. Do that.
-
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Reported-by: Stephan Raue <stephan@openelec.tv>
-Tested-by: Stephan Raue <stephan@openelec.tv>
-Cc: <stable@vger.kernel.org> # 3.12+
----
- sound/pci/hda/patch_hdmi.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 0cb5b89cd0c8..1edbb9c47c2d 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -1127,8 +1127,10 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
- 					    AMP_OUT_UNMUTE);
- 
- 	eld = &per_pin->sink_eld;
--	if (!eld->monitor_present)
-+	if (!eld->monitor_present) {
-+		hdmi_set_channel_count(codec, per_pin->cvt_nid, channels);
- 		return;
-+	}
- 
- 	if (!non_pcm && per_pin->chmap_set)
- 		ca = hdmi_manual_channel_allocation(channels, per_pin->chmap);
--- 
-1.8.4.5
-

packages/linux/patches/3.14.7/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/linux/patches/3.14.7/linux-999.03-drm-radeon-PLL-fixes.patch

@@ -597,348 +597,3 @@ index 0c26b3c..12a01e9 100644
 -- 
 1.9.1
 
-From 6e26c28955078c20a78a41e03911d67b5f85bd55 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Wed, 23 Apr 2014 20:46:06 +0200
-Subject: [PATCH 6/6] drm/radeon: use pflip irq on R600+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/radeon/cik.c            | 76 +++++++++++++++++++++++++++++++++
- drivers/gpu/drm/radeon/cikd.h           |  9 ++++
- drivers/gpu/drm/radeon/evergreen.c      | 28 +++++++++---
- drivers/gpu/drm/radeon/r600.c           | 10 +++--
- drivers/gpu/drm/radeon/radeon.h         |  6 +++
- drivers/gpu/drm/radeon/radeon_display.c |  4 ++
- drivers/gpu/drm/radeon/si.c             | 28 +++++++++---
- 7 files changed, 144 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
-index bbb1784..e29c9b2 100644
---- a/drivers/gpu/drm/radeon/cik.c
-+++ b/drivers/gpu/drm/radeon/cik.c
-@@ -6662,6 +6662,19 @@ static void cik_disable_interrupt_state(struct radeon_device *rdev)
- 		WREG32(LB_INTERRUPT_MASK + EVERGREEN_CRTC4_REGISTER_OFFSET, 0);
- 		WREG32(LB_INTERRUPT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, 0);
- 	}
-+	/* pflip */
-+	if (rdev->num_crtc >= 2) {
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, 0);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, 0);
-+	}
-+	if (rdev->num_crtc >= 4) {
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, 0);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, 0);
-+	}
-+	if (rdev->num_crtc >= 6) {
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, 0);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, 0);
-+	}
- 
- 	/* dac hotplug */
- 	WREG32(DAC_AUTODETECT_INT_CONTROL, 0);
-@@ -7018,6 +7031,25 @@ int cik_irq_set(struct radeon_device *rdev)
- 		WREG32(LB_INTERRUPT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, crtc6);
- 	}
- 
-+	if (rdev->num_crtc >= 2) {
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+	}
-+	if (rdev->num_crtc >= 4) {
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+	}
-+	if (rdev->num_crtc >= 6) {
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+	}
-+
- 	WREG32(DC_HPD1_INT_CONTROL, hpd1);
- 	WREG32(DC_HPD2_INT_CONTROL, hpd2);
- 	WREG32(DC_HPD3_INT_CONTROL, hpd3);
-@@ -7054,6 +7086,29 @@ static inline void cik_irq_ack(struct radeon_device *rdev)
- 	rdev->irq.stat_regs.cik.disp_int_cont5 = RREG32(DISP_INTERRUPT_STATUS_CONTINUE5);
- 	rdev->irq.stat_regs.cik.disp_int_cont6 = RREG32(DISP_INTERRUPT_STATUS_CONTINUE6);
- 
-+	rdev->irq.stat_regs.cik.d1grph_int = RREG32(GRPH_INT_STATUS +
-+		EVERGREEN_CRTC0_REGISTER_OFFSET);
-+	rdev->irq.stat_regs.cik.d2grph_int = RREG32(GRPH_INT_STATUS +
-+		EVERGREEN_CRTC1_REGISTER_OFFSET);
-+	if (rdev->num_crtc >= 4) {
-+		rdev->irq.stat_regs.cik.d3grph_int = RREG32(GRPH_INT_STATUS +
-+			EVERGREEN_CRTC2_REGISTER_OFFSET);
-+		rdev->irq.stat_regs.cik.d4grph_int = RREG32(GRPH_INT_STATUS +
-+			EVERGREEN_CRTC3_REGISTER_OFFSET);
-+	}
-+	if (rdev->num_crtc >= 6) {
-+		rdev->irq.stat_regs.cik.d5grph_int = RREG32(GRPH_INT_STATUS +
-+			EVERGREEN_CRTC4_REGISTER_OFFSET);
-+		rdev->irq.stat_regs.cik.d6grph_int = RREG32(GRPH_INT_STATUS +
-+			EVERGREEN_CRTC5_REGISTER_OFFSET);
-+	}
-+
-+	if (rdev->irq.stat_regs.cik.d1grph_int & GRPH_PFLIP_INT_OCCURRED)
-+		WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC0_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_CLEAR);
-+	if (rdev->irq.stat_regs.cik.d2grph_int & GRPH_PFLIP_INT_OCCURRED)
-+		WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC1_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_CLEAR);
- 	if (rdev->irq.stat_regs.cik.disp_int & LB_D1_VBLANK_INTERRUPT)
- 		WREG32(LB_VBLANK_STATUS + EVERGREEN_CRTC0_REGISTER_OFFSET, VBLANK_ACK);
- 	if (rdev->irq.stat_regs.cik.disp_int & LB_D1_VLINE_INTERRUPT)
-@@ -7064,6 +7119,12 @@ static inline void cik_irq_ack(struct radeon_device *rdev)
- 		WREG32(LB_VLINE_STATUS + EVERGREEN_CRTC1_REGISTER_OFFSET, VLINE_ACK);
- 
- 	if (rdev->num_crtc >= 4) {
-+		if (rdev->irq.stat_regs.cik.d3grph_int & GRPH_PFLIP_INT_OCCURRED)
-+			WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC2_REGISTER_OFFSET,
-+			       GRPH_PFLIP_INT_CLEAR);
-+		if (rdev->irq.stat_regs.cik.d4grph_int & GRPH_PFLIP_INT_OCCURRED)
-+			WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC3_REGISTER_OFFSET,
-+			       GRPH_PFLIP_INT_CLEAR);
- 		if (rdev->irq.stat_regs.cik.disp_int_cont2 & LB_D3_VBLANK_INTERRUPT)
- 			WREG32(LB_VBLANK_STATUS + EVERGREEN_CRTC2_REGISTER_OFFSET, VBLANK_ACK);
- 		if (rdev->irq.stat_regs.cik.disp_int_cont2 & LB_D3_VLINE_INTERRUPT)
-@@ -7075,6 +7136,12 @@ static inline void cik_irq_ack(struct radeon_device *rdev)
- 	}
- 
- 	if (rdev->num_crtc >= 6) {
-+		if (rdev->irq.stat_regs.cik.d5grph_int & GRPH_PFLIP_INT_OCCURRED)
-+			WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC4_REGISTER_OFFSET,
-+			       GRPH_PFLIP_INT_CLEAR);
-+		if (rdev->irq.stat_regs.cik.d6grph_int & GRPH_PFLIP_INT_OCCURRED)
-+			WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC5_REGISTER_OFFSET,
-+			       GRPH_PFLIP_INT_CLEAR);
- 		if (rdev->irq.stat_regs.cik.disp_int_cont4 & LB_D5_VBLANK_INTERRUPT)
- 			WREG32(LB_VBLANK_STATUS + EVERGREEN_CRTC4_REGISTER_OFFSET, VBLANK_ACK);
- 		if (rdev->irq.stat_regs.cik.disp_int_cont4 & LB_D5_VLINE_INTERRUPT)
-@@ -7426,6 +7493,15 @@ restart_ih:
- 				break;
- 			}
- 			break;
-+		case 8: /* D1 page flip */
-+		case 9: /* D2 page flip */
-+		case 10: /* D3 page flip */
-+		case 11: /* D4 page flip */
-+		case 12: /* D5 page flip */
-+		case 13: /* D6 page flip */
-+			DRM_DEBUG("IH: D%d flip\n", src_id - 7);
-+			radeon_crtc_handle_flip(rdev, src_id - 8);
-+			break;
- 		case 42: /* HPD hotplug */
- 			switch (src_data) {
- 			case 0:
-diff --git a/drivers/gpu/drm/radeon/cikd.h b/drivers/gpu/drm/radeon/cikd.h
-index 98bae9d7..d1b2c71 100644
---- a/drivers/gpu/drm/radeon/cikd.h
-+++ b/drivers/gpu/drm/radeon/cikd.h
-@@ -882,6 +882,15 @@
- #       define DC_HPD6_RX_INTERRUPT                     (1 << 18)
- #define DISP_INTERRUPT_STATUS_CONTINUE6                 0x6780
- 
-+/* 0x6858, 0x7458, 0x10058, 0x10c58, 0x11858, 0x12458 */
-+#define GRPH_INT_STATUS                                 0x6858
-+#       define GRPH_PFLIP_INT_OCCURRED                  (1 << 0)
-+#       define GRPH_PFLIP_INT_CLEAR                     (1 << 8)
-+/* 0x685c, 0x745c, 0x1005c, 0x10c5c, 0x1185c, 0x1245c */
-+#define GRPH_INT_CONTROL                                0x685c
-+#       define GRPH_PFLIP_INT_MASK                      (1 << 0)
-+#       define GRPH_PFLIP_INT_TYPE                      (1 << 8)
-+
- #define	DAC_AUTODETECT_INT_CONTROL			0x67c8
- 
- #define DC_HPD1_INT_STATUS                              0x601c
-diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
-index 27b0ff1..8ffee2b 100644
---- a/drivers/gpu/drm/radeon/evergreen.c
-+++ b/drivers/gpu/drm/radeon/evergreen.c
-@@ -4375,7 +4375,6 @@ int evergreen_irq_set(struct radeon_device *rdev)
- 	u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0;
- 	u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6;
- 	u32 grbm_int_cntl = 0;
--	u32 grph1 = 0, grph2 = 0, grph3 = 0, grph4 = 0, grph5 = 0, grph6 = 0;
- 	u32 afmt1 = 0, afmt2 = 0, afmt3 = 0, afmt4 = 0, afmt5 = 0, afmt6 = 0;
- 	u32 dma_cntl, dma_cntl1 = 0;
- 	u32 thermal_int = 0;
-@@ -4558,15 +4557,21 @@ int evergreen_irq_set(struct radeon_device *rdev)
- 		WREG32(INT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, crtc6);
- 	}
- 
--	WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, grph1);
--	WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, grph2);
-+	WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET,
-+	       GRPH_PFLIP_INT_MASK);
-+	WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET,
-+	       GRPH_PFLIP_INT_MASK);
- 	if (rdev->num_crtc >= 4) {
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, grph3);
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, grph4);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
- 	}
- 	if (rdev->num_crtc >= 6) {
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, grph5);
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, grph6);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
- 	}
- 
- 	WREG32(DC_HPD1_INT_CONTROL, hpd1);
-@@ -4955,6 +4960,15 @@ restart_ih:
- 				break;
- 			}
- 			break;
-+		case 8: /* D1 page flip */
-+		case 9: /* D2 page flip */
-+		case 10: /* D3 page flip */
-+		case 11: /* D4 page flip */
-+		case 12: /* D5 page flip */
-+		case 13: /* D6 page flip */
-+			DRM_DEBUG("IH: D%d flip\n", src_id - 7);
-+			radeon_crtc_handle_flip(rdev, src_id - 8);
-+			break;
- 		case 42: /* HPD hotplug */
- 			switch (src_data) {
- 			case 0:
-diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 647ef40..114a3ef 100644
---- a/drivers/gpu/drm/radeon/r600.c
-+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -3509,7 +3509,6 @@ int r600_irq_set(struct radeon_device *rdev)
- 	u32 hpd1, hpd2, hpd3, hpd4 = 0, hpd5 = 0, hpd6 = 0;
- 	u32 grbm_int_cntl = 0;
- 	u32 hdmi0, hdmi1;
--	u32 d1grph = 0, d2grph = 0;
- 	u32 dma_cntl;
- 	u32 thermal_int = 0;
- 
-@@ -3618,8 +3617,8 @@ int r600_irq_set(struct radeon_device *rdev)
- 	WREG32(CP_INT_CNTL, cp_int_cntl);
- 	WREG32(DMA_CNTL, dma_cntl);
- 	WREG32(DxMODE_INT_MASK, mode_int);
--	WREG32(D1GRPH_INTERRUPT_CONTROL, d1grph);
--	WREG32(D2GRPH_INTERRUPT_CONTROL, d2grph);
-+	WREG32(D1GRPH_INTERRUPT_CONTROL, DxGRPH_PFLIP_INT_MASK);
-+	WREG32(D2GRPH_INTERRUPT_CONTROL, DxGRPH_PFLIP_INT_MASK);
- 	WREG32(GRBM_INT_CNTL, grbm_int_cntl);
- 	if (ASIC_IS_DCE3(rdev)) {
- 		WREG32(DC_HPD1_INT_CONTROL, hpd1);
-@@ -3922,6 +3921,11 @@ restart_ih:
- 				break;
- 			}
- 			break;
-+		case 9: /* D1 pflip */
-+		case 10: /* D2 pflip */
-+			DRM_DEBUG("IH: D%d flip\n", src_id - 8);
-+			radeon_crtc_handle_flip(rdev, src_id - 9);
-+			break;
- 		case 19: /* HPD/DAC hotplug */
- 			switch (src_data) {
- 			case 0:
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index e887d02..5587de9 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -733,6 +733,12 @@ struct cik_irq_stat_regs {
- 	u32 disp_int_cont4;
- 	u32 disp_int_cont5;
- 	u32 disp_int_cont6;
-+	u32 d1grph_int;
-+	u32 d2grph_int;
-+	u32 d3grph_int;
-+	u32 d4grph_int;
-+	u32 d5grph_int;
-+	u32 d6grph_int;
- };
- 
- union radeon_irq_stat_regs {
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 12a01e9..5e4326f 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -284,6 +284,10 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
- 	u32 update_pending;
- 	int vpos, hpos;
- 
-+	/* can happen during initialization */
-+	if (radeon_crtc == NULL)
-+		return;
-+
- 	spin_lock_irqsave(&rdev->ddev->event_lock, flags);
- 	work = radeon_crtc->unpin_work;
- 	if (work == NULL ||
-diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
-index 9a124d0..2b47e53 100644
---- a/drivers/gpu/drm/radeon/si.c
-+++ b/drivers/gpu/drm/radeon/si.c
-@@ -5777,7 +5777,6 @@ int si_irq_set(struct radeon_device *rdev)
- 	u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0;
- 	u32 hpd1 = 0, hpd2 = 0, hpd3 = 0, hpd4 = 0, hpd5 = 0, hpd6 = 0;
- 	u32 grbm_int_cntl = 0;
--	u32 grph1 = 0, grph2 = 0, grph3 = 0, grph4 = 0, grph5 = 0, grph6 = 0;
- 	u32 dma_cntl, dma_cntl1;
- 	u32 thermal_int = 0;
- 
-@@ -5916,16 +5915,22 @@ int si_irq_set(struct radeon_device *rdev)
- 	}
- 
- 	if (rdev->num_crtc >= 2) {
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, grph1);
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, grph2);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
- 	}
- 	if (rdev->num_crtc >= 4) {
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, grph3);
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, grph4);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
- 	}
- 	if (rdev->num_crtc >= 6) {
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, grph5);
--		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, grph6);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
-+		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET,
-+		       GRPH_PFLIP_INT_MASK);
- 	}
- 
- 	if (!ASIC_IS_NODCE(rdev)) {
-@@ -6289,6 +6294,15 @@ restart_ih:
- 				break;
- 			}
- 			break;
-+		case 8: /* D1 page flip */
-+		case 9: /* D2 page flip */
-+		case 10: /* D3 page flip */
-+		case 11: /* D4 page flip */
-+		case 12: /* D5 page flip */
-+		case 13: /* D6 page flip */
-+			DRM_DEBUG("IH: D%d flip\n", src_id - 7);
-+			radeon_crtc_handle_flip(rdev, src_id - 8);
-+			break;
- 		case 42: /* HPD hotplug */
- 			switch (src_data) {
- 			case 0:
--- 
-1.9.1
-
-

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.3.16"
+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-a6a2713"
+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-a6a2713"
+PKG_VERSION="13-84725b0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-999.03-0001-handle-SIGTERM.patch

@@ -0,0 +1,169 @@
+From d3a6ee05721ca6536b30a4e270d1844acfcb0533 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Thu, 5 Jun 2014 18:50:04 +0300
+Subject: [PATCH] handle SIGTERM
+
+In some situations, due to deadlocks or crashes, xbmc fails to exit properly in
+CApplication::Stop(), so  g_powerManager.Reboot() / g_powerManager.Powerdown() never gets
+called, that's a big no-no for openelec as our users can't shutdown or reboot.
+There are few addons reported to cause this behaviour: trakkt.tv, watchdog, weather.underground.
+
+I've also noticed that sometimes new threads (FileCache ??) get started AFTER
+CApplication::Stop() is called, delaying shutdown with 1+ minute (2 curl timeoouts?).
+The problem seems to be in CJobManager::CancelJobs() but I am too lame to understand where,
+why, and how to fix it.
+
+To me, it seems best to let systemd handle it. systemd sends SIGTERM, then waits
+TimeoutStopSec=xx seconds then sends SIGKILL,s so dont call g_application.Stop() from
+ApplicationMessenger as it can not be trusted. save the requested exitcode instead
+(that's required for CEC to switch off the tv) and do it from a simple SIGTERM handler instead.
+
+CEC thread has enough time (5 seconds in xbmc.service) to switch of the TV after receiving OnQuit.
+As a side "effect", now guisettings.xml will ALWAYS be saved, even if shutdown / rebooot
+is requested externaly (ssh, 3rdparty script).
+---
+ xbmc/Application.cpp          | 10 ++++++++--
+ xbmc/Application.h            |  1 +
+ xbmc/ApplicationMessenger.cpp |  6 ++++--
+ xbmc/XBApplicationEx.cpp      |  1 +
+ xbmc/XBApplicationEx.h        |  1 +
+ xbmc/main/main.cpp            | 15 +++++++++++++++
+ 6 files changed, 30 insertions(+), 4 deletions(-)
+
+diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
+index 9242d53..1b13667 100644
+--- a/xbmc/Application.cpp
++++ b/xbmc/Application.cpp
+@@ -3509,11 +3509,18 @@ bool CApplication::Cleanup()
+   }
+ }
+ 
++void CApplication::SetExitCode(int exitCode)
++{
++  // save it for CEC
++  m_ExitCode = exitCode;
++  m_ExitCodeSet = true;
++}
++
+ void CApplication::Stop(int exitCode)
+ {
+   try
+   {
+-    CVariant vExitCode(exitCode);
++    CVariant vExitCode(m_ExitCode);
+     CAnnouncementManager::Announce(System, "xbmc", "OnQuit", vExitCode);
+ 
+     SaveFileState(true);
+@@ -3537,7 +3544,6 @@ void CApplication::Stop(int exitCode)
+ 
+     m_bStop = true;
+     m_AppFocused = false;
+-    m_ExitCode = exitCode;
+     CLog::Log(LOGNOTICE, "stop all");
+ 
+     // cancel any jobs from the jobmanager
+diff --git a/xbmc/Application.h b/xbmc/Application.h
+index e3a26c5..35656e3 100644
+--- a/xbmc/Application.h
++++ b/xbmc/Application.h
+@@ -149,6 +149,7 @@ public:
+   void StartPVRManager(bool bOpenPVRWindow = false);
+   void StopPVRManager();
+   bool IsCurrentThread() const;
++  void SetExitCode(int exitCode);
+   void Stop(int exitCode);
+   void RestartApp();
+   void UnloadSkin(bool forReload = false);
+diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
+index 3524e89..54a15da 100644
+--- a/xbmc/ApplicationMessenger.cpp
++++ b/xbmc/ApplicationMessenger.cpp
+@@ -259,13 +259,14 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
+ 
+     case TMSG_POWERDOWN:
+       {
+-        g_application.Stop(EXITCODE_POWERDOWN);
++        g_application.SetExitCode(EXITCODE_POWERDOWN);
+         g_powerManager.Powerdown();
+       }
+       break;
+ 
+     case TMSG_QUIT:
+       {
++        g_application.SetExitCode(EXITCODE_QUIT);
+         g_application.Stop(EXITCODE_QUIT);
+       }
+       break;
+@@ -287,7 +288,7 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
+     case TMSG_RESTART:
+     case TMSG_RESET:
+       {
+-        g_application.Stop(EXITCODE_REBOOT);
++        g_application.SetExitCode(EXITCODE_REBOOT);
+         g_powerManager.Reboot();
+       }
+       break;
+@@ -295,6 +296,7 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
+     case TMSG_RESTARTAPP:
+       {
+ #if defined(TARGET_WINDOWS) || defined(TARGET_LINUX)
++        g_application.SetExitCode(EXITCODE_RESTARTAPP);
+         g_application.Stop(EXITCODE_RESTARTAPP);
+ #endif
+       }
+diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
+index ad6a145..6058938 100644
+--- a/xbmc/XBApplicationEx.cpp
++++ b/xbmc/XBApplicationEx.cpp
+@@ -40,6 +40,7 @@ CXBApplicationEx::CXBApplicationEx()
+   m_bStop = false;
+   m_AppFocused = true;
+   m_ExitCode = EXITCODE_QUIT;
++  m_ExitCodeSet = false;
+   m_renderGUI = false;
+ }
+ 
+diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h
+index c46cba1..ed3f35f 100644
+--- a/xbmc/XBApplicationEx.h
++++ b/xbmc/XBApplicationEx.h
+@@ -40,6 +40,7 @@ public:
+   // Variables for timing
+   bool m_bStop;
+   int  m_ExitCode;
++  bool m_ExitCodeSet;
+   bool m_AppFocused;
+   bool m_renderGUI;
+ 
+diff --git a/xbmc/main/main.cpp b/xbmc/main/main.cpp
+index ec86426..ad8fe6e 100644
+--- a/xbmc/main/main.cpp
++++ b/xbmc/main/main.cpp
+@@ -40,9 +40,24 @@
+ #include "input/linux/LIRC.h"
+ #endif
+ #include "XbmcContext.h"
++#include "Application.h"
++
++void xbmc_term_handler(int signum)
++{
++  CLog::Log(LOGINFO, "Received SIGTERM...");
++  if (!g_application.m_ExitCodeSet)
++    g_application.SetExitCode(EXITCODE_RESTARTAPP);
++  g_application.Stop(EXITCODE_RESTARTAPP);
++}
+ 
+ int main(int argc, char* argv[])
+ {
++  // SIGTERM handler
++  struct sigaction action;
++  memset(&action, 0, sizeof(struct sigaction));
++  action.sa_handler = xbmc_term_handler;
++  sigaction(SIGTERM, &action, NULL);
++
+   // set up some xbmc specific relationships
+   XBMC::Context context;
+ 
+-- 
+1.9.1
+

packages/mediacenter/xbmc/patches/xbmc-999.91.02-PR4838.patch

@@ -0,0 +1,236 @@
+From 856d88d87f27370e8471963790db4e4e7c4ba910 Mon Sep 17 00:00:00 2001
+From: Matthias Kortstiege <vdrfan@xbmc.org>
+Date: Fri, 30 May 2014 15:57:25 +0200
+Subject: [PATCH] added: CPosixDirectory implementation
+
+---
+ XBMC.xcodeproj/project.pbxproj           |  18 +++++
+ xbmc/filesystem/DirectoryFactory.cpp     |   7 ++
+ xbmc/filesystem/Makefile.in              |   1 +
+ xbmc/filesystem/posix/PosixDirectory.cpp | 130 +++++++++++++++++++++++++++++++
+ xbmc/filesystem/posix/PosixDirectory.h   |  37 +++++++++
+ 5 files changed, 193 insertions(+)
+ create mode 100644 xbmc/filesystem/posix/PosixDirectory.cpp
+ create mode 100644 xbmc/filesystem/posix/PosixDirectory.h
+
+diff --git a/xbmc/filesystem/DirectoryFactory.cpp b/xbmc/filesystem/DirectoryFactory.cpp
+index 260d53c..dc39a93 100644
+--- a/xbmc/filesystem/DirectoryFactory.cpp
++++ b/xbmc/filesystem/DirectoryFactory.cpp
+@@ -46,6 +46,9 @@
+ #include "utils/log.h"
+ #include "network/WakeOnAccess.h"
+ 
++#ifdef TARGET_POSIX
++#include "posix/PosixDirectory.h"
++#endif
+ #ifdef HAS_FILESYSTEM_SMB
+ #ifdef TARGET_WINDOWS
+ #include "windows/WINSMBDirectory.h"
+@@ -135,7 +138,11 @@ IDirectory* CDirectoryFactory::Create(const CStdString& strPath)
+ 
+   CStdString strProtocol = url.GetProtocol();
+ 
++#ifdef TARGET_POSIX
++  if (strProtocol.size() == 0 || strProtocol == "file") return new CPosixDirectory();
++#else
+   if (strProtocol.size() == 0 || strProtocol == "file") return new CHDDirectory();
++#endif
+   if (strProtocol == "special") return new CSpecialProtocolDirectory();
+   if (strProtocol == "sources") return new CSourcesDirectory();
+   if (strProtocol == "addons") return new CAddonsDirectory();
+diff --git a/xbmc/filesystem/Makefile.in b/xbmc/filesystem/Makefile.in
+index 623bbb8..725951e 100644
+--- a/xbmc/filesystem/Makefile.in
++++ b/xbmc/filesystem/Makefile.in
+@@ -57,6 +57,7 @@ SRCS += PlaylistFileDirectory.cpp
+ SRCS += PipeFile.cpp
+ SRCS += PipesManager.cpp
+ SRCS += PluginDirectory.cpp
++SRCS += posix/PosixDirectory.cpp
+ SRCS += PVRFile.cpp
+ SRCS += PVRDirectory.cpp
+ SRCS += RSSDirectory.cpp
+diff --git a/xbmc/filesystem/posix/PosixDirectory.cpp b/xbmc/filesystem/posix/PosixDirectory.cpp
+new file mode 100644
+index 0000000..e60c6f9
+--- /dev/null
++++ b/xbmc/filesystem/posix/PosixDirectory.cpp
+@@ -0,0 +1,131 @@
++/*
++ *      Copyright (C) 2014 Team XBMC
++ *      http://xbmc.org
++ *
++ *  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 XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#if defined(TARGET_POSIX)
++
++#include "PosixDirectory.h"
++#include "utils/StringUtils.h"
++#include "utils/URIUtils.h"
++#include "FileItem.h"
++#include "XTimeUtils.h"
++
++#include <dirent.h>
++#include <sys/stat.h>
++
++using namespace std;
++using namespace XFILE;
++
++CPosixDirectory::CPosixDirectory(void)
++{}
++
++CPosixDirectory::~CPosixDirectory(void)
++{}
++
++bool CPosixDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
++{
++  const char* root = strPath;
++  struct dirent* entry;
++  DIR *dir = opendir(root);
++
++  if (!dir)
++    return false;
++
++  while ((entry = readdir(dir)) != NULL)
++  {
++    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
++      continue;
++
++    CFileItemPtr pItem(new CFileItem(entry->d_name));
++    std::string itemPath(URIUtils::AddFileToFolder(root, entry->d_name));
++
++    bool bStat = false;
++    struct stat buffer;
++
++    // Unix-based readdir implementations may return an incorrect dirent.d_ino value that
++    // is not equal to the (correct) stat() obtained one. In this case the file type
++    // could not be determined and the value of dirent.d_type is set to DT_UNKNOWN.
++    // In order to get a correct value we have to incur the cost of calling stat.
++    if (entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK)
++    {
++      if (stat(itemPath.c_str(), &buffer) == 0)
++        bStat = true;
++    }
++
++    if (entry->d_type == DT_DIR || (bStat && buffer.st_mode & S_IFDIR))
++    {
++      pItem->m_bIsFolder = true;
++      URIUtils::AddSlashAtEnd(itemPath);
++    }
++    else
++    {
++      pItem->m_bIsFolder = false;
++    }
++
++    if (StringUtils::StartsWith(entry->d_name, "."))
++      pItem->SetProperty("file:hidden", true);
++
++    pItem->SetPath(itemPath);
++
++    if (!(m_flags & DIR_FLAG_NO_FILE_INFO))
++    {
++      if (bStat || stat(pItem->GetPath(), &buffer) == 0)
++      {
++        FILETIME fileTime, localTime;
++        TimeTToFileTime(buffer.st_mtime, &fileTime);
++        FileTimeToLocalFileTime(&fileTime, &localTime);
++        pItem->m_dateTime = localTime;
++
++        if (!pItem->m_bIsFolder)
++          pItem->m_dwSize = buffer.st_size;
++      }
++    }
++    items.Add(pItem);
++  }
++  closedir(dir);
++  return true;
++}
++
++bool CPosixDirectory::Create(const char* strPath)
++{
++  if (!strPath || !*strPath)
++    return false;
++
++  return (mkdir(strPath, 0755) == 0 || errno == EEXIST);
++}
++
++bool CPosixDirectory::Remove(const char* strPath)
++{
++  if (!strPath || !*strPath)
++    return false;
++
++  return (rmdir(strPath) == 0);
++}
++
++bool CPosixDirectory::Exists(const char* strPath)
++{
++  if (!strPath || !*strPath)
++    return false;
++
++  struct stat buffer;
++  if (stat(strPath, &buffer) != 0)
++    return false;
++  return S_ISDIR(buffer.st_mode) ? true : false;
++}
++#endif
+diff --git a/xbmc/filesystem/posix/PosixDirectory.h b/xbmc/filesystem/posix/PosixDirectory.h
+new file mode 100644
+index 0000000..a3fd01e
+--- /dev/null
++++ b/xbmc/filesystem/posix/PosixDirectory.h
+@@ -0,0 +1,37 @@
++#pragma once
++/*
++ *      Copyright (C) 2014 Team XBMC
++ *      http://xbmc.org
++ *
++ *  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 XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#include "filesystem/IDirectory.h"
++
++namespace XFILE
++{
++
++class CPosixDirectory : public IDirectory
++{
++public:
++  CPosixDirectory(void);
++  virtual ~CPosixDirectory(void);
++  virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
++  virtual bool Create(const char* strPath);
++  virtual bool Exists(const char* strPath);
++  virtual bool Remove(const char* strPath);
++};
++}
+-- 
+1.9.3
+

packages/mediacenter/xbmc/system.d/xbmc.target

@@ -1,7 +1,7 @@
 [Unit]
 Description=XBMC Mediacenter Interface
 Requires=multi-user.target graphical.target
-After=systemd-udev-trigger.service graphical.target
+After=graphical.target
 Conflicts=rescue.target
 AllowIsolate=yes
 

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

@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="libva-driver-intel"
+PKG_NAME="libva-intel-driver"
 PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
-PKG_URL="http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.freedesktop.org/software/vaapi/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libva libdrm"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
@@ -33,12 +33,3 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules --with-drivers-path=/usr/lib/va"
-
-unpack () {
-  if [ -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
-    rm -rf $BUILD/$PKG_NAME-$PKG_VERSION
-  fi
-
-  tar -xzf $SOURCES/$PKG_NAME/intel-driver-$PKG_VERSION.tar.gz -C $BUILD
-  mv $BUILD/intel-driver-$PKG_VERSION $BUILD/$PKG_NAME-$PKG_VERSION
-}

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/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/network/wpa_supplicant/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="wpa_supplicant"
-PKG_VERSION="2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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/libgpg-error/package.mk

@@ -32,7 +32,7 @@ PKG_LONGDESC="This is a library that defines common error values for all GnuPG c
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-nls --disable-rpath --with-gnu-ld"
+PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC --disable-nls --disable-rpath --with-gnu-ld"
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin

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/security/openssl/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="openssl"
-PKG_VERSION="1.0.1g"
+PKG_VERSION="1.0.1h"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

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/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/busybox/system.d/show-version.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=Show Version
 DefaultDependencies=false
+ConditionKernelCommandLine=!morequiet
 
 [Service]
 Type=oneshot

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/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="97082b6"
+PKG_VERSION="e45a4a2"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/tools/installer/scripts/installer

@@ -72,7 +72,11 @@ get_device_unmount() {
   DEVICES=""
   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 -E '^/dev/sd|^/dev/mmcblk' | 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
 }
@@ -377,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"
@@ -610,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 \
@@ -621,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-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/libICE/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libICE"
-PKG_VERSION="1.0.8"
+PKG_VERSION="1.0.9"
 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

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.14.2 Kernel Configuration
+# Linux/i386 3.14.6 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -181,6 +181,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -235,7 +236,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -458,6 +458,7 @@ CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init processor.max_cstate=2"
 # CONFIG_PM_RUNTIME is not set
 CONFIG_ACPI=y
 # CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_AC is not set
 # CONFIG_ACPI_BATTERY is not set
@@ -3252,7 +3253,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 +3263,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

@@ -3329,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
@@ -3374,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.4 Kernel Configuration
+# Linux/i386 3.14.6 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -191,6 +191,7 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -246,7 +247,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -486,6 +486,7 @@ CONFIG_PM_CLK=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_AC is not set
 CONFIG_ACPI_BATTERY=y
@@ -3814,7 +3815,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
 
 #
@@ -3824,7 +3825,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.4 Kernel Configuration
+# Linux/x86_64 3.14.6 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -204,6 +204,7 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -261,7 +262,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=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
@@ -481,6 +481,7 @@ CONFIG_PM_CLK=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_AC is not set
 CONFIG_ACPI_BATTERY=y
@@ -3790,7 +3791,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
 
 #
@@ -3800,7 +3801,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/RPi/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.2 Kernel Configuration
+# Linux/arm 3.14.6 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -163,6 +163,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
@@ -206,7 +207,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -326,7 +326,6 @@ CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_USE_DOMAINS=y
 
 #
 # Processor Features
@@ -2902,7 +2901,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 +2911,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.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.14.2 Kernel Configuration
+# Linux/i386 3.14.6 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -191,6 +191,7 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -246,7 +247,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -486,6 +486,7 @@ CONFIG_PM_CLK=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_AC is not set
 CONFIG_ACPI_BATTERY=y

projects/Virtual/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.6 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -204,6 +204,7 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -261,7 +262,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=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
@@ -480,6 +480,7 @@ CONFIG_PM_CLK=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_AC is not set
 CONFIG_ACPI_BATTERY=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