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

This commit is contained in:
Stephan Raue 2012-11-21 18:12:48 +01:00
commit 842289a108
26 changed files with 5980 additions and 53 deletions

View File

@ -0,0 +1,29 @@
#!/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
VDR_DIR=`basename $BUILD/vdr-[0-9]*`
cd $PKG_BUILD
make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

View File

@ -0,0 +1,37 @@
################################################################################
# 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
################################################################################
PKG_NAME="vdr-plugin-vnsiserver"
PKG_VERSION="e3c185b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="vdr"
PKG_BUILD_DEPENDS="toolchain vdr"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="TV"
PKG_LONGDESC="TV"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-xvdr"
PKG_VERSION="b62ccbd"
PKG_VERSION="c2fa08a"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -47,6 +47,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-plugin-vnsiserver-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-dynamite-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-iptv-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-wirbelscan-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@ -72,6 +73,9 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
cp -PR $BUILD/vdr-plugin-xvdr-*/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
cp -PR $BUILD/vdr-plugin-vnsiserver-*/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $BUILD/vdr-[0-9]*/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin

View File

@ -3,6 +3,7 @@
<setting id="NUM_ADAPTERS" value="1" />
<setting id="REMOVE_MODULES" value="" />
<setting id="VDR_VIDEO_DIR" value="/storage/videos" />
<setting id="PVR_PLUGIN" value="xvdr" />
<setting id="ENABLE_DYNAMITE" value="true" />
<setting id="ENABLE_IPTV" value="false" />
<setting id="ENABLE_SOFTCAM" value="true" />

View File

@ -51,7 +51,7 @@ VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
VDR_ARG="$VDR_ARG -P xvdr"
VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
if [ "$ENABLE_SOFTCAM" == "true" ] ; then
VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"

View File

@ -30,4 +30,5 @@
<string id="1050">Enable plugin: text2skin</string>
<string id="1051">VDR Configuration</string>
<string id="1052">VDR Video Dir</string>
<string id="1053">PVR plugin</string>
</strings>

View File

@ -15,6 +15,7 @@
<category label="1001">
<setting label="1030" type="lsep"/>
<setting type="sep" />
<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="xvdr" />
<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="linux-tbs-drivers"
PKG_VERSION="120814"
PKG_VERSION="121119"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

File diff suppressed because it is too large Load Diff

View File

