jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan Raue 2013-03-13 17:47:40 +01:00
commit 48ed73cee3
8 changed files with 28 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
View File

@ -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

2
packages/linux-drivers/linux-tbs-drivers/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="linux-tbs-drivers"
PKG_VERSION="121119"
PKG_VERSION="130127"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

117
packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch
View File

@ -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;

7
packages/linux-drivers/linux-tbs-drivers/unpack
View File

@ -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

14
packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch Normal file
View File

@ -0,0 +1,14 @@
diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.h xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h
--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.h 2013-03-11 18:01:45.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h 2013-03-12 13:42:28.698769168 +0100
@@ -32,8 +32,8 @@
virtual bool Reboot() { return false; }
virtual bool CanPowerdown() { return true; }
- virtual bool CanSuspend() { return true; }
- virtual bool CanHibernate() { return true; }
+ virtual bool CanSuspend() { return false; }
+ virtual bool CanHibernate() { return false; }
virtual bool CanReboot() { return true; }
virtual int BatteryLevel() { return 0; }

2
packages/network/connman/config/main.conf
View File

@ -4,4 +4,4 @@
# Background scanning will start every 5 minutes unless
# the scan list is empty. In that case, a simple backoff
# mechanism starting from 10s up to 5 minutes will run.
BackgroundScanning = true
BackgroundScanning = false

2
projects/ATV/options
View File

@ -223,7 +223,7 @@
UDISKS="yes"
# build and install powermanagement support (upower) (yes / no)
UPOWER="yes"
UPOWER="no"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"

6
projects/ATV/xbmc/advancedsettings.xml
View File

@ -20,4 +20,10 @@
<network>
<curlclienttimeout>30</curlclienttimeout>
</network>
<!-- audio workaround for ATV -->
<audiooutput>
<dtshdpassthrough>false</dtshdpassthrough>
<passthroughaac>false</passthroughaac>
<truehdpassthrough>false</truehdpassthrough>
</audiooutput>
</advancedsettings>