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

This commit is contained in:
Stephan Raue 2011-06-21 11:56:39 +02:00
commit 8eb052c95f
38 changed files with 155 additions and 51 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="atk"
PKG_VERSION="2.0.0"
PKG_VERSION="2.0.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -24,7 +24,7 @@
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/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

@ -24,5 +24,11 @@
. config/options $1
cd $PKG_BUILD
cmake -DWEBIF=1
mkdir -p build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWEBIF=1 \
..
make

View File

@ -1,2 +1,5 @@
0.99.2
- update to oscam-5386
0.99.1
- initial version oscam-5377

View File

@ -20,15 +20,14 @@
################################################################################
PKG_NAME="oscam"
PKG_VERSION="5377"
PKG_VERSION="5386"
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_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS="openssl"
PKG_BUILD_DEPENDS="toolchain openssl"
PKG_PRIORITY="optional"
PKG_SECTION="service/softcam"
PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul."

View File

@ -21,7 +21,7 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
#Check if process is already running
# Check if process is already running
if [ ! $(pidof oscam) ]; then
ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam"
@ -64,10 +64,11 @@ if [ ! $(pidof oscam) ]; then
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)&
# Restart process if it terminates.
(
while true; do
oscam $OSCAM_ARG > /dev/null 2>&1
usleep 250000
done
)&
fi

View File

@ -0,0 +1,41 @@
#!/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
################################################################################
. config/options $1
$SCRIPTS/unpack zlib
setup_toolchain host
cd $BUILD/zlib-*
# needed for building with cmake
rm -rf zconf.h
mkdir -p .build-host && cd .build-host
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \
..
make
make install

View File

@ -0,0 +1,36 @@
################################################################################
# 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
################################################################################
PKG_NAME="zlib-host"
PKG_VERSION=""
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.zlib.net"
PKG_URL=""
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="compress"
PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -23,8 +23,15 @@
. config/options $1
cd $PKG_BUILD
./configure --prefix=/usr --shared
# needed for building with cmake
rm -rf zconf.h
mkdir -p .build-target && cd .build-target
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
..
make
$MAKEINSTALL

View File

@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib
cp -R $PKG_BUILD/.build-target/*.so* $INSTALL/usr/lib

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="strace"
PKG_VERSION="4.5.20"
PKG_VERSION="4.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://sourceforge.net/projects/strace/"
PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

View File

@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
PKG_SITE="http://www.gtk.org/"
PKG_URL=""
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain gtk-doc"
PKG_BUILD_DEPENDS="toolchain gtk-doc zlib-host"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="glib-host: C support library"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libimobiledevice"
PKG_VERSION="1.0.4"
PKG_VERSION="1.1.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="tiff"
PKG_VERSION="4.0.0beta6"
PKG_VERSION="4.0.0beta7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -25,4 +25,4 @@
ZLIB_DIR="$BUILD/zlib-*"
mkdir -p $INSTALL/lib
cp -R $ZLIB_DIR/*.so* $INSTALL/lib
cp -R $ZLIB_DIR/.build-target/*.so* $INSTALL/lib

View File

@ -39,8 +39,12 @@ LDFLAGS="$LDFLAGS -lexpat" \
--with-threads \
--enable-unicode=ucs4 \
make
make install
make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib"
make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \
install
# symlink python binary to python2 (needed for Mesa)
ln -sf python $ROOT/$TOOLCHAIN/bin/python2

View File

@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
PKG_SITE="http://www.python.org/"
PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib openssl libffi file"
PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib openssl libffi"
PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib-host zlib openssl libffi"
PKG_PRIORITY="optional"
PKG_SECTION="lang"
PKG_SHORTDESC="python: The Python programming language"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dvb-firmware"
PKG_VERSION="0.0.7"
PKG_VERSION="0.0.9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"

View File

@ -31,6 +31,7 @@ cd $PKG_BUILD
--datadir=/usr/share \
--enable-shared \
--disable-static \
--enable-enca \
make

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="libass"
PKG_VERSION="0.9.11"
PKG_VERSION="0.9.12"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://code.google.com/p/libass/"
PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="freetype fontconfig enca"
PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca"
PKG_PRIORITY="optional"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="cifs-utils"
PKG_VERSION="4.8.1"
PKG_VERSION="5.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="ethtool"
PKG_VERSION="2.6.36"
PKG_VERSION="2.6.39"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://sourceforge.net/projects/gkernel/"
PKG_URL="$SOURCEFORGE_SRC/gkernel/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

View File

@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/build/src/*.so* $INSTALL/usr/lib

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="libssh"
PKG_VERSION="0.4.8"
PKG_VERSION="0.5.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OpenSource"
PKG_SITE="http://www.libssh.org/"
PKG_URL="http://www.libssh.org/files/0.4/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="http://www.libssh.org/files/0.5/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="zlib libgcrypt"
PKG_BUILD_DEPENDS="toolchain zlib libgcrypt"
PKG_PRIORITY="optional"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="samba"
PKG_VERSION="3.5.8"
PKG_VERSION="3.5.9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="pygobject"
PKG_VERSION="2.28.4"
PKG_VERSION="2.28.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="simplejson"
PKG_VERSION="2.1.3"
PKG_VERSION="2.1.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="usbutils"
PKG_VERSION="0.91"
PKG_VERSION="003"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -26,7 +26,7 @@ PKG_LICENSE="MIT"
PKG_SITE="http://xmlsoft.org"
PKG_URL=""
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain Python"
PKG_BUILD_DEPENDS="toolchain zlib-host Python"
PKG_PRIORITY="optional"
PKG_SECTION="textproc"
PKG_SHORTDESC="libxml: XML parser library for Gnome"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="ccache"
PKG_VERSION="3.1.4"
PKG_VERSION="3.1.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-fglrx"
PKG_VERSION="11.5"
PKG_VERSION="11.6"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="gtk+"
PKG_VERSION="2.24.4"
PKG_VERSION="2.24.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="gtk-doc"
PKG_VERSION="1.15"
PKG_VERSION="1.17"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="pango"
PKG_VERSION="1.28.4"
PKG_VERSION="1.29.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.pango.org/"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.29/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="glib cairo freetype fontconfig libX11 libXft"
PKG_BUILD_DEPENDS="toolchain glib cairo freetype fontconfig libX11 libXft"
PKG_PRIORITY="optional"

View File

@ -35,8 +35,8 @@ case $1 in
build)
deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h"
files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev"
files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/ncurses.h"
files_pkg="glibc-static libc6-dev libncurses5-dev"
;;
qemu)
if [ ! `which qemu` ]; then

View File

@ -51,6 +51,9 @@ for i in $PKG_URL; do
*.tar.gz | *.tgz)
tar xzf $f -C $3
;;
*.tar.xz | *.txz)
tar xJf $f -C $3
;;
*.7z)
mkdir -p $3/$1
7z x -o$3/$1 $f

View File

@ -58,7 +58,10 @@ rm -rf $BUILD/$1[-_]git*
if [ -n "$PKG_URL" ]; then
$SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
$SCRIPTS/extract $1 "$1*.tbz" $BUILD
$SCRIPTS/extract $1 "$1*.tar.gz" $BUILD
$SCRIPTS/extract $1 "$1*.tar.xz" $BUILD
$SCRIPTS/extract $1 "$1*.txz" $BUILD
$SCRIPTS/extract $1 "$1*.tgz" $BUILD
$SCRIPTS/extract $1 "$1*.7z" $BUILD
fi