From 8d5aced5e4bebd09cf0ae82134f9afdf907646bb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 11 Oct 2011 20:41:41 +0200 Subject: [PATCH] xbmc: update to xbmc-40aa745 Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- .../mediacenter/xbmc-theme-Touched/install | 26 -- packages/mediacenter/xbmc-theme-Touched/meta | 36 -- packages/mediacenter/xbmc/build | 15 +- packages/mediacenter/xbmc/meta | 2 +- .../xbmc-21d5b48-901-libcec_v4-0.1.patch | 420 ------------------ ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...13-reenable_lcd_config_settings-0.1.patch} | 0 ...c-40aa745-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...aa745-351-increase_YV12_buffers-0.1.patch} | 0 ...xSwapBuffers_going_to_far_ahead-0.1.patch} | 0 ...mber_of_video_surface_allocated-0.1.patch} | 0 ...aa745-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...xbmc-40aa745-404-add_lame_check-0.6.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-40aa745-452-change_lcd_content-0.1.patch} | 0 ...45-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...45-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...c-40aa745-454-disable_backslash-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...40aa745-463-add_remote_devinput-0.1.patch} | 0 ...4-add_eject_keymapping_for_lirc-0.1.patch} | 0 projects/ATV/options | 4 +- projects/Fusion/options | 4 +- projects/Generic/options | 4 +- projects/Generic_OSS/options | 4 +- projects/ION/options | 4 +- projects/Intel/options | 4 +- projects/Ultra/options | 4 +- tools/mkpkg/mkpkg_xbmc | 8 +- 30 files changed, 28 insertions(+), 509 deletions(-) delete mode 100755 packages/mediacenter/xbmc-theme-Touched/install delete mode 100644 packages/mediacenter/xbmc-theme-Touched/meta delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-21d5b48-901-libcec_v4-0.1.patch rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-40aa745-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-013-reenable_lcd_config_settings-0.1.patch => xbmc-40aa745-013-reenable_lcd_config_settings-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-40aa745-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-351-increase_YV12_buffers-0.1.patch => xbmc-40aa745-351-increase_YV12_buffers-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch => xbmc-40aa745-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch => xbmc-40aa745-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-40aa745-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-404-add_lame_check-0.6.patch => xbmc-40aa745-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-40aa745-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-452-change_lcd_content-0.1.patch => xbmc-40aa745-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-40aa745-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-40aa745-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-454-disable_backslash-0.1.patch => xbmc-40aa745-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-40aa745-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-463-add_remote_devinput-0.1.patch => xbmc-40aa745-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-21d5b48-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-40aa745-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 9bb777a922..360848de29 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="21d5b48" +PKG_VERSION="40aa745" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Touched/install b/packages/mediacenter/xbmc-theme-Touched/install deleted file mode 100755 index f43c9fb981..0000000000 --- a/packages/mediacenter/xbmc-theme-Touched/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/share/xbmc/addons/skin.touched - cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/addons/skin.touched diff --git a/packages/mediacenter/xbmc-theme-Touched/meta b/packages/mediacenter/xbmc-theme-Touched/meta deleted file mode 100644 index 8f83f5c943..0000000000 --- a/packages/mediacenter/xbmc-theme-Touched/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xbmc-theme-Touched" -PKG_VERSION="21d5b48" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.xbmc.org" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="mediacenter" -PKG_SHORTDESC="xbmc-theme-Touched: XBMC Mediacenter Touchscreen theme" -PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 0a71f82eeb..6138b1e53f 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -41,9 +41,9 @@ else fi if [ "$CEC_SUPPORT" = yes ]; then - XBMC_CEC="--enable-libcec" + XBMC_CEC="--enable-libcec --enable-external-libcec --enable-udev --disable-libusb" else - XBMC_CEC="--disable-libcec" + XBMC_CEC="--disable-libcec --disable-udev --disable-libusb" fi if [ "$NONFREE_SUPPORT" = yes ]; then @@ -167,6 +167,7 @@ cd $PKG_BUILD do_autoreconf do_autoreconf lib/libid3tag/libid3tag do_autoreconf xbmc/screensavers/rsxs-0.9 + do_autoreconf xbmc/visualizations/Goom/goom2k4-0 do_autoreconf lib/libapetag do_autoreconf lib/cpluff # order matters with libdvd and friends @@ -200,11 +201,11 @@ cd $PKG_BUILD --disable-profiling \ --enable-joystick \ $XBMC_CEC \ - --enable-xrandr \ - --disable-goom \ + --enable-goom \ $XBMC_RSXS \ $XBMC_PROJECTM \ --enable-x11 \ + --enable-xrandr \ --disable-ccache \ $XBMC_PULSEAUDIO \ --enable-rtmp \ @@ -231,9 +232,9 @@ cd $PKG_BUILD # setup default skin inside the sources sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h -make externals -make xbmc.bin -make xbmc-xrandr +make -j1 externals +make -j1 xbmc.bin +make -j1 xbmc-xrandr if [ "$WIIMOTE_SUPPORT" = yes ]; then (cd tools/EventClients/Clients/WiiRemote; diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 84445e5d6d..b91e714898 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="21d5b48" +PKG_VERSION="40aa745" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-901-libcec_v4-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-21d5b48-901-libcec_v4-0.1.patch deleted file mode 100644 index 567f5e9117..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-901-libcec_v4-0.1.patch +++ /dev/null @@ -1,420 +0,0 @@ -Subject: [PATCH] updated to libcec v0.4 - ---- - project/BuildDependencies/scripts/libcec_d.bat | 9 +- - project/BuildDependencies/scripts/libcec_d.txt | 3 +- - xbmc/peripherals/Peripherals.cpp | 5 +- - xbmc/peripherals/bus/PeripheralBus.cpp | 2 +- - xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp | 3 +- - xbmc/peripherals/devices/Peripheral.h | 2 +- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 114 ++++++++++----------- - xbmc/peripherals/devices/PeripheralCecAdapter.h | 15 ++-- - 8 files changed, 75 insertions(+), 78 deletions(-) - -diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat -index 2a776bc..44d5004 100644 -diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt -index 9019c8b..29a93da 100644 -diff --git a/xbmc/peripherals/Peripherals.cpp b/xbmc/peripherals/Peripherals.cpp -index 40bda0b..8c98b07 100644 ---- a/xbmc/peripherals/Peripherals.cpp -+++ b/xbmc/peripherals/Peripherals.cpp -@@ -27,7 +27,7 @@ - #include "devices/PeripheralNIC.h" - #include "devices/PeripheralNyxboard.h" - #include "devices/PeripheralTuner.h" --#ifdef HAVE_LIBCEC -+#if defined(HAVE_LIBCEC) || defined(__WIN32__) - #include "devices/PeripheralCecAdapter.h" - #endif - #include "bus/PeripheralBusUSB.h" -@@ -251,14 +251,13 @@ CPeripheral *CPeripherals::CreatePeripheral(CPeripheralBus &bus, const Periphera - peripheral = new CPeripheralBluetooth(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId); - break; - --#ifdef HAVE_LIBCEC -+#if defined(HAVE_LIBCEC) || defined(__WIN32__) - case PERIPHERAL_CEC: - peripheral = new CPeripheralCecAdapter(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId); - break; - #endif - - default: -- peripheral = new CPeripheral(type, bus.Type(), strLocation, strDeviceName, iVendorId, iProductId); - break; - } - -diff --git a/xbmc/peripherals/bus/PeripheralBus.cpp b/xbmc/peripherals/bus/PeripheralBus.cpp -index 4b680e5..9adff51 100644 ---- a/xbmc/peripherals/bus/PeripheralBus.cpp -+++ b/xbmc/peripherals/bus/PeripheralBus.cpp -@@ -159,7 +159,7 @@ void CPeripheralBus::RegisterNewDevices(const PeripheralScanResults &results) - for (unsigned int iResultPtr = 0; iResultPtr < results.m_results.size(); iResultPtr++) - { - PeripheralScanResult result = results.m_results.at(iResultPtr); -- if (!HasPeripheral(result.m_strLocation) && result.m_type != PERIPHERAL_UNKNOWN) -+ if (!HasPeripheral(result.m_strLocation)) - g_peripherals.CreatePeripheral(*this, result.m_type, result.m_strLocation, result.m_iVendorId, result.m_iProductId); - } - } -diff --git a/xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp b/xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp -index 183318a..b84ad7a 100644 ---- a/xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp -+++ b/xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp -@@ -129,7 +129,8 @@ bool CPeripheralBusUSB::PerformDeviceScan(const GUID *guid, const PeripheralType - result.m_iVendorId = PeripheralTypeTranslator::HexStringToInt(strVendorId.c_str()); - result.m_iProductId = PeripheralTypeTranslator::HexStringToInt(strProductId.c_str()); - -- results.m_results.push_back(result); -+ if (!results.ContainsResult(result)) -+ results.m_results.push_back(result); - } - } - -diff --git a/xbmc/peripherals/devices/Peripheral.h b/xbmc/peripherals/devices/Peripheral.h -index 291f679..559a561 100644 ---- a/xbmc/peripherals/devices/Peripheral.h -+++ b/xbmc/peripherals/devices/Peripheral.h -@@ -32,7 +32,7 @@ namespace PERIPHERALS - - class CPeripheral - { -- friend class CGUIDialogPeripheralSettings;; -+ friend class CGUIDialogPeripheralSettings; - - public: - CPeripheral(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId); -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index bdc97a8..fd6d561 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -20,7 +20,7 @@ - */ - #include "system.h" - --#ifdef HAVE_LIBCEC -+#if defined(HAVE_LIBCEC) || defined(__WIN32__) - #include "PeripheralCecAdapter.h" - #include "input/XBIRRemote.h" - #include "Application.h" -@@ -37,27 +37,27 @@ using namespace PERIPHERALS; - using namespace ANNOUNCEMENT; - using namespace CEC; - --#define CEC_LIB_SUPPORTED_VERSION 2 -+#define CEC_LIB_SUPPORTED_VERSION 4 - - CPeripheralCecAdapter::CPeripheralCecAdapter(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId) : - CPeripheralHID(type, busType, strLocation, strDeviceName, iVendorId, iProductId), -- CThread("CEC parser"), -+ CThread("CEC Adapter"), - m_bStarted(false), - m_bHasButton(false), - m_bIsReady(false) - { -- m_cecParser = LoadLibCec("XBMC", CECDEVICE_PLAYBACKDEVICE1); -- if (!m_cecParser || m_cecParser->GetMinVersion() > CEC_LIB_SUPPORTED_VERSION) -+ m_cecAdapter = LoadLibCec("XBMC", CECDEVICE_PLAYBACKDEVICE1); -+ if (!m_cecAdapter || m_cecAdapter->GetMinVersion() > CEC_LIB_SUPPORTED_VERSION) - { - /* unsupported libcec version */ -- CLog::Log(LOGERROR, g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecParser ? m_cecParser->GetMinVersion() : -1); -+ CLog::Log(LOGERROR, g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecAdapter ? m_cecAdapter->GetMinVersion() : -1); - - CStdString strMessage; -- strMessage.Format(g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecParser ? m_cecParser->GetMinVersion() : -1); -+ strMessage.Format(g_localizeStrings.Get(36013).c_str(), CEC_LIB_SUPPORTED_VERSION, m_cecAdapter ? m_cecAdapter->GetMinVersion() : -1); - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(36000), strMessage); - m_bError = true; -- UnloadLibCec(m_cecParser); -- m_cecParser = NULL; -+ UnloadLibCec(m_cecAdapter); -+ m_cecAdapter = NULL; - } - else - { -@@ -68,53 +68,61 @@ CPeripheralCecAdapter::CPeripheralCecAdapter(const PeripheralType type, const Pe - CPeripheralCecAdapter::~CPeripheralCecAdapter(void) - { - CAnnouncementManager::RemoveAnnouncer(this); -- if (m_cecParser) -+ -+ m_bStop = true; -+ StopThread(true); -+ -+ if (m_cecAdapter) - { - FlushLog(); -- m_cecParser->Close(1000); -- UnloadLibCec(m_cecParser); -+ UnloadLibCec(m_cecAdapter); -+ m_cecAdapter = NULL; - } -- StopThread(true); - } - - void CPeripheralCecAdapter::Announce(EAnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) - { -- if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "ApplicationStop") && m_bIsReady) -+ if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnQuit") && m_bIsReady) - { - if (GetSettingBool("cec_power_off_shutdown")) -- m_cecParser->PowerOffDevices(); -+ m_cecAdapter->StandbyDevices(); - else if (GetSettingBool("cec_mark_inactive_shutdown")) -- m_cecParser->SetInactiveView(); -+ m_cecAdapter->SetInactiveView(); - } - else if (flag == GUI && !strcmp(sender, "xbmc") && !strcmp(message, "OnScreensaverDeactivated") && GetSettingBool("cec_standby_screensaver") && m_bIsReady) - { -- m_cecParser->PowerOnDevices(); -+ m_cecAdapter->PowerOnDevices(); - } - else if (flag == GUI && !strcmp(sender, "xbmc") && !strcmp(message, "OnScreensaverActivated") && GetSettingBool("cec_standby_screensaver")) - { -- m_cecParser->StandbyDevices(); -+ m_cecAdapter->StandbyDevices(); - } - else if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnSleep")) - { - if (GetSettingBool("cec_power_off_shutdown") && m_bIsReady) -- m_cecParser->PowerOffDevices(); -+ m_cecAdapter->StandbyDevices(); -+ CSingleLock lock(m_critSection); -+ m_bStop = true; -+ WaitForThreadExit(0); - } - else if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnWake")) - { -+ CSingleLock lock(m_critSection); - CLog::Log(LOGDEBUG, "%s - reconnecting to the CEC adapter after standby mode", __FUNCTION__); -- m_cecParser->Close(); -+ m_cecAdapter->Close(); - - CStdString strPort = GetSettingString("port"); -- if (!m_cecParser->Open(strPort.c_str(), 10000)) -+ if (!m_cecAdapter->Open(strPort.c_str(), 10000)) - { - CLog::Log(LOGERROR, "%s - failed to reconnect to the CEC adapter", __FUNCTION__); -+ FlushLog(); - m_bStop = true; - } - else - { - if (GetSettingBool("cec_power_on_startup")) - PowerOnCecDevices(); -- m_cecParser->SetActiveView(); -+ m_cecAdapter->SetActiveView(); - } - } - } -@@ -138,17 +146,14 @@ void CPeripheralCecAdapter::Process(void) - m_bStarted = false; - return; - } -- -- // the device needs a second to settle after it's plugged in -- Sleep(CEC_SETTLE_DOWN_TIME); -- -+ - CStdString strPort = GetSettingString("port"); - if (strPort.IsEmpty()) - { -- std::vector deviceList; -+ std::vector deviceList; - strPort = m_strFileLocation; - TranslateComPort(strPort); -- int iFound = m_cecParser->FindDevices(deviceList, strPort); -+ int iFound = m_cecAdapter->FindAdapters(deviceList, strPort); - - if (iFound <= 0) - { -@@ -159,7 +164,7 @@ void CPeripheralCecAdapter::Process(void) - } - else - { -- cec_device dev = deviceList[0]; -+ cec_adapter dev = deviceList[0]; - if (iFound > 1) - CLog::Log(LOGDEBUG, "%s - multiple com ports found for device. taking the first one", __FUNCTION__); - else -@@ -175,7 +180,7 @@ void CPeripheralCecAdapter::Process(void) - // open the CEC adapter - CLog::Log(LOGDEBUG, "%s - opening a connection to the CEC adapter: %s", __FUNCTION__, strPort.c_str()); - -- if (!m_cecParser->Open(strPort.c_str(), 10000)) -+ if (!m_cecAdapter->Open(strPort.c_str(), 10000)) - { - FlushLog(); - CLog::Log(LOGERROR, "%s - could not opening a connection to the CEC adapter", __FUNCTION__); -@@ -190,43 +195,32 @@ void CPeripheralCecAdapter::Process(void) - - if (GetSettingBool("cec_power_on_startup")) - PowerOnCecDevices(); -- m_cecParser->SetActiveView(); -+ m_cecAdapter->SetActiveView(); - FlushLog(); - - while (!m_bStop) - { - FlushLog(); -- ProcessNextCommand(); -- Sleep(50); -+ if (!m_bStop) -+ ProcessNextCommand(); -+ if (!m_bStop) -+ Sleep(50); - } - -- m_cecParser->Close(500); -+ m_cecAdapter->Close(); - - CLog::Log(LOGDEBUG, "%s - CEC adapter processor thread ended", __FUNCTION__); - m_bStarted = false; - } - --bool CPeripheralCecAdapter::PowerOffCecDevices(void) --{ -- bool bReturn(false); -- -- if (m_cecParser && m_bIsReady) -- { -- CLog::Log(LOGDEBUG, "%s - powering off CEC capable devices", __FUNCTION__); -- bReturn = m_cecParser->PowerOffDevices(); -- } -- -- return bReturn; --} -- - bool CPeripheralCecAdapter::PowerOnCecDevices(void) - { - bool bReturn(false); - -- if (m_cecParser && m_bIsReady) -+ if (m_cecAdapter && m_bIsReady) - { - CLog::Log(LOGDEBUG, "%s - powering on CEC capable devices", __FUNCTION__); -- bReturn = m_cecParser->PowerOnDevices(); -+ bReturn = m_cecAdapter->PowerOnDevices(); - } - - return bReturn; -@@ -236,10 +230,10 @@ bool CPeripheralCecAdapter::StandbyCecDevices(void) - { - bool bReturn(false); - -- if (m_cecParser && m_bIsReady) -+ if (m_cecAdapter && m_bIsReady) - { - CLog::Log(LOGDEBUG, "%s - putting CEC capable devices in standby mode", __FUNCTION__); -- bReturn = m_cecParser->StandbyDevices(); -+ bReturn = m_cecAdapter->StandbyDevices(); - } - - return bReturn; -@@ -248,10 +242,10 @@ bool CPeripheralCecAdapter::StandbyCecDevices(void) - bool CPeripheralCecAdapter::SendPing(void) - { - bool bReturn(false); -- if (m_cecParser && m_bIsReady) -+ if (m_cecAdapter && m_bIsReady) - { - CLog::Log(LOGDEBUG, "%s - sending ping to the CEC adapter", __FUNCTION__); -- bReturn = m_cecParser->Ping(); -+ bReturn = m_cecAdapter->PingAdapter(); - } - - return bReturn; -@@ -260,10 +254,10 @@ bool CPeripheralCecAdapter::SendPing(void) - bool CPeripheralCecAdapter::StartBootloader(void) - { - bool bReturn(false); -- if (m_cecParser && m_bIsReady) -+ if (m_cecAdapter && m_bIsReady) - { - CLog::Log(LOGDEBUG, "%s - starting the bootloader", __FUNCTION__); -- bReturn = m_cecParser->StartBootloader(); -+ bReturn = m_cecAdapter->StartBootloader(); - } - - return bReturn; -@@ -272,7 +266,7 @@ bool CPeripheralCecAdapter::StartBootloader(void) - void CPeripheralCecAdapter::ProcessNextCommand(void) - { - cec_command command; -- if (m_cecParser && m_bIsReady && m_cecParser->GetNextCommand(&command)) -+ if (m_cecAdapter && m_bIsReady && m_cecAdapter->GetNextCommand(&command)) - { - CLog::Log(LOGDEBUG, "%s - processing command: initiator=%d destination=%d opcode=%d", __FUNCTION__, command.source, command.destination, command.opcode); - -@@ -300,7 +294,7 @@ bool CPeripheralCecAdapter::GetNextKey(void) - return false; - - cec_keypress key; -- if (!m_bIsReady || !(m_bHasButton = m_cecParser->GetNextKeypress(&key))) -+ if (!m_bIsReady || !(m_bHasButton = m_cecAdapter->GetNextKeypress(&key))) - return false; - - CLog::Log(LOGDEBUG, "%s - received key %d", __FUNCTION__, key.keycode); -@@ -519,9 +513,9 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting - if (strChangedSetting.Equals("enabled")) - { - bool bEnabled(GetSettingBool("enabled")); -- if (!bEnabled && m_cecParser && m_bStarted) -+ if (!bEnabled && m_cecAdapter && m_bStarted) - StopThread(true); -- else if (bEnabled && !m_cecParser && m_bStarted) -+ else if (bEnabled && !m_cecAdapter && m_bStarted) - InitialiseFeature(FEATURE_CEC); - } - } -@@ -529,7 +523,7 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting - void CPeripheralCecAdapter::FlushLog(void) - { - cec_log_message message; -- while (m_cecParser && m_cecParser->GetNextLogMessage(&message)) -+ while (m_cecAdapter && m_cecAdapter->GetNextLogMessage(&message)) - { - int iLevel = -1; - switch (message.level) -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.h b/xbmc/peripherals/devices/PeripheralCecAdapter.h -index ee566c0..9c5fb6d 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.h -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.h -@@ -28,7 +28,7 @@ - - namespace CEC - { -- class ICECDevice; -+ class ICECAdapter; - }; - - namespace PERIPHERALS -@@ -48,7 +48,6 @@ namespace PERIPHERALS - virtual ~CPeripheralCecAdapter(void); - - virtual void Announce(ANNOUNCEMENT::EAnnouncementFlag flag, const char *sender, const char *message, const CVariant &data); -- virtual bool PowerOffCecDevices(void); - virtual bool PowerOnCecDevices(void); - virtual bool StandbyCecDevices(void); - -@@ -70,11 +69,11 @@ namespace PERIPHERALS - static bool FindConfigLocation(CStdString &strString); - static bool TranslateComPort(CStdString &strPort); - -- CEC::ICECDevice *m_cecParser; -- bool m_bStarted; -- bool m_bHasButton; -- bool m_bIsReady; -- CecButtonPress m_button; -- CCriticalSection m_critSection; -+ CEC::ICECAdapter* m_cecAdapter; -+ bool m_bStarted; -+ bool m_bHasButton; -+ bool m_bIsReady; -+ CecButtonPress m_button; -+ CCriticalSection m_critSection; - }; - } --- - diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-21d5b48-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-40aa745-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-21d5b48-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-40aa745-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/projects/ATV/options b/projects/ATV/options index 0dc8a8b698..54a74289c2 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -106,9 +106,9 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # Default Skin (Confluence) diff --git a/projects/Fusion/options b/projects/Fusion/options index 0e6836461f..d395000ed4 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -106,9 +106,9 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # Default Skin (Confluence) diff --git a/projects/Generic/options b/projects/Generic/options index 54f8fa357f..c2a68b9e1e 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -109,9 +109,9 @@ # Skins to install (Confluence) SKINS="Confluence" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # install extra subtitle Fonts for XBMC (yes / no) diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index e1054cf0eb..c8bf8b8411 100644 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -109,9 +109,9 @@ # Skins to install (Confluence) SKINS="Confluence" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # install extra subtitle Fonts for XBMC (yes / no) diff --git a/projects/ION/options b/projects/ION/options index 065fe33b7b..49280230af 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -106,9 +106,9 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # Default Skin (Confluence) diff --git a/projects/Intel/options b/projects/Intel/options index b6ceb01c38..d55c025435 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -106,9 +106,9 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # Default Skin (Confluence) diff --git a/projects/Ultra/options b/projects/Ultra/options index 47180884f8..da1ba0d2e5 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -106,9 +106,9 @@ # Mediacenter to use (xbmc / no) MEDIACENTER="xbmc" -# Skins to install (Confluence, Touched) +# Skins to install (Confluence) # Space separated list is supported, -# e.g. SKINS="Confluence Touched" +# e.g. SKINS="Confluence" SKINS="Confluence" # Default Skin (Confluence) diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc index 66a2e07b8e..51396a48d7 100755 --- a/tools/mkpkg/mkpkg_xbmc +++ b/tools/mkpkg/mkpkg_xbmc @@ -47,8 +47,8 @@ echo "cleaning sources..." echo "seperating theme..." rm -rf $PKG_NAME-theme-Confluence-$GIT_REV mv $PKG_NAME-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$GIT_REV - rm -rf $PKG_NAME-theme-Touched-$GIT_REV - mv $PKG_NAME-$GIT_REV/addons/skin.touched $PKG_NAME-theme-Touched-$GIT_REV +# rm -rf $PKG_NAME-theme-Touched-$GIT_REV +# mv $PKG_NAME-$GIT_REV/addons/skin.touched $PKG_NAME-theme-Touched-$GIT_REV echo "cleaning sources..." rm -rf $PKG_NAME-$GIT_REV/visualisations @@ -72,9 +72,9 @@ echo "cleaning sources..." echo "packing sources..." tar cvJf $PKG_NAME-$GIT_REV.tar.xz $PKG_NAME-$GIT_REV tar cvJf $PKG_NAME-theme-Confluence-$GIT_REV.tar.xz $PKG_NAME-theme-Confluence-$GIT_REV - tar cvJf $PKG_NAME-theme-Touched-$GIT_REV.tar.xz $PKG_NAME-theme-Touched-$GIT_REV +# tar cvJf $PKG_NAME-theme-Touched-$GIT_REV.tar.xz $PKG_NAME-theme-Touched-$GIT_REV echo "remove temporary sourcedir..." rm -rf $PKG_NAME-$GIT_REV rm -rf $PKG_NAME-theme-Confluence-$GIT_REV - rm -rf $PKG_NAME-theme-Touched-$GIT_REV +# rm -rf $PKG_NAME-theme-Touched-$GIT_REV