Merge branch 'openelec-next' of git://github.com/OpenELEC/OpenELEC.tv into openelec-eden

This commit is contained in:
Stephan Raue 2011-06-15 22:53:48 +02:00
commit d02767cfbd
21 changed files with 67096 additions and 12 deletions

View File

@ -0,0 +1,30 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf

View File

@ -0,0 +1,28 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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
cd $PKG_BUILD
cmake -DWEBIF=1
make

View File

@ -0,0 +1,2 @@
0.99.1
- initial version oscam-5377

View File

@ -0,0 +1,31 @@
# oscam.conf generated automatically by Streamboard OSCAM 1.00-unstable_svn build #0
# Read more: http://streamboard.gmc.to/svn/oscam/trunk/Distribution/doc/txt/oscam.conf.txt
[global]
usrfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/oscamuser.log
logfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/oscam.log
cwlogdir = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/cw
nice = -1
saveinithistory = 1
[monitor]
port = 988
aulow = 120
hideclient_to = 15
monlevel = 1
appendchaninfo = 0
[webif]
httpport = 8888
httpuser = oscam
httppwd = oscam
httpallowed = 0.0.0.0-255.255.255.255
[anticasc]
enabled = 1
numusers = 1
samples = 5
penalty = 1
aclogfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/aclog.log
denysamples = 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,40 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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="oscam"
PKG_VERSION="5377"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"
#PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="http://gujs.openelec.tv/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS="libiconv avahi openssl"
PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
PKG_PRIORITY="optional"
PKG_SECTION="service/softcam"
PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul."
PKG_LONGDESC="OSCam is Open Source Conditional Access Modul."
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.service"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,73 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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
################################################################################
#Check if process is already running
if [ ! $(pidof oscam) ]; then
ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam"
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.softcam.oscam"
ADDON_LOG_DIR="$ADDON_HOME/log"
ADDON_CONF_DIR="$ADDON_HOME/config"
ADDON_CONF="$ADDON_CONF_DIR/oscam.conf"
ADDON_CONF_AC="$ADDON_CONF_DIR/oscam.ac"
ADDON_CONF_CERT="$ADDON_CONF_DIR/oscam.cert"
ADDON_CONF_DVBAPI="$ADDON_CONF_DIR/oscam.dvbapi"
ADDON_CONF_GUESS="$ADDON_CONF_DIR/oscam.guess"
ADDON_CONF_IRD="$ADDON_CONF_DIR/oscam.ird"
ADDON_CONF_PROVID="$ADDON_CONF_DIR/oscam.provid"
ADDON_CONF_SERVER="$ADDON_CONF_DIR/oscam.server"
ADDON_CONF_SERVICES="$ADDON_CONF_DIR/oscam.services"
ADDON_CONF_SRVID="$ADDON_CONF_DIR/oscam.srvid"
ADDON_CONF_TIERS="$ADDON_CONF_DIR/oscam.tiers"
ADDON_CONF_USER="$ADDON_CONF_DIR/oscam.user"
OSCAM_ARG="-c $ADDON_CONF_DIR"
mkdir -p $ADDON_HOME
mkdir -p $ADDON_CONF_DIR
mkdir -p $ADDON_LOG_DIR
if [ ! -f "$ADDON_CONF" ]; then
cp $ADDON_DIR/oscam-default.conf $ADDON_CONF
fi
touch $ADDON_CONF_AC
touch $ADDON_CONF_CERT
touch $ADDON_CONF_DVBAPI
touch $ADDON_CONF_GUESS
touch $ADDON_CONF_IRD
touch $ADDON_CONF_PROVID
touch $ADDON_CONF_SERVER
touch $ADDON_CONF_SERVICES
touch $ADDON_CONF_SRVID
touch $ADDON_CONF_TIERS
touch $ADDON_CONF_USER
#Restart process if it terminates.
(while true; do
oscam $OSCAM_ARG > /dev/null 2>&1
sleep 1
done)&
fi

View File

