mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
Stephan Raue
commit
2a9a1013ba
@ -56,7 +56,13 @@ setup_toolchain() {
|
||||
}
|
||||
|
||||
kernel_path() {
|
||||
ls -d $ROOT/$BUILD/linux-*
|
||||
if [ -f $ROOT/packages/linux/package.mk ] ; then
|
||||
. $ROOT/packages/linux/package.mk
|
||||
elif [ -f $ROOT/packages/linux/meta ] ; then
|
||||
# TODO: remove
|
||||
. $ROOT/packages/linux/meta
|
||||
fi
|
||||
echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
|
||||
}
|
||||
|
||||
tolower(){
|
||||
|
||||
@ -19,6 +19,8 @@ fi
|
||||
|
||||
ROOT=`pwd`
|
||||
PROJECT_DIR="$ROOT/projects"
|
||||
# TODO: remove $ROOT/packages/linux/meta
|
||||
LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/meta $ROOT/packages/linux/package.mk"
|
||||
|
||||
# include versioning
|
||||
. config/version
|
||||
|
||||
@ -29,6 +29,7 @@ PKG_SITE="https://github.com/lwfinger/rtl8188eu"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="Realtek RTL81xxEU Linux 3.x driver"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -27,6 +27,7 @@ PKG_SITE="http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PFid=4
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="Realtek RTL81xxCU Linux 3.x driver"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -27,6 +27,7 @@ PKG_SITE="http://www.broadcom.com/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="bcm_sta: Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -29,6 +29,7 @@ PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
#PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux libhdhomerun"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver/dvb"
|
||||
PKG_SHORTDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)."
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -27,6 +27,7 @@ PKG_SITE="http://www.tbsdtv.com/english/Download.html"
|
||||
PKG_URL="http://www.tbsdtv.com/download/document/common/tbs-linux-drivers_v${PKG_VERSION}.zip"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="Linux TBS tuner drivers"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -27,6 +27,7 @@ PKG_SITE="http://www.virtualbox.org"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="vboxguest"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -31,6 +31,7 @@ PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER"
|
||||
PKG_BUILD_DEPENDS="toolchain cpio module-init-tools pciutils xz"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="linux"
|
||||
PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules"
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/$1.$TARGET_ARCH.conf -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="13.alpha-7f6c5e4"
|
||||
PKG_VERSION="13.alpha-0d22ffb"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="13.alpha-7f6c5e4"
|
||||
PKG_VERSION="13.alpha-0d22ffb"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,133 +0,0 @@
|
||||
From 29e44bb9f93767fd1235c33afa4877544f0f95b3 Mon Sep 17 00:00:00 2001
|
||||
From: xhaggi <sascha.woo@gmail.com>
|
||||
Date: Mon, 9 Dec 2013 15:25:11 +0100
|
||||
Subject: [PATCH] [pvr] observe PVRManager state to trigger epg create
|
||||
|
||||
---
|
||||
xbmc/pvr/PVRManager.cpp | 9 +++++++--
|
||||
xbmc/pvr/PVRManager.h | 3 ++-
|
||||
xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 12 +++++++++++-
|
||||
xbmc/pvr/channels/PVRChannelGroupInternal.h | 5 ++++-
|
||||
xbmc/utils/Observer.h | 1 +
|
||||
5 files changed, 25 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
|
||||
index 81d81c2..d35df1c 100644
|
||||
--- a/xbmc/pvr/PVRManager.cpp
|
||||
+++ b/xbmc/pvr/PVRManager.cpp
|
||||
@@ -393,8 +393,13 @@ ManagerState CPVRManager::GetState(void) const
|
||||
|
||||
void CPVRManager::SetState(ManagerState state)
|
||||
{
|
||||
- CSingleLock lock(m_managerStateMutex);
|
||||
- m_managerState = state;
|
||||
+ {
|
||||
+ CSingleLock lock(m_managerStateMutex);
|
||||
+ m_managerState = state;
|
||||
+ SetChanged();
|
||||
+ }
|
||||
+
|
||||
+ NotifyObservers(ObservableMessageManagerStateChanged);
|
||||
}
|
||||
|
||||
void CPVRManager::Process(void)
|
||||
diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h
|
||||
index 7038410..5359c05 100644
|
||||
--- a/xbmc/pvr/PVRManager.h
|
||||
+++ b/xbmc/pvr/PVRManager.h
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "threads/Event.h"
|
||||
#include "threads/Thread.h"
|
||||
#include "utils/JobManager.h"
|
||||
+#include "utils/Observer.h"
|
||||
|
||||
class CGUIDialogProgressBarHandle;
|
||||
class CStopWatch;
|
||||
@@ -83,7 +84,7 @@
|
||||
|
||||
typedef boost::shared_ptr<PVR::CPVRChannelGroup> CPVRChannelGroupPtr;
|
||||
|
||||
- class CPVRManager : public ISettingCallback, private CThread
|
||||
+ class CPVRManager : public ISettingCallback, private CThread, public Observable
|
||||
{
|
||||
friend class CPVRClients;
|
||||
|
||||
diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
|
||||
index 0bb07d2..ff06d48 100644
|
||||
--- a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
|
||||
+++ b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
|
||||
@@ -53,6 +53,7 @@
|
||||
CPVRChannelGroupInternal::~CPVRChannelGroupInternal(void)
|
||||
{
|
||||
Unload();
|
||||
+ g_PVRManager.UnregisterObserver(this);
|
||||
}
|
||||
|
||||
bool CPVRChannelGroupInternal::Load(void)
|
||||
@@ -60,7 +61,8 @@ bool CPVRChannelGroupInternal::Load(void)
|
||||
if (CPVRChannelGroup::Load())
|
||||
{
|
||||
UpdateChannelPaths();
|
||||
- g_PVRManager.TriggerEpgsCreate();
|
||||
+ g_PVRManager.RegisterObserver(this);
|
||||
+
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -385,3 +387,11 @@ bool CPVRChannelGroupInternal::CreateChannelEpgs(bool bForce /* = false */)
|
||||
|
||||
return true;
|
||||
}
|
||||
+
|
||||
+void CPVRChannelGroupInternal::Notify(const Observable &obs, const ObservableMessage msg)
|
||||
+{
|
||||
+ if (msg == ObservableMessageManagerStateChanged)
|
||||
+ {
|
||||
+ g_PVRManager.TriggerEpgsCreate();
|
||||
+ }
|
||||
+}
|
||||
diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h
|
||||
index cba4180..10f728a 100644
|
||||
--- a/xbmc/pvr/channels/PVRChannelGroupInternal.h
|
||||
+++ b/xbmc/pvr/channels/PVRChannelGroupInternal.h
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
|
||||
#include "PVRChannelGroup.h"
|
||||
+#include "utils/Observer.h"
|
||||
|
||||
namespace PVR
|
||||
{
|
||||
@@ -29,7 +30,7 @@
|
||||
|
||||
/** XBMC's internal group, the group containing all channels */
|
||||
|
||||
- class CPVRChannelGroupInternal : public CPVRChannelGroup
|
||||
+ class CPVRChannelGroupInternal : public CPVRChannelGroup, public Observer
|
||||
{
|
||||
friend class CPVRChannelGroups;
|
||||
friend class CPVRDatabase;
|
||||
@@ -45,6 +46,8 @@
|
||||
|
||||
virtual ~CPVRChannelGroupInternal(void);
|
||||
|
||||
+ virtual void Notify(const Observable &obs, const ObservableMessage msg);
|
||||
+
|
||||
/**
|
||||
* @brief The amount of channels in this container.
|
||||
* @return The amount of channels in this container.
|
||||
diff --git a/xbmc/utils/Observer.h b/xbmc/utils/Observer.h
|
||||
index 291d86b..3ac032a 100644
|
||||
--- a/xbmc/utils/Observer.h
|
||||
+++ b/xbmc/utils/Observer.h
|
||||
@@ -40,6 +40,7 @@
|
||||
ObservableMessageTimersReset,
|
||||
ObservableMessageRecordings,
|
||||
ObservableMessagePeripheralsChanged,
|
||||
+ ObservableMessageManagerStateChanged
|
||||
} ObservableMessage;
|
||||
|
||||
class Observer
|
||||
--
|
||||
1.8.5.1
|
||||
|
||||
@ -27,6 +27,7 @@ PKG_SITE="http://git.linuxtv.org/jarod/crystalhd.git"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="linux"
|
||||
PKG_BUILD_DEPENDS="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="crystalhd: OSX and Linux driver and library support for the Broadcom Crystal HD Video Accelerator."
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -28,6 +28,7 @@ PKG_SITE="http://www.nvidia.com/"
|
||||
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
|
||||
PKG_DEPENDS="linux libXinerama"
|
||||
PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/driver"
|
||||
PKG_SHORTDESC="xf86-video-nvidia-legacy: The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices too"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia"
|
||||
PKG_VERSION="319.72"
|
||||
PKG_VERSION="319.76"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
@ -28,6 +28,7 @@ PKG_SITE="http://www.nvidia.com/"
|
||||
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
|
||||
PKG_DEPENDS="linux libXinerama"
|
||||
PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/driver"
|
||||
PKG_SHORTDESC="xf86-video-nvidia: The Xorg driver for NVIDIA video chips"
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
#!/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
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/meta -nt $STAMP -o \
|
||||
$PKG_DIR/package.mk -nt $STAMP -o \
|
||||
$ROOT/packages/linux/meta -nt $STAMP -o \
|
||||
$ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -22,8 +22,7 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
clean ()
|
||||
{
|
||||
if [ ! -z "$1" ]; then
|
||||
printf "%${BUILD_INDENT}c CLEAN $1\n" ' '>&$SILENT_OUT
|
||||
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
|
||||
|
||||
@ -32,45 +31,20 @@ clean ()
|
||||
return
|
||||
fi
|
||||
|
||||
if [ "$FULL" = true ]; then
|
||||
rm -rf $BUILD_BASE*/$STAMPS_NOARCH/$1*
|
||||
rm -rf $BUILD_BASE*/$1*
|
||||
rm -rf $STAMPS_NOARCH/$1
|
||||
rm -rf $SOURCES/$1
|
||||
else
|
||||
for i in $BUILD/$1-*; do
|
||||
if [ -d $i ] ; then
|
||||
if [ -f $i/.openelec-unpack ] ; then
|
||||
. $i/.openelec-unpack
|
||||
if [ "$STAMP_PKG_NAME" = "$1" ]; then
|
||||
printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
|
||||
rm -rf $i
|
||||
fi
|
||||
else
|
||||
printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
|
||||
rm -rf $i
|
||||
fi
|
||||
for i in $BUILD/$1-*; do
|
||||
if [ -d $i -a -f "$i/.openelec-unpack" ] ; then
|
||||
. "$i/.openelec-unpack"
|
||||
if [ "$STAMP_PKG_NAME" = "$1" ]; then
|
||||
printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
|
||||
rm -rf $i
|
||||
fi
|
||||
done
|
||||
rm -f $STAMPS/$1*/build_*
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$1" = "--full" ]; then
|
||||
FULL=true
|
||||
shift
|
||||
elif [ "$1" = "--sources" ]; then
|
||||
CLEAN_SOURCES=true
|
||||
shift
|
||||
fi
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
for i in $PACKAGES/*; do clean ${i#$PACKAGES/}; done
|
||||
rm -rf $BUILD/iso
|
||||
rm -rf $BUILD/ziso
|
||||
[ "$FULL" = true ] && rm -rf $CCACHE_DIR
|
||||
else
|
||||
clean $1
|
||||
else
|
||||
# force clean if no stamp found (previous unpack failed)
|
||||
printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
|
||||
rm -rf $i
|
||||
fi
|
||||
done
|
||||
rm -f $STAMPS/$1*/build_*
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
@ -36,25 +36,34 @@ mkdir -p $BUILD
|
||||
|
||||
[ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
|
||||
|
||||
[ -f "$STAMP" -a -f "$PKG_DIR/need_unpack" ] && $PKG_DIR/need_unpack $@
|
||||
|
||||
if [ -f $PKG_DIR/package.mk ]; then
|
||||
# trigger unpack / full rebuild on any package.mk change
|
||||
if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then
|
||||
CLEAN_SOURCE=yes
|
||||
fi
|
||||
elif [ -f $PKG_DIR/meta ]; then
|
||||
# trigger unpack / full rebuild on any meta change (deprecated)
|
||||
if [ -f $STAMP -a $PKG_DIR/meta -nt $STAMP ]; then
|
||||
CLEAN_SOURCE=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
for patch in $PKG_DIR/patches/*; do
|
||||
# trigger unpack / full rebuild on any patch change
|
||||
if [ "$patch" -nt "$STAMP" ]; then
|
||||
CLEAN_SOURCE=yes
|
||||
break
|
||||
for i in $BUILD/$1-*; do
|
||||
if [ -d $i -a -f "$i/.openelec-unpack" ] ; then
|
||||
. "$i/.openelec-unpack"
|
||||
if [ "$STAMP_PKG_NAME" = "$1" ]; then
|
||||
# trigger unpack / full rebuild on any package.mk change
|
||||
if [ -f $PKG_DIR/package.mk -a $PKG_DIR/package.mk -nt "$i/.openelec-unpack" ]; then
|
||||
CLEAN_SOURCE=yes
|
||||
break
|
||||
# TODO: remove after converting ALL packages
|
||||
elif [ -f $PKG_DIR/meta -a $PKG_DIR/meta -nt "$i/.openelec-unpack" ]; then
|
||||
CLEAN_SOURCE=yes
|
||||
break
|
||||
fi
|
||||
# handle $PKG_NEED_UNPACK
|
||||
for file in $PKG_NEED_UNPACK; do
|
||||
if [ -f "$file" -a "$file" -nt "$i/.openelec-unpack" ] ; then
|
||||
CLEAN_SOURCE=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
# trigger unpack / full rebuild on any patch change
|
||||
for patch in $PKG_DIR/patches/* $PKG_DIR/patches.upstream/*; do
|
||||
if [ -f "$patch" -a "$patch" -nt "$i/.openelec-unpack" ]; then
|
||||
CLEAN_SOURCE=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user