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

Browse Source
This commit is contained in:
Stephan Raue 2013-03-15 14:59:59 +01:00
commit 3b0f62e75a
11 changed files with 59 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/addons/service/multimedia/boblightd/changelog.txt
View File

@ -1,3 +1,6 @@
3.0.3
- update to boblightd-465
3.0.2
- depends on libGLU

8
packages/addons/service/multimedia/boblightd/meta
View File

@ -19,14 +19,14 @@
################################################################################
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"
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."

13
packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch
View File

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

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

3
packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf
View File

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

3
packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
View File

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

1
projects/ATV/filesystem/etc/X11/xorg-nvidia.conf
View File

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

44
tools/mkpkg/mkpkg_boblightd Executable file
View File

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