From 58f400fb35cc87a5405d570c0563192b87b50a91 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Wed, 13 Mar 2013 10:41:10 +0200 Subject: [PATCH 1/8] tvheadend: do not send debug message to syslog Apparently tvheadend by default uses the syslog service, and the `-s` option that we provide in the startup script in fact makes tvheadend send debug messages to syslog (which we obviously do not want by default as this causes for my single DVB card 1k/min to /var, which is 4MB/month). So this fix disables the `-s` option in the tvheadend startup script. closes #2053, closes #2055 --- .../service/multimedia/tvheadend/source/bin/tvheadend.start | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start index d39b22dc8f..3ddfa7d65c 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start @@ -94,7 +94,11 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then fi fi -TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +if [ "$DEBUG" = "yes" ]; then + ADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +else + ADEND_ARG="-C -u root -g video -c $ADDON_HOME" +fi mkdir -p /var/config if [ -f $ADDON_DIR/settings-default.xml ]; then From 90be8140a5dd0d7d2c426474125733ee04f5018e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 16:38:35 +0000 Subject: [PATCH 2/8] linux-tbs-drivers: update to linux-tbs-drivers-130127 --- packages/linux-drivers/linux-tbs-drivers/meta | 2 +- .../linux-tbs-drivers-121119-kernel-3.7.patch | 117 ------------------ .../linux-drivers/linux-tbs-drivers/unpack | 7 -- 3 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch diff --git a/packages/linux-drivers/linux-tbs-drivers/meta b/packages/linux-drivers/linux-tbs-drivers/meta index 0623b0bf3d..04f4056b9e 100644 --- a/packages/linux-drivers/linux-tbs-drivers/meta +++ b/packages/linux-drivers/linux-tbs-drivers/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux-tbs-drivers" -PKG_VERSION="121119" +PKG_VERSION="130127" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch b/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch deleted file mode 100644 index 93ce5d8c0c..0000000000 --- a/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -index 3146eec..c3a112e 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -@@ -1550,7 +1550,7 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma) - } - - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - - pos = cam->frame[i].bufmem; - while (size > 0) { /* size is page-aligned */ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/meye.c b/linux-tbs-drivers/linux/drivers/media/video/meye.c -index 2b7b1db..c80a3c5 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/meye.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/meye.c -@@ -1708,7 +1708,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma) - - vma->vm_ops = &meye_vm_ops; - vma->vm_flags &= ~VM_IO; /* not I/O memory */ -- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */ - vma->vm_private_data = (void *) (offset / gbufsize); - meye_vm_open(vma); - -diff --git a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -index b5ef362..b8119fe 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -@@ -896,7 +896,7 @@ static int omap_vout_mmap(struct file *file, struct vm_area_struct *vma) - - q->bufs[i]->baddr = vma->vm_start; - -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); - vma->vm_ops = &omap_vout_vm_ops; - vma->vm_private_data = (void *) vout; -diff --git a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -index 32aa3c2..49d7042 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -@@ -2130,7 +2130,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma) - } - - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - - pos = cam->frame[i].bufmem; - while (size > 0) { /* size is page-aligned */ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -index 5a74f5e..5791c67 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -@@ -1091,7 +1091,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma) - - /* VM_IO is eventually going to replace PageReserved altogether */ - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */ - - pos = usbvision->frame[i].data; - while (size > 0) { -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -index f163a3a..844adad 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -@@ -586,7 +586,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, - map->count = 1; - map->q = q; - vma->vm_ops = &videobuf_vm_ops; -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */ - vma->vm_private_data = map; - dprintk(1, "mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n", -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -index 9f5632c..21375fa 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -@@ -274,7 +274,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, - } - - vma->vm_ops = &videobuf_vm_ops; -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_private_data = map; - - dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n", -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -index f542538..f330bf0 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -@@ -176,7 +176,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, - return ret; - } - -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_private_data = priv; - vma->vm_ops = vm_ops; - -diff --git a/linux-tbs-drivers/linux/drivers/media/video/vino.c b/linux-tbs-drivers/linux/drivers/media/video/vino.c -index 52a0a37..7a40e12 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/vino.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/vino.c -@@ -3950,7 +3950,7 @@ found: - - fb->map_count = 1; - -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_flags &= ~VM_IO; - vma->vm_private_data = fb; - vma->vm_file = file; diff --git a/packages/linux-drivers/linux-tbs-drivers/unpack b/packages/linux-drivers/linux-tbs-drivers/unpack index 725aaf616f..e91a5bc4c5 100755 --- a/packages/linux-drivers/linux-tbs-drivers/unpack +++ b/packages/linux-drivers/linux-tbs-drivers/unpack @@ -33,10 +33,3 @@ tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${ # fix permissions chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/* -echo "### Applying upstream patches ###" - -for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do - cat $patch | patch -d \ - `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 -done - From 52e5e212260d7214448846edb4ab4a690e831bed Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 22:12:52 +0200 Subject: [PATCH 3/8] tools/mkpkg: add script to get and package 'boblightd' --- tools/mkpkg/mkpkg_boblightd | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 tools/mkpkg/mkpkg_boblightd diff --git a/tools/mkpkg/mkpkg_boblightd b/tools/mkpkg/mkpkg_boblightd new file mode 100755 index 0000000000..5961b288cc --- /dev/null +++ b/tools/mkpkg/mkpkg_boblightd @@ -0,0 +1,44 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@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 +################################################################################ + + +echo "getting sources..." + svn checkout http://boblight.googlecode.com/svn/trunk/ boblightd-latest + +echo "getting version..." + cd boblightd-latest + SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` + echo $SVN_REV + cd .. + +echo "copying sources..." + rm -rf boblightd-$SVN_REV + cp -R boblightd-latest boblightd-$SVN_REV + +#echo "cleaning sources..." + find boblightd-$SVN_REV -name ".svn" -exec rm -rf {} \; 2>/dev/null + +echo "packing sources..." + tar cvJf boblightd-$SVN_REV.tar.xz boblightd-$SVN_REV + +echo "remove temporary sourcedir..." + rm -rf boblightd-$SVN_REV From b62eb63f10b95b5099893dc93d34f608d623ebd6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 22:13:34 +0200 Subject: [PATCH 4/8] boblightd: update to boblightd-465 --- .../service/multimedia/boblightd/changelog.txt | 3 +++ packages/addons/service/multimedia/boblightd/meta | 4 ++-- .../patches/boblightd-2.0.5-automake-1.13.patch | 13 ------------- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt index ce49292a38..96b75f4a3e 100644 --- a/packages/addons/service/multimedia/boblightd/changelog.txt +++ b/packages/addons/service/multimedia/boblightd/changelog.txt @@ -1,3 +1,6 @@ +3.0.3 +- update to boblightd-465 + 3.0.2 - depends on libGLU diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index a3d1cffabf..ba30c23e8b 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="boblightd" -PKG_VERSION="449" -PKG_REV="2" +PKG_VERSION="465" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" diff --git a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch deleted file mode 100644 index 04c35d7645..0000000000 --- a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e2a6aaf..c20a3fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,7 +9,7 @@ AM_MAINTAINER_MODE - - AC_ISC_POSIX - AC_PROG_CXX --AM_PROG_CC_STDC -+AC_PROG_CC - AC_HEADER_STDC - - AM_PROG_LIBTOOL From ca8d8a03451c94a08e33baac7d2cdab4f0f2304e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 14 Mar 2013 10:58:05 +0200 Subject: [PATCH 5/8] boblightd: depends on libusb --- packages/addons/service/multimedia/boblightd/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index ba30c23e8b..00d3dec056 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="libusb" +PKG_BUILD_DEPENDS="toolchain libusb" PKG_PRIORITY="optional" PKG_SECTION="service/multimedia" PKG_SHORTDESC="boblightd: an ambilight controller." From afb99f9b76f287c22a37e846218816672cd284e3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 Mar 2013 12:01:45 +0400 Subject: [PATCH 6/8] nvidia: remove FlatPanelProperties this is no longer supported on 3xx series nvidia drivers --- packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf index 19958df7ef..cd1c69a439 100644 --- a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf +++ b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf @@ -5,7 +5,6 @@ Section "Device" Option "NoFlip" "false" Option "NoLogo" "true" Option "ConnectToAcpid" "0" - Option "FlatPanelProperties" "Scaling = Native" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" # To put Xorg in debug mode change "false" to "true" in the line below: @@ -31,4 +30,4 @@ EndSection Section "Extensions" Option "Composite" "false" -EndSection \ No newline at end of file +EndSection From 8170ae661f8e8558b6870a25bc4f660e4d025937 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 Mar 2013 12:02:42 +0400 Subject: [PATCH 7/8] nvidia-legacy: remove FlatPanelProperties this is no longer supported on 3xx series nvidia drivers --- .../driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf index 19958df7ef..cd1c69a439 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf +++ b/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf @@ -5,7 +5,6 @@ Section "Device" Option "NoFlip" "false" Option "NoLogo" "true" Option "ConnectToAcpid" "0" - Option "FlatPanelProperties" "Scaling = Native" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" # To put Xorg in debug mode change "false" to "true" in the line below: @@ -31,4 +30,4 @@ EndSection Section "Extensions" Option "Composite" "false" -EndSection \ No newline at end of file +EndSection From 5e21db74991c2fcbc2e7953a7269e0418eb73985 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 Mar 2013 12:04:09 +0400 Subject: [PATCH 8/8] nvidia-atv: remove FlatPanelProperties this is no longer supported on 3xx series nvidia drivers --- projects/ATV/filesystem/etc/X11/xorg-nvidia.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf index dc8c0d4fc0..83a8ba9e58 100644 --- a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf +++ b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf @@ -5,7 +5,6 @@ Section "Device" Option "NoFlip" "false" Option "NoLogo" "true" Option "ConnectToAcpid" "0" - Option "FlatPanelProperties" "Scaling = Native" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" Option "RegistryDwords" "RMDisableRenderToSysmem=1"