@ -0,0 +1,24 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011-2011 Gregor Fuis (gujs@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
################################################################################
import xbmc, time, os, subprocess
os.system("oscam.service")

View File

@ -0,0 +1,15 @@
driver (rtl2832u_v2.0.1.tar.gz) incl. patches taken from:
- http://www.mail-archive.com/linux-media@vger.kernel.org/msg25032.html
- http://goo.gl/CnJJu
- http://goo.gl/NF9eB
other links:
- http://ubuntuforums.org/showthread.php?t=1678094&page=4
see also:
- http://openelec.tv/forum/27-hardware-support/7149-tv-tuner-notonlytv-dvb-t-usb-deluxe-lv5tdeluxe
- http://wiki.zeratul.org/doku.php?id=linux:v4l:realtek:start (source of incl. driver?)
- http://ubuntuforums.org/showpost.php?s=a4812315c36edc2587115bbc15c7ee79&p=10807315&postcount=39
- http://ubuntuforums.org/showpost.php?s=a4812315c36edc2587115bbc15c7ee79&p=10935546&postcount=40
- https://build.opensuse.org/package/files?package=dvb-usb-rtl2832u&project=home%3Ajvroosmalen%3Abranches%3Ahome%3Apolyconvex

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
diff -Naur linux-2.6.39.1/drivers/media/dvb/dvb-usb/rtl2832u.h linux-2.6.39.1.patch/drivers/media/dvb/dvb-usb/rtl2832u.h
--- linux-2.6.39.1/drivers/media/dvb/dvb-usb/rtl2832u.h 2010-10-27 08:17:30.000000000 +0200
+++ linux-2.6.39.1.patch/drivers/media/dvb/dvb-usb/rtl2832u.h 2011-06-15 18:22:30.416756439 +0200
@@ -39,7 +39,8 @@
#define USB_PID_DEXATEK_WARM_4 0x1104
#define USB_VID_GTEK 0x1F4D
-#define USB_PID_GTEK_WARM 0x0837
+//#define USB_PID_GTEK_WARM 0x0837
+#define USB_PID_GTEK_WARM 0xC803
#define USB_PID_GTEK_WARM_A 0xA803
#define USB_PID_GTEK_WARM_B 0xB803
#define USB_PID_GTEK_WARM_C 0xC803

View File

@ -0,0 +1,11 @@
diff -Naur xbmc-10.1-Dharma/userdata/RssFeeds.xml xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml
--- xbmc-10.1-Dharma/userdata/RssFeeds.xml 2011-03-08 02:49:24.000000000 +0100
+++ xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml 2011-06-14 17:07:08.450880123 +0200
@@ -3,6 +3,7 @@
<!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. !-->
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
+ <feed updateinterval="30">http://openelec.tv/news?format=feed&type=rss</feed>
<feed updateinterval="30">http://feeds.feedburner.com/xbmc</feed>
</set>
</rssfeeds>

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-nvidia"
PKG_VERSION="275.09.04"
PKG_VERSION="275.09.07"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"

View File

@ -98,7 +98,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -1423,6 +1422,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

View File

@ -99,7 +99,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -1589,6 +1588,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

View File

@ -99,7 +99,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -1770,6 +1769,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

View File

@ -99,7 +99,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -1613,6 +1612,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

View File

@ -99,7 +99,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -1556,6 +1555,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

View File

@ -99,7 +99,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -943,7 +942,28 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
CONFIG_MII=y
# CONFIG_PHYLIB is not set
CONFIG_PHYLIB=y
#
# MII PHY device drivers
#
# CONFIG_MARVELL_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_QSEMI_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM63XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
@ -999,7 +1019,7 @@ CONFIG_R8169=y
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
CONFIG_TIGON3=y
# CONFIG_BNX2 is not set
# CONFIG_CNIC is not set
# CONFIG_QLA3XXX is not set
@ -1625,6 +1645,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
CONFIG_DVB_USB_DTV5100=m
CONFIG_DVB_USB_RTL2832U=m
# CONFIG_DVB_USB_AF9015 is not set
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

View File

@ -99,7 +99,6 @@ CONFIG_IRQ_FORCED_THREADING=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@ -893,7 +892,28 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
CONFIG_MII=y
# CONFIG_PHYLIB is not set
CONFIG_PHYLIB=y
#
# MII PHY device drivers
#
# CONFIG_MARVELL_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_QSEMI_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM63XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
@ -949,7 +969,7 @@ CONFIG_R8169=y
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
CONFIG_TIGON3=y
# CONFIG_BNX2 is not set
# CONFIG_CNIC is not set
# CONFIG_QLA3XXX is not set
@ -1572,6 +1592,7 @@ CONFIG_DVB_USB_DW2102=m
# CONFIG_DVB_USB_CINERGY_T2 is not set
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_CE6230 is not set
# CONFIG_DVB_USB_FRIIO is not set

44
tools/mkpkg/mkpkg_oscam Executable file
View File

@ -0,0 +1,44 @@
#!/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
################################################################################
echo "getting sources..."
svn checkout http://streamboard.gmc.to/svn/oscam/trunk oscam-latest
echo "getting version..."
cd oscam-latest
SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
echo $SVN_REV
cd ..
echo "copying sources..."
rm -rf oscam-$SVN_REV
cp -R oscam-latest oscam-$SVN_REV
echo "cleaning sources..."
find oscam-$SVN_REV -name .svn -exec rm -rf {} ";"
echo "packing sources..."
tar cvjf oscam-$SVN_REV.tar.bz2 oscam-$SVN_REV
echo "remove temporary sourcedir..."
rm -rf oscam-$SVN_REV