Merge remote-tracking branch 'upstream/master' into openelec-settings

This commit is contained in:
Stefan Saraev 2013-01-26 13:01:50 +02:00
commit 7c11c6a34a
9 changed files with 30 additions and 22 deletions

View File

@ -34,6 +34,7 @@ cd $PKG_BUILD
--arch=$TARGET_ARCH \
--cpu=$TARGET_CPU \
--cc=$TARGET_CC \
--enable-timeshift \
--enable-bundle
make

View File

@ -1,3 +1,6 @@
3.0.4
- update to TVHeadend 3.3.402
3.0.3
- update to TVHeadend 3.3.328
- add an option to preload capmt_ca.so library

View File

@ -0,0 +1,9 @@
{
"enabled": 0,
"ondemand": 0,
"path": "/storage/.xbmc/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
"unlimited_period": 0,
"max_period": 3600,
"unlimited_size": 0,
"max_size": 1024
}

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="tvheadend"
PKG_VERSION="3.3.328"
PKG_VERSION="3.3.402"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -37,6 +37,9 @@ XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
DVR_DIR="$HOME/recordings"
TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift"
TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config"
TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift"
## handle upgrade. this should be removed later
@ -81,6 +84,16 @@ if [ ! -f "$DVR_SETTINGS_FILE" ]; then
fi
fi
if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
mkdir -p $TIMESHIFT_DIR
mkdir -p $TIMESHIFT_SETTINGS_DIR
if [ -f $ADDON_DIR/timeshift-config ]; then
cp $ADDON_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE
elif [ -f $ADDON_SYS_DIR/timeshift-config ]; then
cp $ADDON_SYS_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE
fi
fi
TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
mkdir -p /var/config

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="6fc42b2"
PKG_VERSION="aea93c3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="6fc42b2"
PKG_VERSION="aea93c3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="fuse-exfat"
PKG_VERSION="0.9.8"
PKG_VERSION="1.0.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,18 +0,0 @@
diff -Naur fuse-exfat-0.9.7/SConstruct fuse-exfat-0.9.7.patch/SConstruct
--- fuse-exfat-0.9.7/SConstruct 2012-03-08 08:26:52.000000000 +0100
+++ fuse-exfat-0.9.7.patch/SConstruct 2012-07-17 19:59:49.650457625 +0200
@@ -33,6 +33,14 @@
conf.env.Replace(CC = os.environ['CC'])
if 'CCFLAGS' in os.environ:
conf.env.Replace(CCFLAGS = os.environ['CCFLAGS'])
+if 'AR' in os.environ:
+ conf.env.Replace(AR = os.environ['AR'])
+if 'ARFLAGS' in os.environ:
+ conf.env.Replace(ARFLAGS = os.environ['ARFLAGS'])
+if 'RANLIB' in os.environ:
+ conf.env.Replace(RANLIB = os.environ['RANLIB'])
+if 'RANLIBFLAGS' in os.environ:
+ conf.env.Replace(RANLIBFLAGS = os.environ['RANLIBFLAGS'])
# Set default CCFLAGS for known compilers
if not conf.env['CCFLAGS']:
if conf.env['CC'] == 'gcc':