Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/multimedia/vdr/meta

@@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
 PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="fontconfig freetype libcap"
-PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat"
+PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/debug/htop/build

@@ -34,7 +34,6 @@ ac_cv_func_realloc_0_nonnull=yes \
             --localstatedir=/var \
             --enable-cgroup \
             --disable-vserver \
-            --disable-taskstats \
             --disable-unicode \
             --disable-native-affinity \
             --disable-hwloc \

packages/linux/patches/3.7.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch

@@ -0,0 +1,17 @@
+diff -Naur linux-3.7.9/drivers/media/usb/dvb-usb/pctv452e.c linux-3.7.9.patch/drivers/media/usb/dvb-usb/pctv452e.c
+--- linux-3.7.9/drivers/media/usb/dvb-usb/pctv452e.c    2013-01-11 18:19:28.000000000 +0100
++++ linux-3.7.9.patch/drivers/media/usb/dvb-usb/pctv452e.c      2013-01-16 10:35:01.131342123 +0100
+@@ -995,11 +995,11 @@
+			/* parameter for the MPEG2-data transfer */
+			.stream = {
+				.type = USB_ISOC,
+-				.count = 7,
++				.count = 4,
+				.endpoint = 0x02,
+				.u = {
+					.isoc = {
+-						.framesperurb = 4,
++						.framesperurb = 64,
+						.framesize = 940,
+						.interval = 1
+					}