@ -6,10 +6,10 @@ diff -Naur a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
bool CFileCurl::IsInternet(bool checkDNS /* = true */)
{
- CStdString strURL = "http://www.google.com";
+ CStdString strURL = "http://www.openelec.tv";
+ CStdString strURL = "http://openelec.tv";
if (!checkDNS)
- strURL = "http://74.125.19.103"; // www.google.com ip
+ strURL = "http://212.101.13.10"; // www.openelec.tv ip
+ strURL = "http://212.101.13.10"; // openelec.tv ip
bool found = Exists(strURL);
Close();

View File

@ -20,29 +20,55 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# usage: sudo ./create_virtualmachine <path>
# example: sudo ./create_virtualmachine /home/test/VM
# usage: sudo ./create_virtualmachine <path> <size(MB)> [<type>]
# example: sudo ./create_virtualmachine /home/test/VM 512 [vdi]
if [ "$(id -u)" != "0" ]; then
clear
echo "###########################################################"
echo "# please execute with 'sudo' or -DANGEROUS!!!- as root #"
echo "# example: #"
echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
echo "###########################################################"
exit 1
fi
if [ -z "$1" -o -z "$2" ]; then
clear
echo "###########################################################"
echo "# please execute as follows #"
echo "# example: #"
echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
echo "###########################################################"
exit 1
fi
if [ "$2" -lt "200" -o "$2" -gt "2048" ]; then
clear
echo "#########################################################"
echo "# please execute with 'sudo' or -DANGEROUS!!!- as root #"
echo "# example: sudo ./create_virtualmachine <path> #"
echo "# use a value between 200MB and 2048MB (2GB) #"
echo "# example: #"
echo "# sudo ./create_virtualmachine /home/test/VM 512 #"
echo "#########################################################"
exit 1
fi
if [ -z "$1" ]; then
if [ ! -z "$3" -a "$3" != "vdi" -a "$3" != "vmdk" ]; then
clear
echo "#########################################################"
echo "# please execute with target folder drive as option #"
echo "# example: sudo ./create_virtualmachine /home/test/VM/ #"
echo "# only vdi or vmdk types are supported #"
echo "# example: #"
echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi] #"
echo "#########################################################"
exit 1
elif [ "$3" = "vdi" ]; then
TYPE="vdi"
elif [ -z "$3" -o "$3" = "vmdk" ]; then
TYPE="vmdk"
fi
DISK="$1/OpenELEC.img"
VMDK="$1/OpenELEC.vmdk"
IMAGE="$1/OpenELEC.$TYPE"
LOOP=$(losetup -f)
clear
@ -109,7 +135,7 @@ echo "#########################################################"
exit 1
fi
# this is needed fo convert harddisk image to vmdk format
# this is needed fo convert harddisk image to vmdk or vdi format
which qemu-img > /dev/null
if [ "$?" = "1" ]; then
clear
@ -159,7 +185,7 @@ echo "#########################################################"
# create an image
echo "creating new empty harddisk image: $DISK..."
dd if=/dev/zero of="$DISK" bs=1M count=512
dd if=/dev/zero of="$DISK" bs=1M count=1024
# write a disklabel
echo "creating new partition table: $DISK..."
@ -168,15 +194,27 @@ echo "#########################################################"
# create partition1
echo "creating partition1 on $DISK..."
parted -s "$LOOP" -a min unit s mkpart primary ext4 64 262208
parted -s "$LOOP" unit cyl mkpart primary ext2 -- 0 16
# create partition2
echo "creating partition2 on $DISK..."
parted -s "$LOOP" -a min unit s mkpart primary ext4 262209 100%
parted -s "$LOOP" unit cyl mkpart primary ext2 -- 16 -2
# make partition1 active (bootable)
echo "marking partition1 active..."
parted -s "$LOOP" set 1 boot on
echo "telling kernel we have a new partition table..."
partprobe "$LOOP"
# create filesystem on partition1
echo "creating filesystem on partition1..."
mkfs.ext4 "${LOOP}p1" -L System
# create filesystem on partition2
echo "creating filesystem on partition2..."
mkfs.ext4 "${LOOP}p2" -L Storage
sync
# write mbr
echo "writing mbr..."
@ -192,18 +230,10 @@ echo "#########################################################"
cat "$MBR" > "$LOOP"
fi
# create filesystem on partition1
echo "creating filesystem on partition1..."
losetup -d "$LOOP"
losetup -o 32768 --sizelimit 134218240 "$LOOP" "$DISK"
mke2fs -t ext4 -m 0 "$LOOP"
tune2fs -U random -L "System" "$LOOP"
sync
# mount partition
echo "mounting partition1 on /tmp/vmware_install..."
mkdir -p /tmp/vmware_install
mount "$LOOP" /tmp/vmware_install
mount "${LOOP}p1" /tmp/vmware_install
# create bootloader configuration
echo "creating bootloader configuration..."
@ -213,7 +243,7 @@ echo "#########################################################"
echo " " >> /tmp/vmware_install/syslinux.cfg
echo "LABEL linux" >> /tmp/vmware_install/syslinux.cfg
echo " KERNEL /KERNEL" >> /tmp/vmware_install/syslinux.cfg
echo " APPEND boot=LABEL=System disk=LABEL=Storage quiet ssh" >> /tmp/vmware_install/syslinux.cfg
echo " APPEND boot=LABEL=System disk=LABEL=Storage ssh debugging nosplash" >> /tmp/vmware_install/syslinux.cfg
# install extlinux
echo "installing extlinux to partition1..."
@ -230,15 +260,7 @@ echo "#########################################################"
# unmount partition1
echo "unmounting partition1..."
umount "$LOOP"
sync
# create filesystem on partition2
echo "creating filesystem on partition2..."
losetup -d "$LOOP"
losetup -o 134251008 "$LOOP" "$DISK"
mke2fs -t ext4 -m 0 "$LOOP"
tune2fs -U random -L "Storage" "$LOOP"
umount "${LOOP}p1"
sync
# detach loop0
@ -248,9 +270,10 @@ echo "#########################################################"
echo "cleaning tempdir..."
rm -rf /tmp/vmware_install
# convert image to vmdk
echo "converting $DISK to vmdk format..."
qemu-img convert -O vmdk "$DISK" "$VMDK"
# convert image to vmdk or vdi
echo "converting $DISK to $TYPE format..."
qemu-img convert -O $TYPE "$DISK" "$IMAGE"
rm -f "$DISK"
echo "...installation finished"

View File

@ -1918,7 +1918,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2188,7 +2188,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2137,7 +2137,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2272,7 +2272,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2270,7 +2270,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2160,7 +2160,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2095,7 +2095,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2177,7 +2177,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2113,7 +2113,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -1510,7 +1510,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -1978,7 +1978,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2179,7 +2179,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -2114,7 +2114,7 @@ CONFIG_DVB_USB_CE6230=m
# CONFIG_DVB_USB_FRIIO is not set
# CONFIG_DVB_USB_EC168 is not set
CONFIG_DVB_USB_AZ6007=m
# CONFIG_DVB_USB_AZ6027 is not set
CONFIG_DVB_USB_AZ6027=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT913X=m

View File

@ -0,0 +1,43 @@
#!/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
################################################################################
echo "getting sources..."
if [ ! -d vdr-plugin-vnsiserver.git ]; then
git clone git://github.com/opdenkamp/xbmc-pvr-addons.git vdr-plugin-vnsiserver.git
fi
cd vdr-plugin-vnsiserver.git
git pull
GIT_REV=`git log -n1 --format=%h`
cd ..
echo "copying sources..."
rm -rf vdr-plugin-vnsiserver-$GIT_REV
cp -R vdr-plugin-vnsiserver.git/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver vdr-plugin-vnsiserver-$GIT_REV
echo "cleaning sources..."
rm -rf vdr-plugin-vnsiserver-$GIT_REV/.git
echo "packing sources..."
tar cvJf vdr-plugin-vnsiserver-$GIT_REV.tar.xz vdr-plugin-vnsiserver-$GIT_REV
echo "remove temporary sourcedir..."
rm -rf vdr-plugin-vnsiserver-$GIT_REV