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

This commit is contained in:
Stephan Raue 2013-02-19 01:07:39 +01:00
commit 9c410eaeef
10 changed files with 33 additions and 13 deletions

View File

@ -1,3 +1,11 @@
3.0.4
- update to vdr-1.1.33
- update to vdr-plugin-dvbapi-cd93752
- update to vdr-plugin-streamdev-f58086a
- update to vdr-epgsearch-0fc4817
- remove text2skin plugin
- remove xinelib plugin
3.0.3 3.0.3
- update to vdr-sc-620 - update to vdr-sc-620
- update to vdr-plugin-xvdr-c43033c - update to vdr-plugin-xvdr-c43033c

View File

@ -21,7 +21,7 @@
PKG_NAME="vdr-addon" PKG_NAME="vdr-addon"
PKG_VERSION="3.0" PKG_VERSION="3.0"
PKG_REV="3" PKG_REV="4"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv" PKG_SITE="http://www.openelec.tv"

View File

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

View File

@ -23,6 +23,7 @@
. config/options $1 . config/options $1
PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`" PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`"
PYTHON_HOST_LIBDIR="`ls -d $ROOT/$TOOLCHAIN/lib/python*`"
cd $PKG_BUILD cd $PKG_BUILD
./configure --host=$TARGET_NAME \ ./configure --host=$TARGET_NAME \
@ -37,3 +38,9 @@ cd $PKG_BUILD
make make
$MAKEINSTALL $MAKEINSTALL
python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./pygtk.py -f
python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./dsextras.py -f
python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./gobject -f
python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./glib -f
python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./gio -f

View File

@ -28,21 +28,21 @@ mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/glib/.libs/libpyglib*.so* $INSTALL/usr/lib cp -P $PKG_BUILD/glib/.libs/libpyglib*.so* $INSTALL/usr/lib
mkdir -p $PYTHON_LIB_DIR/site-packages mkdir -p $PYTHON_LIB_DIR/site-packages
cp $PKG_BUILD/pygtk.py $PYTHON_LIB_DIR/site-packages cp $PKG_BUILD/pygtk.pyo $PYTHON_LIB_DIR/site-packages
echo "gtk-2.0" > $PYTHON_LIB_DIR/site-packages/pygtk.pth echo "gtk-2.0" > $PYTHON_LIB_DIR/site-packages/pygtk.pth
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0 mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0
cp $PKG_BUILD/dsextras.py $PYTHON_LIB_DIR/site-packages/gtk-2.0 cp $PKG_BUILD/dsextras.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
cp $PKG_BUILD/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject cp $PKG_BUILD/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
cp $PKG_BUILD/gobject/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject cp $PKG_BUILD/gobject/*.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
cp $PKG_BUILD/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib cp $PKG_BUILD/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
cp $PKG_BUILD/glib/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib cp $PKG_BUILD/glib/*.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio cp $PKG_BUILD/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio cp $PKG_BUILD/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio cp $PKG_BUILD/gio/*.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio

View File

@ -38,3 +38,5 @@ ac_cv_func_malloc_0_nonnull=yes \
python setup.py build --cross-compile python setup.py build --cross-compile
python setup.py install --root=./.install --prefix=/usr python setup.py install --root=./.install --prefix=/usr
find ./.install -name "*.py" -exec rm -rf "{}" ";"

View File

@ -23,6 +23,7 @@
. config/options $1 . config/options $1
PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`" PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`"
PYTHON_HOST_LIBDIR="`ls -d $ROOT/$TOOLCHAIN/lib/python*`"
cd $PKG_BUILD cd $PKG_BUILD
./configure --host=$TARGET_NAME \ ./configure --host=$TARGET_NAME \
@ -35,3 +36,5 @@ cd $PKG_BUILD
make CFLAGS="$TARGET_CFLAGS" make CFLAGS="$TARGET_CFLAGS"
$MAKEINSTALL $MAKEINSTALL
python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./dbus -f

View File

@ -29,7 +29,7 @@ mkdir -p $PYTHON_LIB_DIR/site-packages
cp -P $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages cp -P $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages
mkdir -p $PYTHON_LIB_DIR/site-packages/dbus mkdir -p $PYTHON_LIB_DIR/site-packages/dbus
cp $PKG_BUILD/dbus/*.py* $PYTHON_LIB_DIR/site-packages/dbus cp $PKG_BUILD/dbus/*.pyo $PYTHON_LIB_DIR/site-packages/dbus
mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop
cp $PKG_BUILD/dbus/mainloop/*.py* $PYTHON_LIB_DIR/site-packages/dbus/mainloop cp $PKG_BUILD/dbus/mainloop/*.pyo $PYTHON_LIB_DIR/site-packages/dbus/mainloop

View File

@ -25,6 +25,6 @@
mkdir -p $RELEASE_DIR/3rdparty/bootloader mkdir -p $RELEASE_DIR/3rdparty/bootloader
cp -PR $BUILD/bcm2835-bootloader-*/LICENCE* $RELEASE_DIR/3rdparty/bootloader/ cp -PR $BUILD/bcm2835-bootloader-*/LICENCE* $RELEASE_DIR/3rdparty/bootloader/
cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/3rdparty/bootloader/ cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/3rdparty/bootloader/
cp -PR $BUILD/bcm2835-bootloader-*/fixup.dat $RELEASE_DIR/3rdparty/bootloader/ cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/3rdparty/bootloader/fixup.dat
cp -PR $BUILD/bcm2835-bootloader-*/start.elf $RELEASE_DIR/3rdparty/bootloader/ cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/3rdparty/bootloader/start.elf

View File

@ -77,7 +77,7 @@
esac esac
# Build optimizations (size/normal/speed) # Build optimizations (size/normal/speed)
OPTIMIZATIONS="size" OPTIMIZATIONS="speed"
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="" PROJECT_CFLAGS=""