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

2025-07-28 13:16:41 +00:00 · 2013-02-06 00:48:57 +01:00 · 2013-02-06 00:48:57 +01:00 · 9b07ad2960
commit 9b07ad2960
parent e9b9e137bb 13afe88c7e
9 changed files with 190 additions and 3 deletions
--- a/packages/addons/service/multimedia/tvheadend/build
+++ b/packages/addons/service/multimedia/tvheadend/build
@ -35,6 +35,7 @@ cd $PKG_BUILD
            --cpu=$TARGET_CPU \
            --cc=$TARGET_CC \
            --enable-timeshift \
+            --disable-libav \
            --enable-bundle

 make
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/meta
@ -26,8 +26,8 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 #PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="$ICONV avahi openssl"
-PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl"
+PKG_DEPENDS="$ICONV avahi openssl curl"
+PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
--- a/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch
+++ b/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch
@ -0,0 +1,11 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb-frontends%2Fds3000.c;h=c84cd98a91504dcf2995a75a1e8d6e5013cf4f2d;hp=5b639087ce45623f7a2f1be7e1b6216c1bc686a8;hb=feadd7d3eca4da531b35b2af3623dd992f2d988d;hpb=6c17c24d384ce69893e191c94b500c97bd263c27
+
+diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
+index 5b63908..c84cd98 100644
+--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
+@@ -1316,3 +1316,4 @@ MODULE_DESCRIPTION("DVB Frontend module for Montage Technology "
+ 			"DS3000/TS2020 hardware");
+ MODULE_AUTHOR("Konstantin Dimitrov");
+ MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(DS3000_DEFAULT_FIRMWARE);
--- a/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch
+++ b/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch
@ -0,0 +1,87 @@
+From b41a536cf9806c3478b2fa68d59edafd0787e8aa Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Cardona?= <remi.cardona@smartjog.com>
+Date: Fri, 28 Sep 2012 08:59:27 -0300
+Subject: [PATCH] [media] ds3000: remove useless 'locking'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Since b9bf2eafaad9c1ef02fb3db38c74568be601a43a, the function
+ds3000_firmware_ondemand() is called only once during init. This
+locking scheme may have been useful when the firmware was loaded at
+each tune.
+Furthermore, it looks like this 'lock' was put in to prevent concurrent
+access (and not recursion as the comments suggest). However, this open-
+coded mechanism is anything but race-free and should have used a proper
+mutex.
+
+Signed-off-by: RÃ©mi Cardona <remi.cardona@smartjog.com>
+Reviewed-by: Antti Palosaari <crope@iki.fi>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ drivers/media/dvb-frontends/ds3000.c |   14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
+index c84cd98..60a529e 100644
+--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
+@@ -30,7 +30,6 @@
+ #include "ds3000.h"
+ 
+ static int debug;
+-static int force_fw_upload;
+ 
+ #define dprintk(args...) \
+ 	do { \
+@@ -234,7 +233,6 @@ struct ds3000_state {
+ 	struct i2c_adapter *i2c;
+ 	const struct ds3000_config *config;
+ 	struct dvb_frontend frontend;
+-	u8 skip_fw_load;
+ 	/* previous uncorrected block counter for DVB-S2 */
+ 	u16 prevUCBS2;
+ };
+@@ -397,9 +395,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	if (state->skip_fw_load || !force_fw_upload)
+-		return 0;	/* Firmware already uploaded, skipping */
+-
+ 	/* Load firmware */
+ 	/* request the firmware, this will block until someone uploads it */
+ 	printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__,
+@@ -413,9 +408,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
+ 		return ret;
+ 	}
+ 
+-	/* Make sure we don't recurse back through here during loading */
+-	state->skip_fw_load = 1;
+-
+ 	ret = ds3000_load_firmware(fe, fw);
+ 	if (ret)
+ 		printk("%s: Writing firmware to device failed\n", __func__);
+@@ -425,9 +417,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
+ 	dprintk("%s: Firmware upload %s\n", __func__,
+ 			ret == 0 ? "complete" : "failed");
+ 
+-	/* Ensure firmware is always loaded if required */
+-	state->skip_fw_load = 0;
+-
+ 	return ret;
+ }
+ 
+@@ -1309,9 +1298,6 @@ static struct dvb_frontend_ops ds3000_ops = {
+ module_param(debug, int, 0644);
+ MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
+ 
+-module_param(force_fw_upload, int, 0644);
+-MODULE_PARM_DESC(force_fw_upload, "Force firmware upload (default:0)");
+-
+ MODULE_DESCRIPTION("DVB Frontend module for Montage Technology "
+ 			"DS3000/TS2020 hardware");
+ MODULE_AUTHOR("Konstantin Dimitrov");
+-- 
+1.7.6.5
+
--- a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7-fix.patch
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7-fix.patch
@ -0,0 +1,16 @@
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 8eff4d7..2bf3318 100755
+--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
+@@ -1716,11 +1716,8 @@ case "$6" in
+                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
+                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
+ 
+-                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+-                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
+                     SELECTED_MAKEFILE=Makefile.kbuild
+                     RET=0
+-                fi
+             fi
+         fi
+ 
--- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch
@ -0,0 +1,16 @@
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 8eff4d7..2bf3318 100755
+--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
+@@ -1716,11 +1716,8 @@ case "$6" in
+                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
+                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
+ 
+-                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+-                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
+                     SELECTED_MAKEFILE=Makefile.kbuild
+                     RET=0
+-                fi
+             fi
+         fi
+ 
--- a/packages/x11/other/intel-gpu-tools/install
+++ b/packages/x11/other/intel-gpu-tools/install
@ -24,3 +24,4 @@

 mkdir -p $INSTALL/usr/bin
  cp -R $PKG_BUILD/tools/intel_reg_write $INSTALL/usr/bin
+  cp -P $PKG_DIR/scripts/set-intel-color-space $INSTALL/usr/bin
--- a/packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space
+++ b/packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space
@ -0,0 +1,47 @@
+#!/bin/sh
+
+################################################################################
+#      Copyright (C) 2009-2010 OpenELEC.tv
+#      http://www.openelec.tv
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+# Enable Limited or RGB full on intel Computers
+# Usage:
+#  Set Limited mode:
+#   ./set-intel-color-space limited
+#  Set Full mode:
+#   ./set-intel-color-space full
+################################################################################
+
+if [ $# -gt 0 ] ; then
+  OUTPUT=`xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'`
+  if [ "$1" = "limited" ] ; then
+    # limited modes
+    intel_reg_write 0x70008 0xC0000000
+    intel_reg_write 0x70180 0xD8004400
+    xrandr --output $OUTPUT --set "Broadcast RGB" "Limited 16:235"
+  elif [ "$1" == "full" ] ; then
+    # reset old mode
+    xrandr --output $OUTPUT --set "Broadcast RGB" "Limited 16:235"
+    intel_reg_write 0x70008 0xC4002000
+    intel_reg_write 0x70180 0xDA004400
+    # set new mode
+    xrandr --output $OUTPUT --set "Broadcast RGB" "Full"
+  fi
+else
+  echo "Usage: $0 limited | full"
+fi
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@ -163,6 +163,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 #
 # GCOV-based kernel profiling
 #
+# CONFIG_GCOV_KERNEL is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@ -675,6 +676,7 @@ CONFIG_CFG80211=y
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
 # CONFIG_LIB80211 is not set
@ -687,6 +689,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_WIMAX is not set
@ -925,8 +928,10 @@ CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
@ -2131,6 +2136,7 @@ CONFIG_EXT4_USE_FOR_EXT23=y
 # CONFIG_EXT4_FS_XATTR is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
 CONFIG_REISERFS_FS=y
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
@ -2335,7 +2341,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_DEBUG_KERNEL=y
@ -2381,6 +2387,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
@ -2392,6 +2399,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_SAMPLES is not set