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

Browse Source
This commit is contained in:
Stephan Raue 2013-03-20 00:08:38 +01:00
commit 82eb3158ae
52 changed files with 1821 additions and 697 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/devel/libffi/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libffi"
PKG_VERSION="3.0.11"
PKG_VERSION="3.0.13"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

0
packages/devel/libffi/patches/libffi-3.0.11-includedir.patch → packages/devel/libffi/patches/libffi-includedir.patch
View File

2
packages/graphics/bcm2835-driver/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bcm2835-driver"
PKG_VERSION="98e5704"
PKG_VERSION="2bcb2bc"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="nonfree"

23
packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch Normal file
View File

@ -0,0 +1,23 @@
diff -Naur RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c
--- RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c 2012-07-30 14:51:05.000000000 +0200
+++ RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c 2013-03-19 16:51:48.251080509 +0100
@@ -3786,6 +3786,8 @@
pHalData->CustomerID = RT_CID_DLINK;
else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330a))
pHalData->CustomerID = RT_CID_DLINK;
+ else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330d))
+ pHalData->CustomerID = RT_CID_DLINK;
break;
case EEPROM_CID_WHQL:
/*
diff -Naur RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c
--- RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c 2012-07-30 14:51:05.000000000 +0200
+++ RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c 2013-03-19 16:52:54.174644642 +0100
@@ -137,6 +137,7 @@
{USB_DEVICE(0x2001, 0x3307)},//D-Link - Cameo
{USB_DEVICE(0x2001, 0x330A)},//D-Link - Alpha
{USB_DEVICE(0x2001, 0x3309)},//D-Link - Alpha
+ {USB_DEVICE(0x2001, 0x330D)},//D-Link - Alpha(?)
{USB_DEVICE(0x0586, 0x341F)},//Zyxel - Abocom
{USB_DEVICE(0x7392, 0x7822)},//Edimax - Edimax
{USB_DEVICE(0x2019, 0xAB2B)},//Planex - Abocom

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

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.0.6"
PKG_VERSION="12.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.6"
PKG_VERSION="12.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

8
packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
View File

@ -1,11 +1,11 @@
diff -Naur xbmc-10.1-Dharma/userdata/RssFeeds.xml xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml
--- xbmc-10.1-Dharma/userdata/RssFeeds.xml 2011-03-08 02:49:24.000000000 +0100
+++ xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml 2011-06-14 17:07:08.450880123 +0200
diff -Naur xbmc-12.0.7/userdata/RssFeeds.xml xbmc-12.0.7.patch/userdata/RssFeeds.xml
--- xbmc-12.0.7/userdata/RssFeeds.xml 2013-03-15 14:25:26.000000000 +0100
+++ xbmc-12.0.7.patch/userdata/RssFeeds.xml 2013-03-15 14:40:54.695338102 +0100
@@ -3,6 +3,7 @@
<!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. !-->
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
+ <feed updateinterval="30">http://openelec.tv/news?format=feed&type=rss</feed>
<feed updateinterval="30">http://feeds.feedburner.com/xbmc</feed>
<feed updateinterval="30">http://feeds.xbmc.org/xbmc</feed>
</set>
</rssfeeds>

6
packages/mediacenter/xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml
--- xbmc-10.1-Dharma/system/Lircmap.xml 2011-06-18 01:43:43.132101246 +0200
+++ xbmc-10.1-Dharma.patch/system/Lircmap.xml 2011-06-18 01:44:53.777025290 +0200
@@ -365,7 +365,6 @@
@@ -409,7 +409,6 @@
<remote device="linux-input-layer">
<altname>cx23885_remote</altname>
@ -9,7 +9,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir
<left>KEY_LEFT</left>
<right>KEY_RIGHT</right>
<up>KEY_UP</up>
@@ -452,4 +451,59 @@
@@ -510,4 +509,61 @@
<mypictures>yellow</mypictures>
<myvideo>blue</myvideo>
</remote>
@ -67,5 +67,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir
+ <green>KEY_GREEN</green>
+ <yellow>KEY_YELLOW</yellow>
+ <blue>KEY_BLUE</blue>
+ <recordedtv>KEY_PVR</recordedtv>
+ <liveradio>KEY_RADIO</liveradio>
+ </remote>
</lircmap>

26
packages/mediacenter/xbmc/patches/xbmc-990.06-assert0_is_nasty_this_could_just_be_a_bad_audio.patch Normal file
View File

@ -0,0 +1,26 @@
From 2c915ea56abd68cf2310eb9d01936d19a2f118ab Mon Sep 17 00:00:00 2001
From: davilla <davilla@4pi.com>
Date: Tue, 19 Mar 2013 13:41:53 -0400
Subject: [PATCH] changed, assert(0) is nasty, this could just be a bad audio
packet
---
xbmc/cores/dvdplayer/DVDPlayerAudio.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
index 03ba5ea..e075cd6 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
@@ -284,7 +284,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe, bool bDropPacket)
CLog::Log(LOGERROR, "CDVDPlayerAudio:DecodeFrame - Codec tried to consume more data than available. Potential memory corruption");
m_decode.Release();
m_pAudioCodec->Reset();
- assert(0);
+ return DECODE_FLAG_ERROR;
}
m_decode.data += len;
--
1.8.1.5

51
packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch
View File

@ -1,51 +0,0 @@
From 5385b26621a8d966f187f7b63dfaa8f336beb9a5 Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 12 Mar 2013 10:20:27 +0100
Subject: [PATCH] [cec] extra guards around m_queryThread
---
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index 4cdd3c4..6509c5d 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -99,8 +99,8 @@ class DllLibCEC : public DllDynamic, DllLibCECInterface
m_bStop = true;
}
- SAFE_DELETE(m_queryThread);
StopThread(true);
+ delete m_queryThread;
if (m_dll && m_cecAdapter)
{
@@ -389,7 +389,7 @@ void CPeripheralCecAdapter::Process(void)
Sleep(5);
}
- SAFE_DELETE(m_queryThread);
+ m_queryThread->StopThread(true);
bool bSendStandbyCommands(false);
{
@@ -1105,9 +1105,12 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting
}
else if (IsRunning())
{
- CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__);
- SetConfigurationFromSettings();
- m_queryThread->UpdateConfiguration(&m_configuration);
+ if (m_queryThread->IsRunning())
+ {
+ CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__);
+ SetConfigurationFromSettings();
+ m_queryThread->UpdateConfiguration(&m_configuration);
+ }
}
else
{
--
1.7.10

25
packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch
View File

@ -1,25 +0,0 @@
From 9526c4ce7da5c70d8ba79a5c21e9d95c918ebadb Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 12 Mar 2013 11:08:55 +0100
Subject: [PATCH] [cec] and let's init m_queryThread to NULL so we won't crash
on exit when CEC has been disabled
---
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index 6509c5d..61233bb 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -135,6 +135,7 @@ void CPeripheralCecAdapter::ResetMembers(void)
m_bActiveSourceBeforeStandby = false;
m_bOnPlayReceived = false;
m_bPlaybackPaused = false;
+ m_queryThread = NULL;
m_currentButton.iButton = 0;
m_currentButton.iDuration = 0;
--
1.7.10

22
packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch
View File

@ -1,22 +0,0 @@
From 1a5e251cc4382ad3e918af68072f2ba08e26574b Mon Sep 17 00:00:00 2001
From: ulion <ulion2002@gmail.com>
Date: Tue, 12 Mar 2013 06:40:54 +0800
Subject: [PATCH] Fix code generate problem with binary string.
---
xbmc/interfaces/python/typemaps/python.string.outtm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/interfaces/python/typemaps/python.string.outtm b/xbmc/interfaces/python/typemaps/python.string.outtm
index cdfba2e..c396166 100644
--- a/xbmc/interfaces/python/typemaps/python.string.outtm
+++ b/xbmc/interfaces/python/typemaps/python.string.outtm
@@ -22,4 +22,4 @@
%>
${result} = <%
if(method.@feature_python_coerceToUnicode) { %>PyUnicode_DecodeUTF8(${api}.c_str(),${api}.size(),"replace");<% }
- else { %>PyString_FromString(${api}.c_str());<% } %>
+ else { %>PyString_FromStringAndSize(${api}.c_str(), ${api}.length());<% } %>
--
1.7.10

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

@ -0,0 +1,94 @@
diff -Naur xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h
--- xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h 2013-03-13 22:25:29.220700789 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * http://www.xbmc.org
+ *
+ * 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 XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+#include "powermanagement/IPowerSyscall.h"
+#include "system.h"
+#if defined(TARGET_LINUX)
+
+class CFallbackPowerSyscall : public CPowerSyscallWithoutEvents
+{
+public:
+ virtual bool Powerdown() {return true; }
+ virtual bool Suspend() {return false; }
+ virtual bool Hibernate() {return false; }
+ virtual bool Reboot() {return true; }
+
+ virtual bool CanPowerdown() {return true; }
+ virtual bool CanSuspend() {return false; }
+ virtual bool CanHibernate() {return false; }
+ virtual bool CanReboot() {return true; }
+ virtual int BatteryLevel() {return 0; }
+};
+#endif
diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp
--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp 2013-03-11 18:01:45.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp 2013-03-14 00:20:43.263315592 +0100
@@ -41,14 +41,17 @@
#include "osx/CocoaPowerSyscall.h"
#elif defined(TARGET_ANDROID)
#include "android/AndroidPowerSyscall.h"
-#elif defined(_LINUX) && defined(HAS_DBUS)
+#elif defined(TARGET_LINUX)
+#include "linux/FallbackPowerSyscall.h"
+#if defined(HAS_DBUS)
#include "linux/ConsoleUPowerSyscall.h"
#include "linux/ConsoleDeviceKitPowerSyscall.h"
#include "linux/SystemdUPowerSyscall.h"
#include "linux/UPowerSyscall.h"
-#ifdef HAS_HAL
+#if defined(HAS_HAL)
#include "linux/HALPowerSyscall.h"
-#endif
+#endif // HAS_HAL
+#endif // HAS_DBUS
#elif defined(_WIN32)
#include "powermanagement/windows/Win32PowerSyscall.h"
extern HWND g_hWnd;
@@ -74,7 +77,8 @@
m_instance = new CCocoaPowerSyscall();
#elif defined(TARGET_ANDROID)
m_instance = new CAndroidPowerSyscall();
-#elif defined(_LINUX) && defined(HAS_DBUS)
+#elif defined(TARGET_LINUX)
+#if defined(HAS_DBUS)
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
m_instance = new CConsoleUPowerSyscall();
else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
@@ -83,10 +87,13 @@
m_instance = new CSystemdUPowerSyscall();
else if (CUPowerSyscall::HasUPower())
m_instance = new CUPowerSyscall();
-#ifdef HAS_HAL
- else
+#if defined(HAS_HAL)
+ else if(1)
m_instance = new CHALPowerSyscall();
-#endif
+#endif // HAS_HAL
+#endif // HAS_DBUS
+ else
+ m_instance = new CFallbackPowerSyscall();
#elif defined(_WIN32)
m_instance = new CWin32PowerSyscall();
#endif

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

@ -1,14 +0,0 @@
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/multimedia/libva-driver-intel/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libva-driver-intel"
PKG_VERSION="1.0.19"
PKG_VERSION="1.0.20"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"

12
packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-1.0.19-automake_1.13.patch
View File

@ -1,12 +0,0 @@
diff -Naur intel-driver-1.0.19-old/configure.ac intel-driver-1.0.19-new/configure.ac
--- intel-driver-1.0.19-old/configure.ac 2012-11-08 17:43:34.000000000 -0800
+++ intel-driver-1.0.19-new/configure.ac 2013-01-03 17:19:13.000000000 -0800
@@ -22,7 +22,7 @@
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([1.9 tar-ustar])
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
INTEL_DRIVER_MAJOR_VERSION=intel_driver_major_version
INTEL_DRIVER_MINOR_VERSION=intel_driver_minor_version

23
packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-enlarge_dmv_buffer_ivb-001.patch
View File

@ -1,23 +0,0 @@
diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 5b36c8d..2967347 100755
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -194,7 +194,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
if (gen7_avc_surface->dmv_top == NULL) {
gen7_avc_surface->dmv_top = dri_bo_alloc(i965->intel.bufmgr,
"direct mv w/r buffer",
- width_in_mbs * height_in_mbs * 64,
+ width_in_mbs * (height_in_mbs + 1) * 64,
0x1000);
assert(gen7_avc_surface->dmv_top);
}
@@ -203,7 +203,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
gen7_avc_surface->dmv_bottom == NULL) {
gen7_avc_surface->dmv_bottom = dri_bo_alloc(i965->intel.bufmgr,
"direct mv w/r buffer",
- width_in_mbs * height_in_mbs * 64,
+ width_in_mbs * (height_in_mbs + 1) * 64,
0x1000);
assert(gen7_avc_surface->dmv_bottom);
}

2
packages/multimedia/libva/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libva"
PKG_VERSION="1.1.0"
PKG_VERSION="1.1.1"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"

12
packages/multimedia/libva/patches/libva-1.1.0-automake_1.13.patch
View File

@ -1,12 +0,0 @@
diff -Naur libva-1.1.0-old/configure.ac libva-1.1.0-new/configure.ac
--- libva-1.1.0-old/configure.ac 2012-10-04 06:30:51.000000000 -0700
+++ libva-1.1.0-new/configure.ac 2012-12-30 15:06:37.000000000 -0800
@@ -86,7 +86,7 @@
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([dist-bzip2])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"

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 = false
BackgroundScanning = true

2
packages/network/samba/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="samba"
PKG_VERSION="3.6.11"
PKG_VERSION="3.6.13"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

5
packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
View File

@ -25,6 +25,11 @@ SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
### RPi GPIO IR Receiver
SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.rpi"
#-------------------------------------------------------------------------------
# Ask lircd_helper to handle USB devices that do not show up as lirc devices
# and are supported by lircd. Remote controls that are USB HID devices that show

283
packages/sysutils/remote/lirc/config/lircd.conf.rpi Normal file
View File

@ -0,0 +1,283 @@
# /etc/lirc/lircd.conf.rpi
#
# Lirc config for lirc_rpi (GPIO) receiver.
# Enables use of MCE Remote, Apple MacMini and XBOX remote.
# Should work with any generic receiver
#
########
#
# brand: HP/Philips/Microsoft/Other
# model no. of remote control: Media Center Edition remote
# devices being controlled by this remote: myriad of devices with Media Center Edition receivers
#
# RC-6 config file
#
# source: http://home.hccnet.nl/m.majoor/projects_remote_control.htm
# http://home.hccnet.nl/m.majoor/pronto.pdf
#
# used by: Philips
#
#########
#
# Philips Media Center Edition remote control
# For use with the USB MCE ir receiver
#
# Dan Conti dconti|acm.wwu.edu
#
# Updated with codes for MCE 2005 Remote additional buttons
# *, #, Teletext, Red, Green, Yellow & Blue Buttons
# Note: TV power button transmits no code until programmed.
# Updated 12th September 2005
# Graham Auld - mce|graham.auld.me.uk
#
# Radio, Print, RecTV are only available on the HP Media Center remote control
#
#
# Updated with codes for MCE 2007 Remote additional buttons
# Visualization, Aspect, SlideShow, Eject
# Note:
# Blue, Yellow, Green, Red, and Teletext buttons do not exist on some HP remote
begin remote
name mceusb
bits 16
flags RC6|CONST_LENGTH
eps 30
aeps 100
header 2667 889
one 444 444
zero 444 444
pre_data_bits 21
pre_data 0x37FF0
gap 105000
toggle_bit 22
rc6_mask 0x100000000
min_repeat 4
# uncomment to suppress unwanted repeats
suppress_repeat 4
begin codes
#seen on HP Pavilion dv3t remote --Tim Mann, 3 Nov 2009
KEY_VIDEO 0x00007b7f
KEY_PLAYPAUSE 0x00007b91
#unused by HP remote
KEY_BLUE 0x00007ba1
KEY_YELLOW 0x00007ba2
KEY_GREEN 0x00007ba3
KEY_RED 0x00007ba4
KEY_TEXT 0x00007ba5
#ba6 - bae unused
BA6 0x00007ba6
BA7 0x00007ba7
BA8 0x00007ba8
BA9 0x00007ba9
BAA 0x00007baa
BAB 0x00007bab
BAC 0x00007bac
BAD 0x00007bad
BAE 0x00007bae
KEY_RADIO 0x00007baf
Print 0x00007bb1
#bb2 - bb4 unused
BB2 0x00007bb2
BB3 0x00007bb3
BB4 0x00007bb4
KEY_VIDEO 0x00007bb5
KEY_CAMERA 0x00007bb6
KEY_PVR 0x00007bb7
KEY_AUDIO 0x00007bb8
KEY_TV 0x00007bb9
#bba - bbf unused
BBA 0x00007bba
BBB 0x00007bbb
BBC 0x00007bbc
BBD 0x00007bbd
BBE 0x00007bbe
BBF 0x00007bbf
#bc1 - bca unused
BC1 0x00007bc1
BC2 0x00007bc2
BC3 0x00007bc3
BC4 0x00007bc4
BC5 0x00007bc5
BC6 0x00007bc6
BC7 0x00007bc7
BC8 0x00007bc8
BC9 0x00007bc9
BCA 0x00007bca
KEY_EJECTCD 0x00007bcb
SlideShow 0x00007bcc
Visualization 0x00007bcd
#bce - bcf unused
BCE 0x00007bce
BCF 0x00007bcf
#bd1 - bd7 unused
BD1 0x00007bd1
BD2 0x00007bd2
BD3 0x00007bd3
BD4 0x00007bd4
BD5 0x00007bd5
BD6 0x00007bd6
BD7 0x00007bd7
KEY_ANGLE 0x00007bd8
KEY_EPG 0x00007bd9
KEY_TV 0x00007bda
KEY_DVD 0x00007bdb
#NoGap
KEY_BACK 0x00007bdc
KEY_OK 0x00007bdd
KEY_RIGHT 0x00007bde
KEY_LEFT 0x00007bdf
KEY_DOWN 0x00007be0
KEY_UP 0x00007be1
#NoGap
KEY_NUMERIC_STAR 0x00007be2
KEY_NUMERIC_POUND 0x00007be3
#NoGap
KEY_PREVIOUS 0x00007be4
KEY_NEXT 0x00007be5
KEY_STOP 0x00007be6
KEY_PAUSE 0x00007be7
KEY_RECORD 0x00007be8
KEY_PLAY 0x00007be9
KEY_REWIND 0x00007bea
KEY_FORWARD 0x00007beb
#NoGap
KEY_CHANNELDOWN 0x00007bec
KEY_CHANNELUP 0x00007bed
KEY_VOLUMEDOWN 0x00007bee
KEY_VOLUMEUP 0x00007bef
#NoGap
KEY_INFO 0x00007bf0
KEY_MUTE 0x00007bf1
KEY_HOME 0x00007bf2
KEY_POWER 0x00007bf3
#NoGap
KEY_ENTER 0x00007bf4
KEY_CLEAR 0x00007bf5
#NoGap
KEY_9 0x00007bf6
KEY_8 0x00007bf7
KEY_7 0x00007bf8
KEY_6 0x00007bf9
KEY_5 0x00007bfa
KEY_4 0x00007bfb
KEY_3 0x00007bfc
KEY_2 0x00007bfd
KEY_1 0x00007bfe
KEY_0 0x00007bff
end codes
end remote
# this config file was automatically generated
# using lirc-0.8.2(macmini) on Tue Dec 11 11:35:26 2007
#
# contributed by Sebastian Schaetzel
#
# brand: Apple
# model no. of remote control: A1156
# devices being controlled by this remote: Mac mini, MacBookPro 15"
# SantaRosa (3.1), MacBook2
#
begin remote
name Apple_A1156
bits 8
eps 30
aeps 100
one 0 0
zero 0 0
pre_data_bits 24
pre_data 0x87EE81
gap 211982
toggle_bit_mask 0x0
ignore_mask 0x0000ff01
begin codes
KEY_VOLUMEUP 0x0B
KEY_VOLUMEDOWN 0x0D
KEY_REWIND 0x08
KEY_FORWARD 0x07
KEY_PLAYPAUSE 0x04
KEY_MENU 0x02
end codes
end remote
# Please make this file available to others
# by sending it to <lirc@bartelmus.de>
#
# this config file was automatically generated
# using lirc-0.9.1-git(default) on Sat Jan 26 21:54:39 2013
#
# contributed by
#
# brand: Microsoft
# model: Xbox DVD Remote
# devices being controlled by this remote: xbox
begin remote
name XboxDVDDongle
bits 8
eps 30
aeps 100
one 0 0
zero 0 0
gap 63950
min_repeat 4
suppress_repeat 4
# uncomment to suppress unwanted repeats
# toggle_bit_mask 0x72
toggle_bit_mask 0xE1
begin codes
KEY_OK 0x0B
KEY_OK 0xEA
KEY_STOP 0xE0
KEY_PAUSE 0xE6
KEY_NEXT 0xDF
KEY_PREVIOUS 0xDD
KEY_FASTFORWARD 0xE3
KEY_REWIND 0xE2
KEY_PROG1 0xD5
KEY_EPG 0xE5
KEY_INFO 0xC3
KEY_UP 0xA6
KEY_DOWN 0xA7
KEY_LEFT 0xA9
KEY_RIGHT 0xA8
KEY_MENU 0xF7
KEY_EXIT 0xD8
KEY_0 0xCF
KEY_1 0xCE
KEY_2 0xCD
KEY_3 0xCC
KEY_4 0xCB
KEY_5 0xCA
KEY_6 0xC9
KEY_7 0xC8
KEY_8 0xC7
KEY_9 0xC6
end codes
end remote

1
packages/sysutils/remote/lirc/install
View File

@ -34,6 +34,7 @@ mkdir -p $INSTALL/usr/sbin
mkdir -p $INSTALL/etc/lirc
cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc
cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/ircat $INSTALL/usr/bin # do we need this?

2
packages/toolchain/math/mpfr/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="mpfr"
PKG_VERSION="3.1.1"
PKG_VERSION="3.1.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

3
packages/tools/atv-bootloader/build
View File

@ -24,10 +24,11 @@
cd $PKG_BUILD
rm -rf mach_kernel vmlinuz initrd.gz
cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz
make clean
make LDFLAGS="" \
make LDFLAGS="" KERN_OBJ=vmlinuz.obj \
CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \
LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld"

4
packages/tools/atv-bootloader/meta
View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="atv-bootloader"
PKG_VERSION="r518"
PKG_VERSION="r520"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://code.google.com/p/atv-bootloader/"
PKG_URL="http://travisghansen.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain darwin-cross linux"
PKG_PRIORITY="optional"

12
packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch
View File

@ -1,12 +0,0 @@
diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile
--- atv-bootloader-r518/Makefile 2010-03-09 20:17:22.000000000 +0100
+++ atv-bootloader-r518.patch/Makefile 2011-05-21 15:26:26.509551389 +0200
@@ -22,7 +22,7 @@
# start.o must be 1st in the link order (ld below)
OBJ = start.o vsprintf.o console.o utils.o elilo_code.o darwin_code.o linux_code.o boot_loader.o
-KERN_OBJ= vmlinuz.obj initrd.obj
+KERN_OBJ:= vmlinuz.obj initrd.obj
mach_kernel: $(KERN_OBJ) $(OBJ)
$(LD) $(LDFLAGS) -arch $(ARCH) -o mach_kernel $(OBJ) $(KERN_OBJ) \

29
packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch
View File

@ -1,29 +0,0 @@
diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile
--- atv-bootloader-r518/Makefile 2010-03-09 20:17:22.000000000 +0100
+++ atv-bootloader-r518.patch/Makefile 2011-05-21 14:04:05.592144598 +0200
@@ -11,12 +11,12 @@
# if Linxu, use the darwin-cross tools to compile/link
ifeq ($(OSTYPE),Linux)
- CC = /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0
- LD = /opt/darwin-cross/bin/i386-apple-darwin8-ld
+ CC := /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0
+ LD := /opt/darwin-cross/bin/i386-apple-darwin8-ld
else
- CC = /usr/bin/gcc-4.0
- LD = /usr/bin/ld
- LDFLAGS = -classic_linker
+ CC := /usr/bin/gcc-4.0
+ LD := /usr/bin/ld
+ LDFLAGS = -classic_linker
endif
# start.o must be 1st in the link order (ld below)
@@ -53,7 +53,4 @@
clean:
rm -f *.o $(KERN_OBJ) mach_kernel
-
-
#xxd mach_kernel | sed -e "s/ffff ffff 1000/0100 0000 1000/" | xxd -r - mach_kernel
-

0
packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch → packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch
View File

2
packages/tools/bcm2835-bootloader/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bcm2835-bootloader"
PKG_VERSION="98e5704"
PKG_VERSION="2bcb2bc"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="nonfree"

BIN
packages/tools/syslinux/files/create_installstick.exe
View File

Binary file not shown.

45
packages/x11/app/setxkbmap/init.d/72_keyboard Normal file
View File

@ -0,0 +1,45 @@
################################################################################
# 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
################################################################################
# setup keyboard layout
#
# runlevels: openelec
(
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf
progress "setup keyboard layout"
if [ -z $X11_KEYMAP ]; then
X11_KEYMAP="us"
fi
# waiting for Xorg to start
wait_for_xorg
# setup keymap
if [ -z $X11_KEYMAP2 ]; then
setxkbmap -display $DISPLAY $X11_KEYMAP;
else
setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
fi
fi
)&

3
packages/x11/driver/xf86-video-intel/build
View File

@ -22,6 +22,9 @@
. config/options $1
# TODO: xf86-video-intel-2.21.4 dont link with LTO enabled
strip_lto
xorg_drv_configure_prepend
cd $PKG_BUILD

2
packages/x11/driver/xf86-video-intel/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-intel"
PKG_VERSION="2.21.2"
PKG_VERSION="2.21.4"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"

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"

60
projects/ATV/linux/linux.i386.conf
View File

@ -32,8 +32,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_SUPPORTS_UPROBES=y
@ -46,6 +44,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION=""
@ -55,10 +54,10 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
CONFIG_KERNEL_XZ=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_DEFAULT_HOSTNAME="openelec"
CONFIG_SWAP=y
@ -76,7 +75,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
@ -106,12 +104,8 @@ CONFIG_BSD_PROCESS_ACCT=y
#
# RCU Subsystem
#
CONFIG_TREE_RCU=y
CONFIG_TINY_RCU=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_RCU_FANOUT=32
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=16
@ -133,7 +127,7 @@ CONFIG_RD_GZIP=y
# CONFIG_RD_LZO is not set
CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_EXPERT=y
@ -183,7 +177,6 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
@ -221,7 +214,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
@ -265,16 +257,14 @@ CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
CONFIG_INLINE_WRITE_UNLOCK=y
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_FREEZER is not set
#
# Processor type and features
#
CONFIG_ZONE_DMA=y
CONFIG_SMP=y
# CONFIG_SMP is not set
CONFIG_X86_MPPARSE=y
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_X86_32_IRIS is not set
@ -333,15 +323,15 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
CONFIG_NR_CPUS=2
# CONFIG_SCHED_SMT is not set
# CONFIG_SCHED_MC is not set
CONFIG_NR_CPUS=1
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
# CONFIG_X86_MCE_AMD is not set
@ -398,6 +388,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
@ -425,7 +416,6 @@ CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x1000000
# CONFIG_HOTPLUG_CPU is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init processor.max_cstate=2"
@ -530,11 +520,11 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
# CONFIG_PCI_STUB is not set
CONFIG_HT_IRQ=y
# CONFIG_HT_IRQ is not set
# CONFIG_PCI_IOV is not set
# CONFIG_PCI_PRI is not set
# CONFIG_PCI_PASID is not set
@ -729,9 +719,6 @@ CONFIG_LLC=y
CONFIG_DNS_RESOLVER=y
# CONFIG_BATMAN_ADV is not set
# CONFIG_OPENVSWITCH is not set
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_BQL=y
#
@ -2067,7 +2054,7 @@ CONFIG_AGP_INTEL=y
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_EFFICEON is not set
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=1
CONFIG_VGA_ARB_MAX_GPUS=2
# CONFIG_VGA_SWITCHEROO is not set
# CONFIG_DRM is not set
# CONFIG_STUB_POULSBO is not set
@ -2076,7 +2063,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
@ -2090,7 +2077,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
#
@ -2103,9 +2090,9 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_UVESA=m
# CONFIG_FB_VESA is not set
CONFIG_FB_EFI=y
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_N411 is not set
# CONFIG_FB_HGA is not set
# CONFIG_FB_S1D13XXX is not set
@ -2157,8 +2144,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@ -3020,13 +3006,10 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_FRAME_POINTER is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
# 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_DEBUG_PER_CPU_MAPS is not set
# CONFIG_LKDTM is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
@ -3053,6 +3036,7 @@ CONFIG_TRACING_SUPPORT=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_KMEMCHECK is not set
# CONFIG_TEST_KSTRTOX is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
@ -3114,7 +3098,6 @@ CONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_PCRYPT is not set
CONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_CRYPTO_CRYPTD is not set
# CONFIG_CRYPTO_AUTHENC is not set
@ -3248,7 +3231,6 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y

2
projects/ATV/options
View File

@ -87,7 +87,7 @@
# Bootloader to use (syslinux / u-boot / atv-bootloader)
# BOOTLOADER="atv-bootloader" disabled for now
BOOTLOADER=""
BOOTLOADER="atv-bootloader"
# Configuration for u-boot
UBOOT_CONFIG=""

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<advancedsettings>
<splash>false</splash>
<showexitbutton>false</showexitbutton>
<cputempcommand>gputemp</cputempcommand>
<gputempcommand>gputemp</gputempcommand>

1452
projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch → projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch
View File

File diff suppressed because it is too large Load Diff

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

2
tools/mkpkg/mkpkg_xbmc-frodo
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.6"
PKG_VERSION="12.1"
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
DEST_DIR="$PKG_NAME-frodo"

71
tools/nsis-installer/oeinstaller.nsi
View File

@ -15,7 +15,6 @@ VIAddVersionKey InternalName "OpenELEC USB Stick Creator"
BrandingText " "
Var "SLET"
Var "SNUM"
!include "MUI.nsh"
!include LogicLib.nsh
@ -59,20 +58,9 @@ Page Custom CustomCreate CustomLeave
Section "oeusbstart"
StrCpy $1 "$INSTDIR\"
Push $1
Call DISKNO
ExpandEnvStrings $0 %COMSPEC%
DetailPrint "- Creating Configuration Files ..."
FileOpen $4 "$TEMP\oedp.txt" w
FileWrite $4 "select disk $SNUM$\r$\n"
FileWrite $4 "clean$\r$\n"
FileWrite $4 "create partition primary$\r$\n"
FileWrite $4 "format FS=FAT32 LABEL=OPENELEC QUICK OVERRIDE$\r$\n"
FileWrite $4 "rescan$\r$\n"
FileWrite $4 "exit$\r$\n"
FileClose $4
DetailPrint "- Formatting USB Device ($SLET) ..."
nsExec::Exec '"%SystemRoot%\system32\diskpart.exe" /s "$TEMP\oedp.txt"'
nsExec::Exec `"$0" /c format $SLET /V:OPENELEC /Q /FS:FAT32 /X`
DetailPrint "- Mounting USB Device ..."
sleep 3000
DetailPrint "- Making Device Bootable ..."
@ -112,6 +100,12 @@ Function CustomCreate
StrCpy $R0 ''
${GetDrives} "FDD" GetDrivesCallBack
GetDlgItem $1 $HWNDPARENT 1
${If} $R0 == ""
EnableWindow $1 0
${Else}
EnableWindow $1 1
${EndIf}
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '25'
@ -142,57 +136,6 @@ Function GetDrivesCallBack
Push $0
FunctionEnd
Function DISKNO
Exch $1
Push $2
Push $3
Push $4
Push $5
Push $6
Push $7
System::Call "kernel32::GetVolumeNameForVolumeMountPoint(t r1, t r3r3, i ${MAXLEN_VOLUME_GUID}) i.r2"
${If} $2 != 0
StrCpy $3 $3 -1
System::Call "kernel32::CreateFile(t r3, \\
i ${GENERIC_READ}|${GENERIC_WRITE}, \\
i ${FILE_SHARE_READ}|${FILE_SHARE_WRITE}, \\
i 0, i ${OPEN_EXISTING}, i 0, i 0) i.r2"
${If} $2 != ${INVALID_HANDLE_VALUE}
System::Alloc ${EXTENTS_BUFFER_SIZE}
Pop $4
IntOp $5 0 + 0
System::Call "kernel32::DeviceIoControl(i r2, \\
i ${IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS}, \\
i 0, i 0, \\
i r4, i ${EXTENTS_BUFFER_SIZE}, \\
*i r5r5, i 0) i.r3"
${If} $3 != 0
System::Call "*$4(i .r5, i, i .r0)"
${If} $5 == 0
StrCpy $0 "Error: Invalid DISK_EXTENT data"
${EndIf}
${Else}
StrCpy $0 "Error: DeviceIoControl failed"
${EndIf}
System::Free $4
System::Call "kernel32::CloseHandle(i r2) i.r3"
${Else}
StrCpy $0 "Error: CreateFile failed for $3"
${EndIf}
${Else}
StrCpy $0 "Error: GetVolumeNameForVolumeMountPoint failed for $1"
${EndIf}
StrCpy $SNUM $0
Pop $7
Pop $6
Pop $5
Pop $4
Pop $3
Pop $2
Pop $1
FunctionEnd
!define MUI_FINISHPAGE_TITLE "OpenELEC USB Stick Successfully Created"
!define MUI_FINISHPAGE_TEXT "An OpenELEC USB Installer Stick has been created on the device $SLET\n\nPlease boot your HTPC off this USB stick and follow the on-screen instructions."