Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/debug/iftop/build

@@ -24,7 +24,7 @@
 
 #strip_lto
 
-export LIBS="-lpthread -ltinfo -lusb-1.0"
+export LIBS="-lpthread -ltinfo"
 
 cd $PKG_BUILD
 

packages/debug/iftop/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
 PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="ncurses"
-PKG_BUILD_DEPENDS="toolchain ncurses libusb libpcap"
+PKG_BUILD_DEPENDS="toolchain ncurses libpcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug/tools"
 PKG_SHORTDESC="iftop: display bandwidth usage on an interface"

packages/devel/libpcap/build

@@ -29,6 +29,7 @@ cd $BUILD/$1*
 sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' configure
 
 LIBS="-lpthread" \
+ac_cv_header_libusb_1_0_libusb_h=no \
 ./configure \
        --host=$TARGET_NAME \
        --build=$HOST_NAME \

packages/mediacenter/xbmc/patches/xbmc-995.50-disable-alt-tab.patch

@@ -0,0 +1,12 @@
+diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp
+index ed31c04..34fcfae 100644
+--- a/xbmc/windowing/WinEventsX11.cpp
++++ b/xbmc/windowing/WinEventsX11.cpp
+@@ -709,7 +709,6 @@ bool CWinEventsX11::ProcessShortcuts(XBMC_Event& event)
+     switch(event.key.keysym.sym)
+     {
+       case XBMCK_TAB:  // ALT+TAB to minimize/hide
+-        g_application.Minimize();
+         return true;
+ 
+       default:

packages/mediacenter/xbmc/patches/xbmc-995.51-remove-windowed-display-mode.patch

@@ -0,0 +1,13 @@
+diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
+index cbf0acb..f789e18 100644
+--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
++++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
+@@ -2434,7 +2434,7 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
+     pControl->Clear();
+ 
+     CStdString strScreen;
+-    if (g_advancedSettings.m_canWindowed)
++    if (g_advancedSettings.m_canWindowed && !g_application.IsStandAlone())
+       pControl->AddLabel(g_localizeStrings.Get(242), -1);
+ 
+ #if !defined(HAS_GLX)