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

Conflicts:
	packages/linux/meta

packages/addons/service/multimedia/hts-tvheadend/config/settings.xml

@@ -1,5 +1,6 @@
 <settings>
     <setting id="WAIT_FOR_FEINIT" value="false" />
+    <setting id="NUM_ADAPTERS" value="1" />
     <setting id="XMLTV_LOCATION_FILE" value="" />
     <setting id="XMLTV_LOCATION_WEB" value="http://" />
     <setting id="XMLTV_TYPE" value="NONE" />

packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start

@@ -80,7 +80,9 @@ mkdir -p $ADDON_HOME
       if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
         break
       fi
-      if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+      # (wait for) at least 1 adapter (xbmc allows to set 0)
+      [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
+      if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
         sleep 1
         continue
       fi

packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml

@@ -11,5 +11,6 @@
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
+	<string id="1023">Number of adapters to wait for</string>
 
 </strings>

packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml

@@ -13,6 +13,7 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
+		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
 </settings>

packages/addons/service/multimedia/vdr-addon/config/settings.xml

@@ -1,5 +1,6 @@
 <settings>
     <setting id="WAIT_FOR_FEINIT" value="false" />
+    <setting id="NUM_ADAPTERS" value="1" />
     <setting id="REMOVE_MODULES" value="" />
     <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
     <setting id="ENABLE_DYNAMITE" value="true" />

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

@@ -145,7 +145,9 @@ if [ ! "$(pidof vdr.bin)" ];then
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       break
     fi
-    if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+    # (wait for) at least 1 adapter (xbmc allows to set 0)
+    [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
+    if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
       sleep 1
       continue
     fi

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -6,6 +6,7 @@
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
+	<string id="1023">Number of adapters to wait for</string>
 	<string id="1030">Plugin Configuration</string>
 	<string id="1031">Enable plugin: iptv</string>
 	<string id="1032">Enable plugin: streamdev-client</string>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -4,6 +4,7 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
+		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
     <category label="1002">

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="4ec01c7"
+PKG_VERSION="cb9513f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/libdrm/build

@@ -25,7 +25,7 @@
 get_graphicdrivers
 
 DRM_CONFIG="--disable-libkms --disable-intel --disable-radeon"
-DRM_CONFIG="$DRM_CONFIG --disable-nouveau --disable-vmwgfx-experimental-api"
+DRM_CONFIG="$DRM_CONFIG --disable-nouveau-experimental-api --disable-vmwgfx-experimental-api"
 
 for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = "i915" -o "$drv" = "i965" ] && \

packages/graphics/libdrm/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.35"
+PKG_VERSION="2.4.33"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -366,7 +366,7 @@ NBD_DEVS="0"
   check_disks() {
     progress "Checking disks"
 
-    if [ -x /sbin/fsck_hfs ]; then
+    if [ -x /bin/fsck_hfs ]; then
     # deal with hfs partitions
       hfsdiskprep
     fi

packages/linux/meta

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

packages/mediacenter/xbmc/patches/xbmc-11.0.1-464-add_eject_keymapping_for_lirc-0.1.patch

@@ -1,11 +0,0 @@
-diff -Naur xbmc-10.1-Dharma/system/keymaps/remote.xml xbmc-10.1-Dharma.patch/system/keymaps/remote.xml
---- xbmc-10.1-Dharma/system/keymaps/remote.xml	2011-03-08 02:49:23.000000000 +0100
-+++ xbmc-10.1-Dharma.patch/system/keymaps/remote.xml	2011-06-18 01:48:26.887811969 +0200
-@@ -63,6 +63,7 @@
-       <volumeminus>VolumeDown</volumeminus>
-       <mute>Mute</mute>
-       <power>XBMC.ShutDown()</power>
-+      <eject>XBMC.EjectTray()</eject>
-       <myvideo>XBMC.ActivateWindow(MyVideos)</myvideo>
-       <mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
-       <mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>

packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-464-add_eject_keymapping_for_lirc-0.1.patch

@@ -1,11 +0,0 @@
-diff -Naur xbmc-10.1-Dharma/system/keymaps/remote.xml xbmc-10.1-Dharma.patch/system/keymaps/remote.xml
---- xbmc-10.1-Dharma/system/keymaps/remote.xml	2011-03-08 02:49:23.000000000 +0100
-+++ xbmc-10.1-Dharma.patch/system/keymaps/remote.xml	2011-06-18 01:48:26.887811969 +0200
-@@ -63,6 +63,7 @@
-       <volumeminus>VolumeDown</volumeminus>
-       <mute>Mute</mute>
-       <power>XBMC.ShutDown()</power>
-+      <eject>XBMC.EjectTray()</eject>
-       <myvideo>XBMC.ActivateWindow(MyVideos)</myvideo>
-       <mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
-       <mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>

packages/network/iptables/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="iptables"
-PKG_VERSION="1.4.14"
+PKG_VERSION="1.4.15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/samba/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="samba"
-PKG_VERSION="3.6.6"
+PKG_VERSION="3.6.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/e2fsprogs/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="e2fsprogs"
-PKG_VERSION="1.42.4"
+PKG_VERSION="1.42.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/systemd/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="systemd"
-PKG_VERSION="187"
+PKG_VERSION="188"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/systemd/patches/systemd-187-cpp.patch

@@ -1,42 +0,0 @@
-diff -Naur systemd-187/Makefile.am systemd-187.patch/Makefile.am
---- systemd-187/Makefile.am	2012-07-20 00:40:16.000000000 +0200
-+++ systemd-187.patch/Makefile.am	2012-07-21 12:50:00.527354759 +0200
-@@ -1026,7 +1026,7 @@
- 	src/core/syscall-to-name.h
- 
- src/core/syscall-list.txt: Makefile
--	$(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
-+	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
- 
- src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
- 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
-@@ -2199,7 +2199,7 @@
- 
- src/udev/keymap/keys.txt: Makefile
- 	$(AM_V_at)mkdir -p src/udev/keymap
--	$(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-+	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
- 
- src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
- 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
-diff -Naur systemd-187/Makefile.in systemd-187.patch/Makefile.in
---- systemd-187/Makefile.in	2012-07-20 00:45:51.000000000 +0200
-+++ systemd-187.patch/Makefile.in	2012-07-21 12:50:26.916860425 +0200
-@@ -9527,7 +9527,7 @@
- 	$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
- 
- src/core/syscall-list.txt: Makefile
--	$(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
-+	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
- 
- src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
- 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
-@@ -9636,7 +9636,7 @@
- 
- @ENABLE_KEYMAP_TRUE@src/udev/keymap/keys.txt: Makefile
- @ENABLE_KEYMAP_TRUE@	$(AM_V_at)mkdir -p src/udev/keymap
--@ENABLE_KEYMAP_TRUE@	$(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-+@ENABLE_KEYMAP_TRUE@	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
- 
- @ENABLE_KEYMAP_TRUE@src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
- @ENABLE_KEYMAP_TRUE@	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@

packages/toolchain/devel/eglibc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="eglibc"
-PKG_VERSION="2.15-18222"
+PKG_VERSION="2.15-20165"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="4ec01c7"
+PKG_VERSION="cb9513f"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/x11/driver/xf86-input-evdev/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-input-evdev"
-PKG_VERSION="2.7.2"
+PKG_VERSION="2.7.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

projects/ATV/linux/linux.i386.conf

@@ -505,25 +505,25 @@ CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 
 #
 # x86 CPU frequency scaling drivers
 #
 # CONFIG_X86_PCC_CPUFREQ is not set
-CONFIG_X86_ACPI_CPUFREQ=y
+# CONFIG_X86_ACPI_CPUFREQ is not set
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_POWERNOW_K8 is not set
 # CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_SPEEDSTEP_ICH is not set
+CONFIG_X86_SPEEDSTEP_ICH=y
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
@@ -534,7 +534,8 @@ CONFIG_X86_ACPI_CPUFREQ=y
 #
 # shared options
 #
-# CONFIG_X86_SPEEDSTEP_LIB is not set
+CONFIG_X86_SPEEDSTEP_LIB=y
+# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y

projects/Intel/linux/linux.i386.conf

@@ -1150,7 +1150,7 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL2 is not set
 # CONFIG_ATL1 is not set
-# CONFIG_ATL1E is not set
+CONFIG_ATL1E=y
 CONFIG_ATL1C=y
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set

projects/Intel/linux/linux.x86_64.conf

@@ -1094,7 +1094,7 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL2 is not set
 # CONFIG_ATL1 is not set
-# CONFIG_ATL1E is not set
+CONFIG_ATL1E=y
 CONFIG_ATL1C=y
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set

projects/Virtual/options

@@ -254,7 +254,7 @@
 
 # Use Broadcom CrystalHD Decoder Card for video acceleration 
 # (needs Kernelsupport for Broadcom Decoder Card and a supported card)
-  CRYSTALHD="yes"
+  CRYSTALHD="no"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"