From 6472be12a035f99e08fbd133fe257b85ddb2ffd0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Sep 2014 08:45:29 +0200 Subject: only use kodi, remove xbmc --- package/kodi/Makefile | 26 +++++----- .../powermanagement/linux/LinuxPowerSyscall.cpp | 56 ---------------------- .../xbmc/powermanagement/linux/LinuxPowerSyscall.h | 45 ----------------- 3 files changed, 12 insertions(+), 115 deletions(-) delete mode 100644 package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp delete mode 100644 package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h (limited to 'package/kodi') diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 321c0e4e1..989421db0 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -59,6 +59,8 @@ PKGFB_WITH_BLURAY:= libbluray PKGFS_WITH_BLURAY:= libbluray PKGFD_WITH_WEBSERVER:= enable internal webserver support +PKG_LIBC_DEPENDS:= glibc + PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q @@ -108,47 +110,47 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --enable-debug \ --enable-udev -ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),) +ifneq ($(ADK_PACKAGE_KODI_WITH_BLURAY),) CONFIGURE_ARGS+= --enable-libbluray else CONFIGURE_ARGS+= --disable-libbluray endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_AFP),) +ifneq ($(ADK_PACKAGE_KODI_WITH_AFP),) CONFIGURE_ARGS+= --enable-afpclient else CONFIGURE_ARGS+= --disable-afpclient endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_SMB),) +ifneq ($(ADK_PACKAGE_KODI_WITH_SMB),) CONFIGURE_ARGS+= --enable-samba else CONFIGURE_ARGS+= --disable-samba endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_SSH),) +ifneq ($(ADK_PACKAGE_KODI_WITH_SSH),) CONFIGURE_ARGS+= --enable-ssh else CONFIGURE_ARGS+= --disable-ssh endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_NFS),) +ifneq ($(ADK_PACKAGE_KODI_WITH_NFS),) CONFIGURE_ARGS+= --enable-nfs else CONFIGURE_ARGS+= --disable-nfs endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_CEC),) +ifneq ($(ADK_PACKAGE_KODI_WITH_CEC),) CONFIGURE_ARGS+= --enable-libcec else CONFIGURE_ARGS+= --disable-libcec endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_RTMP),) +ifneq ($(ADK_PACKAGE_KODI_WITH_RTMP),) CONFIGURE_ARGS+= --enable-rtmp else CONFIGURE_ARGS+= --disable-rtmp endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_AVAHI),) +ifneq ($(ADK_PACKAGE_KODI_WITH_AVAHI),) CONFIGURE_ARGS+= --enable-avahi else CONFIGURE_ARGS+= --disable-avahi endif -ifneq ($(ADK_PACKAGE_XBMC_WITH_WEBSERVER),) +ifneq ($(ADK_PACKAGE_KODI_WITH_WEBSERVER),) CONFIGURE_ARGS+= --enable-webserver else CONFIGURE_ARGS+= --disable-webserver @@ -160,17 +162,13 @@ CONFIGURE_ARGS+= --with-platform=raspberry-pi \ --enable-gles \ --disable-sdl \ --disable-x11 -else +endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) CONFIGURE_ARGS+= --disable-x11 \ --disable-sdl \ --enable-gles \ --enable-neon \ --enable-codec=imxvpu -else -CONFIGURE_ARGS+= --enable-x11 \ - --enable-sdl -endif endif pre-configure: diff --git a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp b/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp deleted file mode 100644 index 4b8b25efb..000000000 --- a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2014 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, see - * . - * - */ - -#if defined (_LINUX) - -#include -#include "LinuxPowerSyscall.h" -#include "utils/log.h" - -CLinuxPowerSyscall::CLinuxPowerSyscall() -{ - CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall"); -} - -CLinuxPowerSyscall::~CLinuxPowerSyscall() -{ } - -bool CLinuxPowerSyscall::Powerdown() -{ - system("/sbin/poweroff -F"); - return 0; -} - -bool CLinuxPowerSyscall::Reboot() -{ - system("/sbin/reboot -F"); - return 0; -} - -int CLinuxPowerSyscall::BatteryLevel(void) -{ } - -bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback) -{ - return true; -} - -#endif - diff --git a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h b/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h deleted file mode 100644 index 959a8119b..000000000 --- a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once -/* - * Copyright (C) 2014 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, see - * . - * - */ - -#if defined (_LINUX) -#include "powermanagement/IPowerSyscall.h" - -class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents -{ -public: - CLinuxPowerSyscall(); - ~CLinuxPowerSyscall(); - - virtual bool Powerdown(); - virtual bool Suspend(void) { return false; } - virtual bool Hibernate(void) { return false; } - virtual bool Reboot(); - - virtual bool CanPowerdown(void) { return true; } - virtual bool CanSuspend(void) { return false; } - virtual bool CanHibernate(void) { return false; } - virtual bool CanReboot(void) { return true; } - virtual int BatteryLevel(void); - - virtual bool PumpPowerEvents(IPowerEventsCallback *callback); -}; -#endif - -- cgit v1.2.3