mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts: projects/ATV/linux/linux.i386.conf projects/Fusion/linux/linux.i386.conf projects/Fusion/linux/linux.x86_64.conf projects/Generic/linux/linux.i386.conf projects/Generic_OSS/linux/linux.i386.conf projects/ION/linux/linux.i386.conf projects/ION/linux/linux.x86_64.conf projects/Intel/linux/linux.i386.conf projects/Intel/linux/linux.x86_64.conf projects/Ultra/linux/linux.x86_64.conf projects/Virtual/linux/linux.i386.conf projects/Virtual/linux/linux.x86_64.conf
This commit is contained in:
commit
8870908650
2
packages/3rdparty/lib/libxslt/meta
vendored
2
packages/3rdparty/lib/libxslt/meta
vendored
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libxslt"
|
||||
PKG_VERSION="1.1.26"
|
||||
PKG_VERSION="1.1.27"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
|
43
packages/debug/iproute2/build
Executable file
43
packages/debug/iproute2/build
Executable file
@ -0,0 +1,43 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
$SED 's/$(CCOPTS)//' netem/Makefile
|
||||
|
||||
# remove any old configfile
|
||||
rm -rf ./Config
|
||||
|
||||
# Makefile is busted so it never passes IPT_LIB_DIR properly
|
||||
$SED "s/-DIPT/-DXT/" tc/Makefile
|
||||
echo "TC_CONFIG_XT:=y" >> ./Config
|
||||
|
||||
# arpd needs berkeleydb
|
||||
$SED "/^TARGETS=/s: arpd : :" misc/Makefile
|
||||
echo "IPT_LIB_DIR:=/usr/lib/xtables" >> ./Config
|
||||
|
||||
# use setns from our libc
|
||||
echo "IP_CONFIG_SETNS:=y" >> ./Config
|
||||
|
||||
make CC="$TARGET_CC" CCOPTS="$TARGET_CFLAGS -D_GNU_SOURCE"
|
51
packages/debug/iproute2/install
Executable file
51
packages/debug/iproute2/install
Executable file
@ -0,0 +1,51 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/etc/iproute2
|
||||
cp -P $PKG_BUILD/etc/iproute2/* $INSTALL/etc/iproute2
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/bridge/bridge $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/genl/genl $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/ip/ip $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/ip/rtmon $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/ip/routef $INSTALL/sbin
|
||||
chmod +x $INSTALL/sbin/routef
|
||||
cp -P $PKG_BUILD/ip/routel $INSTALL/sbin
|
||||
chmod +x $INSTALL/sbin/routel
|
||||
cp -P $PKG_BUILD/ip/rtpr $INSTALL/sbin
|
||||
chmod +x $INSTALL/sbin/rtpr
|
||||
cp -P $PKG_BUILD/misc/ifstat $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/misc/lnstat $INSTALL/sbin
|
||||
ln -sf lnstat $INSTALL/sbin/ctstat
|
||||
ln -sf lnstat $INSTALL/sbin/rtstat
|
||||
cp -P $PKG_BUILD/misc/nstat $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/misc/rtacct $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/misc/ss $INSTALL/sbin
|
||||
cp -P $PKG_BUILD/tc/tc $INSTALL/sbin
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/tc
|
||||
cp -P $PKG_BUILD/netem/*.dist $INSTALL/usr/lib/tc
|
||||
cp -P $PKG_BUILD/tc/m_xt.so $INSTALL/usr/lib/tc
|
||||
ln -sf m_xt.so $INSTALL/usr/lib/tc/m_ipt.so
|
36
packages/debug/iproute2/meta
Normal file
36
packages/debug/iproute2/meta
Normal file
@ -0,0 +1,36 @@
|
||||
################################################################################
|
||||
# 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
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="iproute2"
|
||||
PKG_VERSION="3.5.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
|
||||
PKG_URL="http://kernel.org/pub/linux/utils/net/iproute2/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="iptables"
|
||||
PKG_BUILD_DEPENDS="toolchain iptables"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="debug"
|
||||
PKG_SHORTDESC="iproute2:a collection of utilities for controlling TCP / IP networking and traffic control in Linux."
|
||||
PKG_LONGDESC="Iproute2 is a collection of utilities for controlling TCP / IP networking and traffic control in Linux."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="2997db1"
|
||||
PKG_VERSION="b87bc42"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -2196,7 +2196,7 @@ index 0000000..5593167
|
||||
+endmenu
|
||||
diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..164ecb2
|
||||
index 0000000..3ee8a4b
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-bcm2708/Makefile
|
||||
@@ -0,0 +1,8 @@
|
||||
@ -2204,7 +2204,7 @@ index 0000000..164ecb2
|
||||
+# Makefile for the linux kernel.
|
||||
+#
|
||||
+
|
||||
+obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o
|
||||
+obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o delay.o
|
||||
+obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o
|
||||
+obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
|
||||
+
|
||||
@ -2674,10 +2674,10 @@ index 0000000..0aa916e
|
||||
+#endif
|
||||
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
|
||||
new file mode 100644
|
||||
index 0000000..72dcf31
|
||||
index 0000000..ac118a4
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-bcm2708/bcm2708.c
|
||||
@@ -0,0 +1,867 @@
|
||||
@@ -0,0 +1,891 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
|
||||
+ *
|
||||
@ -3539,6 +3539,30 @@ index 0000000..72dcf31
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+/* The assembly versions in delay.S don't account for core freq changing in cpufreq driver */
|
||||
+/* Use 1MHz system timer for busy waiting */
|
||||
+void __udelay(unsigned long usecs)
|
||||
+{
|
||||
+ unsigned long start = readl(__io_address(ST_BASE + 0x04));
|
||||
+ unsigned long now;
|
||||
+ do {
|
||||
+ now = readl(__io_address(ST_BASE + 0x04));
|
||||
+ } while ((long)(now - start) <= usecs);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+void __const_udelay(unsigned long scaled_usecs)
|
||||
+{
|
||||
+ /* want /107374, this is about 3% bigger. We know usecs is less than 2000, so shouldn't overflow */
|
||||
+ const unsigned long usecs = scaled_usecs * 10 >> 20;
|
||||
+ unsigned long start = readl(__io_address(ST_BASE + 0x04));
|
||||
+ unsigned long now;
|
||||
+ do {
|
||||
+ now = readl(__io_address(ST_BASE + 0x04));
|
||||
+ } while ((long)(now - start) <= usecs);
|
||||
+}
|
||||
+
|
||||
+MACHINE_START(BCM2708, "BCM2708")
|
||||
+ /* Maintainer: Broadcom Europe Ltd. */
|
||||
+ .map_io = bcm2708_map_io,.init_irq = bcm2708_init_irq,.timer =
|
||||
@ -4044,6 +4068,32 @@ index 0000000..5f9d725
|
||||
+struct clk {
|
||||
+ unsigned long rate;
|
||||
+};
|
||||
diff --git a/arch/arm/mach-bcm2708/delay.S b/arch/arm/mach-bcm2708/delay.S
|
||||
new file mode 100644
|
||||
index 0000000..4256d29
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-bcm2708/delay.S
|
||||
@@ -0,0 +1,20 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/lib/delay.S
|
||||
+ *
|
||||
+ * Copyright (C) 1995, 1996 Russell King
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License version 2 as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ */
|
||||
+#include <linux/linkage.h>
|
||||
+#include <asm/assembler.h>
|
||||
+#include <asm/param.h>
|
||||
+
|
||||
+ .text
|
||||
+@ Delay routine
|
||||
+ENTRY(__delay)
|
||||
+ subs r0, r0, #1
|
||||
+ bhi __delay
|
||||
+ mov pc, lr
|
||||
+ENDPROC(__delay)
|
||||
diff --git a/arch/arm/mach-bcm2708/dma.c b/arch/arm/mach-bcm2708/dma.c
|
||||
new file mode 100644
|
||||
index 0000000..0b7a4f6
|
@ -54,6 +54,8 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD
|
||||
# dont install some debug stuff on release builds
|
||||
if [ ! "$DEVTOOLS" = yes ]; then
|
||||
sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config
|
||||
sed -i -e "s|^CONFIG_NET_SCHED=.*$|# CONFIG_NET_SCHED is not set|" $LINUX/.config
|
||||
sed -i -e "s|^CONFIG_NET_SCH_NETEM=.*$|# CONFIG_NET_SCH_NETEM is not set|" $LINUX/.config
|
||||
fi
|
||||
|
||||
# copy some extra firmware to linux tree
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-frodo-theme-Confluence"
|
||||
PKG_VERSION="a642b33"
|
||||
PKG_VERSION="942a938"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -4,6 +4,16 @@
|
||||
<showexitbutton>false</showexitbutton>
|
||||
<cputempcommand>cputemp</cputempcommand>
|
||||
<gputempcommand>gputemp</gputempcommand>
|
||||
<video>
|
||||
<latency>
|
||||
<delay>0</delay>
|
||||
<refresh>
|
||||
<min>20</min>
|
||||
<max>24</max>
|
||||
<delay>175</delay>
|
||||
</refresh>
|
||||
</latency>
|
||||
</video>
|
||||
<samba>
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-frodo"
|
||||
PKG_VERSION="a642b33"
|
||||
PKG_VERSION="942a938"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -1,477 +0,0 @@
|
||||
From 7d692ff576d0a713891908b5630ce2b8d0128f2e Mon Sep 17 00:00:00 2001
|
||||
From: davilla <davilla@4pi.com>
|
||||
Date: Sat, 22 Sep 2012 20:10:33 -0400
|
||||
Subject: [PATCH] add the ability to run a split gui/display resolution for
|
||||
embedded platforms
|
||||
|
||||
---
|
||||
xbmc/Application.cpp | 2 +-
|
||||
xbmc/GUIInfoManager.cpp | 12 +++----
|
||||
xbmc/guilib/GraphicContext.cpp | 2 ++
|
||||
xbmc/guilib/Resolution.h | 5 +++
|
||||
xbmc/settings/GUISettings.cpp | 6 ++--
|
||||
xbmc/settings/GUIWindowSettingsCategory.cpp | 10 +++---
|
||||
.../GUIWindowSettingsScreenCalibration.cpp | 8 ++---
|
||||
xbmc/video/windows/GUIWindowFullScreen.cpp | 8 ++---
|
||||
xbmc/windowing/WinSystem.cpp | 14 ++++++---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 2 ++
|
||||
xbmc/windowing/X11/WinSystemX11GLES.cpp | 2 ++
|
||||
xbmc/windowing/egl/WinEGLPlatformGeneric.cpp | 11 +++----
|
||||
xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp | 10 +++---
|
||||
xbmc/windowing/egl/WinSystemGLES.cpp | 33 +++++++++++++-------
|
||||
xbmc/windowing/egl/WinSystemGLES.h | 2 ++
|
||||
xbmc/windowing/windows/WinSystemWin32.cpp | 2 ++
|
||||
16 files changed, 80 insertions(+), 49 deletions(-)
|
||||
|
||||
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
|
||||
index 961e8f9..cd9fc9f 100644
|
||||
--- a/xbmc/Application.cpp
|
||||
+++ b/xbmc/Application.cpp
|
||||
@@ -890,7 +890,7 @@ bool CApplication::CreateGUI()
|
||||
return false;
|
||||
|
||||
int iResolution = g_graphicsContext.GetVideoResolution();
|
||||
- CLog::Log(LOGINFO, "GUI format %ix%i %s",
|
||||
+ CLog::Log(LOGINFO, "GUI format %ix%i, Display %s",
|
||||
g_settings.m_ResInfo[iResolution].iWidth,
|
||||
g_settings.m_ResInfo[iResolution].iHeight,
|
||||
g_settings.m_ResInfo[iResolution].strMode.c_str());
|
||||
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
|
||||
index fb6292d..c4ecd0a 100644
|
||||
--- a/xbmc/GUIInfoManager.cpp
|
||||
+++ b/xbmc/GUIInfoManager.cpp
|
||||
@@ -1493,14 +1493,14 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa
|
||||
case SYSTEM_SCREEN_RESOLUTION:
|
||||
if(g_Windowing.IsFullScreen())
|
||||
strLabel.Format("%ix%i@%.2fHz - %s (%02.2f fps)",
|
||||
- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth,
|
||||
- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight,
|
||||
+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenHeight,
|
||||
g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].fRefreshRate,
|
||||
g_localizeStrings.Get(244), GetFPS());
|
||||
else
|
||||
strLabel.Format("%ix%i - %s (%02.2f fps)",
|
||||
- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth,
|
||||
- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight,
|
||||
+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenHeight,
|
||||
g_localizeStrings.Get(242), GetFPS());
|
||||
return strLabel;
|
||||
break;
|
||||
@@ -1620,10 +1620,10 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa
|
||||
strLabel = g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].strMode;
|
||||
break;
|
||||
case SYSTEM_SCREEN_WIDTH:
|
||||
- strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iWidth);
|
||||
+ strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iScreenWidth);
|
||||
break;
|
||||
case SYSTEM_SCREEN_HEIGHT:
|
||||
- strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iHeight);
|
||||
+ strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iScreenHeight);
|
||||
break;
|
||||
case SYSTEM_CURRENT_WINDOW:
|
||||
return g_localizeStrings.Get(g_windowManager.GetFocusedWindow());
|
||||
diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp
|
||||
index 31bfdbf..94f248b 100644
|
||||
--- a/xbmc/guilib/GraphicContext.cpp
|
||||
+++ b/xbmc/guilib/GraphicContext.cpp
|
||||
@@ -580,6 +580,8 @@ void CGraphicContext::ResetScreenParameters(RESOLUTION res)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
+ g_settings.m_ResInfo[res].iScreenWidth = g_settings.m_ResInfo[res].iWidth;
|
||||
+ g_settings.m_ResInfo[res].iScreenHeight = g_settings.m_ResInfo[res].iHeight;
|
||||
ResetOverscan(res, g_settings.m_ResInfo[res].Overscan);
|
||||
}
|
||||
|
||||
diff --git a/xbmc/guilib/Resolution.h b/xbmc/guilib/Resolution.h
|
||||
index ede938d..20864e2 100644
|
||||
--- a/xbmc/guilib/Resolution.h
|
||||
+++ b/xbmc/guilib/Resolution.h
|
||||
@@ -88,6 +88,8 @@ struct RESOLUTION_INFO
|
||||
int iScreen;
|
||||
int iWidth;
|
||||
int iHeight;
|
||||
+ int iScreenWidth;
|
||||
+ int iScreenHeight;
|
||||
int iSubtitles;
|
||||
uint32_t dwFlags;
|
||||
float fPixelRatio;
|
||||
@@ -100,6 +102,8 @@ struct RESOLUTION_INFO
|
||||
{
|
||||
iWidth = width;
|
||||
iHeight = height;
|
||||
+ iScreenWidth = width;
|
||||
+ iScreenHeight = height;
|
||||
fPixelRatio = aspect ? ((float)width)/height / aspect : 1.0f;
|
||||
strMode = mode;
|
||||
bFullScreen = true;
|
||||
@@ -114,6 +118,7 @@ struct RESOLUTION_INFO
|
||||
{
|
||||
Overscan = res.Overscan; bFullScreen = res.bFullScreen;
|
||||
iScreen = res.iScreen; iWidth = res.iWidth; iHeight = res.iHeight;
|
||||
+ iScreenWidth = res.iScreenWidth; iScreenHeight = res.iScreenHeight;
|
||||
iSubtitles = res.iSubtitles; dwFlags = res.dwFlags;
|
||||
fPixelRatio = res.fPixelRatio; fRefreshRate = res.fRefreshRate;
|
||||
strMode = res.strMode; strOutput = res.strOutput; strId = res.strId;
|
||||
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
|
||||
index da2a78b..ec24ad5 100644
|
||||
--- a/xbmc/settings/GUISettings.cpp
|
||||
+++ b/xbmc/settings/GUISettings.cpp
|
||||
@@ -1526,8 +1526,8 @@ RESOLUTION CGUISettings::GetResFromString(const CStdString &res)
|
||||
const RESOLUTION_INFO &info = g_settings.m_ResInfo[i];
|
||||
if (info.iScreen != screen)
|
||||
continue;
|
||||
- float score = 10 * (square_error((float)info.iWidth, (float)width) +
|
||||
- square_error((float)info.iHeight, (float)height) +
|
||||
+ float score = 10 * (square_error((float)info.iScreenWidth, (float)width) +
|
||||
+ square_error((float)info.iScreenHeight, (float)height) +
|
||||
square_error(info.fRefreshRate, refresh) +
|
||||
square_error((float)((info.dwFlags & D3DPRESENTFLAG_INTERLACED) ? 100:200), interlaced));
|
||||
if (score < bestScore)
|
||||
@@ -1552,7 +1552,7 @@ void CGUISettings::SetResolution(RESOLUTION res)
|
||||
{
|
||||
const RESOLUTION_INFO &info = g_settings.m_ResInfo[res];
|
||||
mode.Format("%1i%05i%05i%09.5f%s", info.iScreen,
|
||||
- info.iWidth, info.iHeight, info.fRefreshRate,
|
||||
+ info.iScreenWidth, info.iScreenHeight, info.fRefreshRate,
|
||||
(info.dwFlags & D3DPRESENTFLAG_INTERLACED) ? "i":"p");
|
||||
}
|
||||
else
|
||||
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
|
||||
index b436b98..ce517bb 100644
|
||||
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
|
||||
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
|
||||
@@ -2392,8 +2392,8 @@ void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, Displa
|
||||
RESOLUTION_INFO res1 = g_settings.m_ResInfo[res];
|
||||
RESOLUTION_INFO res2 = g_settings.m_ResInfo[resolutions[idx].ResInfo_Index];
|
||||
if ( res1.iScreen == res2.iScreen
|
||||
- && res1.iWidth == res2.iWidth
|
||||
- && res1.iHeight == res2.iHeight
|
||||
+ && res1.iScreenWidth == res2.iScreenWidth
|
||||
+ && res1.iScreenHeight == res2.iScreenHeight
|
||||
&& (res1.dwFlags & D3DPRESENTFLAG_INTERLACED) == (res2.dwFlags & D3DPRESENTFLAG_INTERLACED))
|
||||
spinres = (RESOLUTION) resolutions[idx].ResInfo_Index;
|
||||
}
|
||||
@@ -2430,13 +2430,13 @@ void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, Displa
|
||||
|
||||
void CGUIWindowSettingsCategory::FillInRefreshRates(CStdString strSetting, RESOLUTION res, bool UserChange)
|
||||
{
|
||||
- // The only meaningful parts of res here are iScreen, iWidth, iHeight
|
||||
+ // The only meaningful parts of res here are iScreen, iScreenWidth, iScreenHeight
|
||||
|
||||
vector<REFRESHRATE> refreshrates;
|
||||
if (res > RES_WINDOW)
|
||||
refreshrates = g_Windowing.RefreshRates(g_settings.m_ResInfo[res].iScreen,
|
||||
- g_settings.m_ResInfo[res].iWidth,
|
||||
- g_settings.m_ResInfo[res].iHeight,
|
||||
+ g_settings.m_ResInfo[res].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[res].iScreenHeight,
|
||||
g_settings.m_ResInfo[res].dwFlags);
|
||||
|
||||
// The control setting doesn't exist when not in standalone mode, don't manipulate it
|
||||
diff --git a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp b/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
|
||||
index b2430bc..3e6ba83 100644
|
||||
--- a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
|
||||
+++ b/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
|
||||
@@ -352,12 +352,12 @@ void CGUIWindowSettingsScreenCalibration::UpdateFromControl(int iControl)
|
||||
// set the label control correctly
|
||||
CStdString strText;
|
||||
if (g_Windowing.IsFullScreen())
|
||||
- strText.Format("%ix%i@%.2f - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iWidth,
|
||||
- g_settings.m_ResInfo[m_Res[m_iCurRes]].iHeight, g_settings.m_ResInfo[m_Res[m_iCurRes]].fRefreshRate,
|
||||
+ strText.Format("%ix%i@%.2f - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenHeight, g_settings.m_ResInfo[m_Res[m_iCurRes]].fRefreshRate,
|
||||
g_localizeStrings.Get(244).c_str(), strStatus.c_str());
|
||||
else
|
||||
- strText.Format("%ix%i - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iWidth,
|
||||
- g_settings.m_ResInfo[m_Res[m_iCurRes]].iHeight,
|
||||
+ strText.Format("%ix%i - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenHeight,
|
||||
g_localizeStrings.Get(242).c_str(), strStatus.c_str());
|
||||
|
||||
SET_CONTROL_LABEL(CONTROL_LABEL_ROW1, strText);
|
||||
diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp
|
||||
index 22a5c35..1bba604 100644
|
||||
--- a/xbmc/video/windows/GUIWindowFullScreen.cpp
|
||||
+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp
|
||||
@@ -1008,13 +1008,13 @@ void CGUIWindowFullScreen::FrameMove()
|
||||
CStdString strStatus;
|
||||
if (g_Windowing.IsFullScreen())
|
||||
strStatus.Format("%s %ix%i@%.2fHz - %s",
|
||||
- g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iWidth,
|
||||
- g_settings.m_ResInfo[iResolution].iHeight, g_settings.m_ResInfo[iResolution].fRefreshRate,
|
||||
+ g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[iResolution].iScreenHeight, g_settings.m_ResInfo[iResolution].fRefreshRate,
|
||||
g_localizeStrings.Get(244));
|
||||
else
|
||||
strStatus.Format("%s %ix%i - %s",
|
||||
- g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iWidth,
|
||||
- g_settings.m_ResInfo[iResolution].iHeight, g_localizeStrings.Get(242));
|
||||
+ g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iScreenWidth,
|
||||
+ g_settings.m_ResInfo[iResolution].iScreenHeight, g_localizeStrings.Get(242));
|
||||
|
||||
CGUIMessage msg(GUI_MSG_LABEL_SET, GetID(), LABEL_ROW3);
|
||||
msg.SetLabel(strStatus);
|
||||
diff --git a/xbmc/windowing/WinSystem.cpp b/xbmc/windowing/WinSystem.cpp
|
||||
index 9882161..6a17586 100644
|
||||
--- a/xbmc/windowing/WinSystem.cpp
|
||||
+++ b/xbmc/windowing/WinSystem.cpp
|
||||
@@ -63,6 +63,8 @@ void CWinSystemBase::UpdateDesktopResolution(RESOLUTION_INFO& newRes, int screen
|
||||
newRes.fPixelRatio = 1.0f;
|
||||
newRes.iWidth = width;
|
||||
newRes.iHeight = height;
|
||||
+ newRes.iScreenWidth = width;
|
||||
+ newRes.iScreenHeight = height;
|
||||
newRes.strMode.Format("%dx%d", width, height);
|
||||
if (refreshRate > 1)
|
||||
newRes.strMode.Format("%s @ %.2f%s - Full Screen", newRes.strMode, refreshRate, dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "");
|
||||
@@ -79,6 +81,8 @@ void CWinSystemBase::UpdateResolutions()
|
||||
window.iWidth = 720;
|
||||
if (window.iHeight == 0)
|
||||
window.iHeight = 480;
|
||||
+ window.iScreenWidth = window.iWidth;
|
||||
+ window.iScreenHeight = window.iHeight;
|
||||
if (window.iSubtitles == 0)
|
||||
window.iSubtitles = (int)(0.965 * window.iHeight);
|
||||
window.fPixelRatio = 1.0f;
|
||||
@@ -90,6 +94,8 @@ void CWinSystemBase::SetWindowResolution(int width, int height)
|
||||
RESOLUTION_INFO& window = g_settings.m_ResInfo[RES_WINDOW];
|
||||
window.iWidth = width;
|
||||
window.iHeight = height;
|
||||
+ window.iScreenWidth = width;
|
||||
+ window.iScreenHeight = height;
|
||||
window.iSubtitles = (int)(0.965 * window.iHeight);
|
||||
g_graphicsContext.ResetOverscan(window);
|
||||
}
|
||||
@@ -105,8 +111,8 @@ int CWinSystemBase::DesktopResolution(int screen)
|
||||
|
||||
static void AddResolution(vector<RESOLUTION_WHR> &resolutions, unsigned int addindex)
|
||||
{
|
||||
- int width = g_settings.m_ResInfo[addindex].iWidth;
|
||||
- int height = g_settings.m_ResInfo[addindex].iHeight;
|
||||
+ int width = g_settings.m_ResInfo[addindex].iScreenWidth;
|
||||
+ int height = g_settings.m_ResInfo[addindex].iScreenHeight;
|
||||
int interlaced = g_settings.m_ResInfo[addindex].dwFlags & D3DPRESENTFLAG_INTERLACED;
|
||||
|
||||
for (unsigned int idx = 0; idx < resolutions.size(); idx++)
|
||||
@@ -163,8 +169,8 @@ static bool rrSortPredicate(REFRESHRATE i, REFRESHRATE j)
|
||||
|
||||
for (unsigned int idx = RES_DESKTOP; idx < g_settings.m_ResInfo.size(); idx++)
|
||||
if ( g_settings.m_ResInfo[idx].iScreen == screen
|
||||
- && g_settings.m_ResInfo[idx].iWidth == width
|
||||
- && g_settings.m_ResInfo[idx].iHeight == height
|
||||
+ && g_settings.m_ResInfo[idx].iScreenWidth == width
|
||||
+ && g_settings.m_ResInfo[idx].iScreenHeight == height
|
||||
&& (g_settings.m_ResInfo[idx].dwFlags & D3DPRESENTFLAG_INTERLACED) == (dwFlags & D3DPRESENTFLAG_INTERLACED))
|
||||
AddRefreshRate(refreshrates, idx);
|
||||
|
||||
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
|
||||
index 889c445..a839709 100644
|
||||
--- a/xbmc/windowing/X11/WinSystemX11.cpp
|
||||
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
|
||||
@@ -269,6 +269,8 @@ void CWinSystemX11::UpdateResolutions()
|
||||
RESOLUTION_INFO res;
|
||||
res.iWidth = mode.w;
|
||||
res.iHeight = mode.h;
|
||||
+ res.iScreenWidth = mode.w;
|
||||
+ res.iScreenHeight = mode.h;
|
||||
if (mode.h>0 && mode.w>0 && out.hmm>0 && out.wmm>0)
|
||||
res.fPixelRatio = ((float)out.wmm/(float)mode.w) / (((float)out.hmm/(float)mode.h));
|
||||
else
|
||||
diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp
|
||||
index 2b67e37..50185f9 100644
|
||||
--- a/xbmc/windowing/X11/WinSystemX11GLES.cpp
|
||||
+++ b/xbmc/windowing/X11/WinSystemX11GLES.cpp
|
||||
@@ -292,6 +292,8 @@ void CWinSystemX11GLES::UpdateResolutions()
|
||||
RESOLUTION_INFO res;
|
||||
res.iWidth = mode.w;
|
||||
res.iHeight = mode.h;
|
||||
+ res.iScreenWidth = mode.w;
|
||||
+ res.iScreenHeight = mode.h;
|
||||
if (mode.h>0 && mode.w>0 && out.hmm>0 && out.wmm>0)
|
||||
res.fPixelRatio = ((float)out.wmm/(float)mode.w) / (((float)out.hmm/(float)mode.h));
|
||||
else
|
||||
diff --git a/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp b/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp
|
||||
index 9febe15..b6dec7e 100644
|
||||
--- a/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp
|
||||
+++ b/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp
|
||||
@@ -43,8 +43,8 @@
|
||||
m_desktopRes.iScreen = 0;
|
||||
m_desktopRes.iWidth = 1280;
|
||||
m_desktopRes.iHeight = 720;
|
||||
- //m_desktopRes.iScreenWidth = 1280;
|
||||
- //m_desktopRes.iScreenHeight = 720;
|
||||
+ m_desktopRes.iScreenWidth = 1280;
|
||||
+ m_desktopRes.iScreenHeight = 720;
|
||||
m_desktopRes.fRefreshRate = 60.0f;
|
||||
m_desktopRes.bFullScreen = true;
|
||||
m_desktopRes.iSubtitles = (int)(0.965 * 720);
|
||||
@@ -101,12 +101,9 @@ bool CWinEGLPlatformGeneric::ProbeDisplayResolutions(std::vector<RESOLUTION_INFO
|
||||
res.fPixelRatio = 1.0f;
|
||||
res.iWidth = gui_width;
|
||||
res.iHeight = gui_height;
|
||||
- //res.iScreenWidth = gui_width;
|
||||
- //res.iScreenHeight = gui_height;
|
||||
+ res.iScreenWidth = gui_width;
|
||||
+ res.iScreenHeight = gui_height;
|
||||
res.dwFlags = D3DPRESENTFLAG_PROGRESSIVE | D3DPRESENTFLAG_WIDESCREEN;
|
||||
- // temp until split gui/display res comes in
|
||||
- //res.iScreenWidth = width;
|
||||
- //res.iScreenHeight = height;
|
||||
res.strMode.Format("%dx%d @ %.2f - Full Screen", gui_width, gui_height, gui_refresh);
|
||||
|
||||
resolutions.push_back(res);
|
||||
diff --git a/xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp b/xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp
|
||||
index 48e53cc..c77d63c 100644
|
||||
--- a/xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp
|
||||
+++ b/xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp
|
||||
@@ -69,6 +69,8 @@
|
||||
m_desktopRes.iScreen = 0;
|
||||
m_desktopRes.iWidth = 1280;
|
||||
m_desktopRes.iHeight = 720;
|
||||
+ m_desktopRes.iScreenWidth = 1280;
|
||||
+ m_desktopRes.iScreenHeight= 720;
|
||||
m_desktopRes.fRefreshRate = 60.0f;
|
||||
m_desktopRes.bFullScreen = true;
|
||||
m_desktopRes.iSubtitles = (int)(0.965 * 720);
|
||||
@@ -271,8 +273,8 @@ bool CWinEGLPlatformRaspberryPI::ProbeDisplayResolutions(std::vector<RESOLUTION_
|
||||
res.fPixelRatio = 1.0f;
|
||||
res.iWidth = tv.width;
|
||||
res.iHeight = tv.height;
|
||||
- //res.iScreenWidth = tv.width;
|
||||
- //res.iScreenHeight = tv.height;
|
||||
+ res.iScreenWidth = tv.width;
|
||||
+ res.iScreenHeight = tv.height;
|
||||
res.strMode.Format("%dx%d", tv.width, tv.height);
|
||||
if((float)tv.frame_rate > 1)
|
||||
{
|
||||
@@ -687,8 +689,8 @@ void CWinEGLPlatformRaspberryPI::GetSupportedModes(HDMI_RES_GROUP_T group, std::
|
||||
res.fPixelRatio = 1.0f;
|
||||
res.iWidth = width;
|
||||
res.iHeight = tv->height;
|
||||
- //res.iScreenWidth = width;
|
||||
- //res.iScreenHeight = tv->height;
|
||||
+ res.iScreenWidth = width;
|
||||
+ res.iScreenHeight = tv->height;
|
||||
res.strMode.Format("%dx%d", width, tv->height);
|
||||
if((float)tv->frame_rate > 1)
|
||||
{
|
||||
diff --git a/xbmc/windowing/egl/WinSystemGLES.cpp b/xbmc/windowing/egl/WinSystemGLES.cpp
|
||||
index d4f1f04..eb78f74 100644
|
||||
--- a/xbmc/windowing/egl/WinSystemGLES.cpp
|
||||
+++ b/xbmc/windowing/egl/WinSystemGLES.cpp
|
||||
@@ -78,7 +78,11 @@ bool CWinSystemGLES::DestroyWindowSystem()
|
||||
|
||||
bool CWinSystemGLES::CreateNewWindow(const CStdString& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction)
|
||||
{
|
||||
- if (m_bWindowCreated && m_nWidth == res.iWidth && m_nHeight == res.iHeight && m_fRefreshRate == res.fRefreshRate && m_bFullScreen == fullScreen)
|
||||
+ if (m_bWindowCreated &&
|
||||
+ m_nWidth == res.iWidth && m_nHeight == res.iHeight &&
|
||||
+ m_nScreenWidth == res.iScreenWidth && m_nScreenHeight == res.iScreenHeight &&
|
||||
+ m_bFullScreen == fullScreen &&
|
||||
+ m_fRefreshRate == res.fRefreshRate)
|
||||
{
|
||||
CLog::Log(LOGDEBUG, "CWinSystemGLES::CreateNewWindow: No need to create a new window");
|
||||
return true;
|
||||
@@ -86,8 +90,10 @@ bool CWinSystemGLES::CreateNewWindow(const CStdString& name, bool fullScreen, RE
|
||||
|
||||
m_nWidth = res.iWidth;
|
||||
m_nHeight = res.iHeight;
|
||||
- m_bFullScreen = fullScreen;
|
||||
- m_fRefreshRate = res.fRefreshRate;
|
||||
+ m_nScreenWidth = res.iScreenWidth;
|
||||
+ m_nScreenHeight = res.iScreenHeight;
|
||||
+ m_bFullScreen = fullScreen;
|
||||
+ m_fRefreshRate = res.fRefreshRate;
|
||||
|
||||
// Destroy any existing window
|
||||
if (m_bWindowCreated)
|
||||
@@ -138,7 +144,6 @@ void CWinSystemGLES::UpdateResolutions()
|
||||
{
|
||||
CWinSystemBase::UpdateResolutions();
|
||||
|
||||
- //std::vector<CStdString> resolutions;
|
||||
std::vector<RESOLUTION_INFO> resolutions;
|
||||
|
||||
m_eglplatform->ProbeDisplayResolutions(resolutions);
|
||||
@@ -148,9 +153,6 @@ void CWinSystemGLES::UpdateResolutions()
|
||||
RESOLUTION ResDesktop = RES_INVALID;
|
||||
RESOLUTION res_index = RES_DESKTOP;
|
||||
|
||||
- // Clear old resolutions
|
||||
- //g_settings.m_ResInfo.clear();
|
||||
-
|
||||
for (size_t i = 0; i < resolutions.size(); i++)
|
||||
{
|
||||
int gui_width = resolutions[i].iWidth;
|
||||
@@ -173,17 +175,23 @@ void CWinSystemGLES::UpdateResolutions()
|
||||
g_graphicsContext.ResetOverscan(resolutions[i]);
|
||||
g_settings.m_ResInfo[res_index] = resolutions[i];
|
||||
|
||||
- CLog::Log(LOGNOTICE, "Found resolution for display %d with %d x %d @ %f Hz\n",
|
||||
+ CLog::Log(LOGNOTICE, "Found resolution %d x %d for display %d with %d x %d%s @ %f Hz\n",
|
||||
resolutions[i].iScreen,
|
||||
resolutions[i].iWidth,
|
||||
resolutions[i].iHeight,
|
||||
+ resolutions[i].iScreenWidth,
|
||||
+ resolutions[i].iScreenHeight,
|
||||
+ resolutions[i].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "",
|
||||
resolutions[i].fRefreshRate);
|
||||
|
||||
if(m_eglplatform->FixedDesktop())
|
||||
{
|
||||
if(resDesktop.iWidth == resolutions[i].iWidth &&
|
||||
resDesktop.iHeight == resolutions[i].iHeight &&
|
||||
- resDesktop.fRefreshRate == resolutions[i].fRefreshRate)
|
||||
+ resDesktop.iScreenWidth == resolutions[i].iScreenWidth &&
|
||||
+ resDesktop.iScreenHeight == resolutions[i].iScreenHeight &&
|
||||
+ resDesktop.fRefreshRate == resolutions[i].fRefreshRate &&
|
||||
+ resDesktop.dwFlags == resolutions[i].dwFlags)
|
||||
{
|
||||
ResDesktop = res_index;
|
||||
}
|
||||
@@ -195,8 +203,11 @@ void CWinSystemGLES::UpdateResolutions()
|
||||
// swap desktop index for desktop res if available
|
||||
if (ResDesktop != RES_INVALID)
|
||||
{
|
||||
- CLog::Log(LOGNOTICE, "Found (%dx%d@%f) at %d, setting to RES_DESKTOP at %d",
|
||||
- resDesktop.iWidth, resDesktop.iHeight, resDesktop.fRefreshRate, (int)ResDesktop, (int)RES_DESKTOP);
|
||||
+ CLog::Log(LOGNOTICE, "Found (%dx%d%s@%f) at %d, setting to RES_DESKTOP at %d",
|
||||
+ resDesktop.iWidth, resDesktop.iHeight,
|
||||
+ resDesktop.dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "",
|
||||
+ resDesktop.fRefreshRate,
|
||||
+ (int)ResDesktop, (int)RES_DESKTOP);
|
||||
|
||||
RESOLUTION_INFO desktop = g_settings.m_ResInfo[RES_DESKTOP];
|
||||
g_settings.m_ResInfo[RES_DESKTOP] = g_settings.m_ResInfo[ResDesktop];
|
||||
diff --git a/xbmc/windowing/egl/WinSystemGLES.h b/xbmc/windowing/egl/WinSystemGLES.h
|
||||
index d94d24d..72c1eb7 100644
|
||||
--- a/xbmc/windowing/egl/WinSystemGLES.h
|
||||
+++ b/xbmc/windowing/egl/WinSystemGLES.h
|
||||
@@ -63,6 +63,8 @@ class CWinSystemGLES : public CWinSystemBase, public CRenderSystemGLES
|
||||
void *m_display;
|
||||
EGLNativeWindowType m_window;
|
||||
CWinEGLPlatform *m_eglplatform;
|
||||
+ int m_nScreenWidth;
|
||||
+ int m_nScreenHeight;
|
||||
};
|
||||
|
||||
XBMC_GLOBAL_REF(CWinSystemGLES,g_Windowing);
|
||||
diff --git a/xbmc/windowing/windows/WinSystemWin32.cpp b/xbmc/windowing/windows/WinSystemWin32.cpp
|
||||
index 6a0e335..182b9a2 100644
|
||||
--- a/xbmc/windowing/windows/WinSystemWin32.cpp
|
||||
+++ b/xbmc/windowing/windows/WinSystemWin32.cpp
|
||||
@@ -541,6 +541,8 @@ void CWinSystemWin32::AddResolution(const RESOLUTION_INFO &res)
|
||||
if (g_settings.m_ResInfo[i].iScreen == res.iScreen &&
|
||||
g_settings.m_ResInfo[i].iWidth == res.iWidth &&
|
||||
g_settings.m_ResInfo[i].iHeight == res.iHeight &&
|
||||
+ g_settings.m_ResInfo[i].iScreenWidth == res.iScreenWidth &&
|
||||
+ g_settings.m_ResInfo[i].iScreenHeight== res.iScreenHeight &&
|
||||
g_settings.m_ResInfo[i].fRefreshRate == res.fRefreshRate &&
|
||||
g_settings.m_ResInfo[i].dwFlags == res.dwFlags)
|
||||
return; // already have this resolution
|
||||
--
|
||||
1.7.10
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-pvr-addons"
|
||||
PKG_VERSION="fcdf846"
|
||||
PKG_VERSION="1963ed9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -4,6 +4,16 @@
|
||||
<showexitbutton>false</showexitbutton>
|
||||
<cputempcommand>cputemp</cputempcommand>
|
||||
<gputempcommand>gputemp</gputempcommand>
|
||||
<video>
|
||||
<latency>
|
||||
<delay>0</delay>
|
||||
<refresh>
|
||||
<min>20</min>
|
||||
<max>24</max>
|
||||
<delay>175</delay>
|
||||
</refresh>
|
||||
</latency>
|
||||
</video>
|
||||
<samba>
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
|
@ -29,3 +29,7 @@ $SCRIPTS/install openssh
|
||||
if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
|
||||
$SCRIPTS/install bluez
|
||||
fi
|
||||
|
||||
if [ "$DEVTOOLS" = "yes" ]; then
|
||||
$SCRIPTS/install iproute2
|
||||
fi
|
||||
|
@ -29,7 +29,7 @@ cd $PKG_BUILD/$1
|
||||
|
||||
cp $ROOT/$PKG_DIR/config/makefile.config .config
|
||||
|
||||
# echo "CONFIG_TLS=gnutls" >> .config
|
||||
# echo "CONFIG_GNUTLS_EXTRA=y" >> .config
|
||||
echo "CONFIG_TLS=gnutls" >> .config
|
||||
echo "CONFIG_GNUTLS_EXTRA=y" >> .config
|
||||
|
||||
make V=1 LIBDIR=/usr/lib BINDIR=/usr/bin
|
||||
|
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://hostap.epitest.fi/wpa_supplicant/"
|
||||
PKG_URL="http://hostap.epitest.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="dbus libnl openssl"
|
||||
PKG_BUILD_DEPENDS="toolchain dbus libnl openssl"
|
||||
PKG_DEPENDS="dbus libnl gnutls"
|
||||
PKG_BUILD_DEPENDS="toolchain dbus libnl gnutls"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="wpa_supplicant: An IEEE 802.11i supplicant implementation"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.20.1
|
||||
# Thu May 31 20:00:19 2012
|
||||
# Busybox version: 1.20.2
|
||||
# Wed Sep 26 00:23:57 2012
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -176,7 +176,7 @@ CONFIG_BASENAME=y
|
||||
CONFIG_CAT=y
|
||||
CONFIG_DATE=y
|
||||
CONFIG_FEATURE_DATE_ISOFMT=y
|
||||
# CONFIG_FEATURE_DATE_NANO is not set
|
||||
CONFIG_FEATURE_DATE_NANO=y
|
||||
CONFIG_FEATURE_DATE_COMPAT=y
|
||||
# CONFIG_HOSTID is not set
|
||||
CONFIG_ID=y
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="gcc"
|
||||
PKG_VERSION="4.7.1"
|
||||
PKG_VERSION="4.7.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="2997db1"
|
||||
PKG_VERSION="b87bc42"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-intel"
|
||||
PKG_VERSION="2.20.8"
|
||||
PKG_VERSION="2.20.9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -24,7 +24,6 @@ Section "Screen"
|
||||
Option "ColorRange" "Full"
|
||||
# Option "ColorRange" "Limited"
|
||||
# Option "ColorSpace" "RGB"
|
||||
# Option "ColorSpace" "YCbCr444"
|
||||
SubSection "Display"
|
||||
Depth 24
|
||||
EndSubSection
|
||||
|
@ -695,7 +695,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -2699,7 +2736,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3122,7 +3160,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -698,7 +698,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3039,7 +3076,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3464,7 +3502,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -659,7 +659,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -2979,7 +3016,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3408,7 +3446,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -702,7 +702,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3221,7 +3258,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3646,7 +3684,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -702,7 +702,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3223,7 +3260,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3648,7 +3686,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -698,7 +698,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3009,7 +3046,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3434,7 +3472,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -646,7 +646,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -2935,7 +2972,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3363,7 +3401,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -700,7 +700,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3076,7 +3113,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3501,7 +3539,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=m
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -649,7 +649,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3003,7 +3040,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3431,7 +3469,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=m
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.2.29 Kernel Configuration
|
||||
# Linux/arm 3.2.30 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -500,7 +500,44 @@ CONFIG_VLAN_8021Q=y
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -1106,7 +1143,6 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_W83L786NG is not set
|
||||
# CONFIG_SENSORS_W83627HF is not set
|
||||
# CONFIG_SENSORS_W83627EHF is not set
|
||||
CONFIG_SENSORS_BCM2835=y
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_HWMON=y
|
||||
CONFIG_THERMAL_BCM2835=y
|
||||
@ -1892,7 +1928,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
|
@ -12,6 +12,16 @@
|
||||
<bginfoloadermaxthreads>2</bginfoloadermaxthreads>
|
||||
<useddsfanart>true</useddsfanart>
|
||||
|
||||
<video>
|
||||
<defaultplayer>omxplayer</defaultplayer>
|
||||
<defaultdvdplayer>omxplayer</defaultdvdplayer>
|
||||
</video>
|
||||
|
||||
<audio>
|
||||
<defaultplayer>omxplayer</defaultplayer>
|
||||
<streamsilence>false</streamsilence>
|
||||
</audio>
|
||||
|
||||
<network>
|
||||
<cachemembuffersize>5282880</cachemembuffersize>
|
||||
</network>
|
||||
|
@ -646,7 +646,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -2753,7 +2790,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3181,7 +3219,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
# CONFIG_CRC8 is not set
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -698,7 +698,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3075,7 +3112,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3500,7 +3538,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=m
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -646,7 +646,44 @@ CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_IEEE802154 is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
#
|
||||
# Queueing/Scheduling
|
||||
#
|
||||
# CONFIG_NET_SCH_CBQ is not set
|
||||
# CONFIG_NET_SCH_HTB is not set
|
||||
# CONFIG_NET_SCH_HFSC is not set
|
||||
# CONFIG_NET_SCH_PRIO is not set
|
||||
# CONFIG_NET_SCH_MULTIQ is not set
|
||||
# CONFIG_NET_SCH_RED is not set
|
||||
# CONFIG_NET_SCH_SFB is not set
|
||||
# CONFIG_NET_SCH_SFQ is not set
|
||||
# CONFIG_NET_SCH_TEQL is not set
|
||||
# CONFIG_NET_SCH_TBF is not set
|
||||
# CONFIG_NET_SCH_GRED is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCH_NETEM=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_MQPRIO is not set
|
||||
# CONFIG_NET_SCH_CHOKE is not set
|
||||
# CONFIG_NET_SCH_QFQ is not set
|
||||
|
||||
#
|
||||
# Classification
|
||||
#
|
||||
# CONFIG_NET_CLS_BASIC is not set
|
||||
# CONFIG_NET_CLS_TCINDEX is not set
|
||||
# CONFIG_NET_CLS_ROUTE4 is not set
|
||||
# CONFIG_NET_CLS_FW is not set
|
||||
# CONFIG_NET_CLS_U32 is not set
|
||||
# CONFIG_NET_CLS_RSVP is not set
|
||||
# CONFIG_NET_CLS_RSVP6 is not set
|
||||
# CONFIG_NET_CLS_FLOW is not set
|
||||
# CONFIG_NET_CLS_CGROUP is not set
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_CLS_ACT is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_BATMAN_ADV is not set
|
||||
@ -3001,7 +3038,8 @@ CONFIG_XFS_FS=y
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_GFS2_FS is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
CONFIG_BTRFS_FS=y
|
||||
# CONFIG_BTRFS_FS_POSIX_ACL is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
CONFIG_EXPORTFS=y
|
||||
@ -3429,7 +3467,7 @@ CONFIG_CRC32_SLICEBY8=y
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
# CONFIG_CRC7 is not set
|
||||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_LIBCRC32C=y
|
||||
CONFIG_CRC8=m
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
|
@ -34,7 +34,7 @@ case $1 in
|
||||
;;
|
||||
build)
|
||||
deps="gcc g++ sed patch touch tar bzip2 gzip perl cp gawk makeinfo gperf cvs zip unzip mkfontscale diff xsltproc java"
|
||||
deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils diff xsltproc sun-java6-jre"
|
||||
deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils diff xsltproc default-jre"
|
||||
files="/usr/include/stdio.h /usr/include/ncurses.h"
|
||||
files_pkg="libc6-dev libncurses5-dev"
|
||||
;;
|
||||
|
Loading…
x
Reference in New Issue
Block a user