mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' into openelec-settings
This commit is contained in:
commit
d43d4b1d4f
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/device-tmpl.cpp b/device-tmpl.cpp
|
||||||
|
index 158324b..4d9f862 100644
|
||||||
|
--- a/device-tmpl.cpp
|
||||||
|
+++ b/device-tmpl.cpp
|
||||||
|
@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca
|
||||||
|
fd_dvr = -1;
|
||||||
|
|
||||||
|
int n = Adapter;
|
||||||
|
- softcsa = (fd_ca < 0);
|
||||||
|
+ softcsa = true;
|
||||||
|
if (softcsa)
|
||||||
|
{
|
||||||
|
if (HasDecoder())
|
@ -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
|
||||||
|
@ -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"
|
||||||
|
@ -25,7 +25,5 @@
|
|||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
|
cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
|
||||||
|
|
||||||
if [ "$DEVTOOLS" = yes ]; then
|
mkdir -p $INSTALL/usr/bin
|
||||||
mkdir -p $INSTALL/usr/bin
|
cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin
|
||||||
cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin
|
|
||||||
fi
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-driver"
|
PKG_NAME="bcm2835-driver"
|
||||||
PKG_VERSION="f715140"
|
PKG_VERSION="4697c2b"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
@ -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();
|
||||||
|
@ -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 \
|
||||||
@ -36,3 +37,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
|
||||||
|
@ -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
|
||||||
|
@ -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 "{}" ";"
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
gpu_mem=128
|
gpu_mem=128
|
||||||
|
|
||||||
# SDRAM size based GPU memory split, uncomment and setup to override 'gpu_mem'
|
# SDRAM size based GPU memory split, uncomment and setup to override 'gpu_mem'
|
||||||
# gpu_mem_256=100
|
# gpu_mem_256=128
|
||||||
# gpu_mem_512=128
|
# gpu_mem_512=128
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -25,10 +25,8 @@
|
|||||||
mkdir -p $INSTALL/usr/share/bootloader
|
mkdir -p $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_BUILD/fixup.dat $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader/fixup.dat
|
||||||
cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader/start.elf
|
||||||
cp $PKG_BUILD/start.elf $INSTALL/usr/share/bootloader
|
|
||||||
cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader
|
|
||||||
|
|
||||||
cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
|
cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader
|
cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-bootloader"
|
PKG_NAME="bcm2835-bootloader"
|
||||||
PKG_VERSION="f715140"
|
PKG_VERSION="4697c2b"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="arm"
|
PKG_ARCH="arm"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
@ -30,12 +30,12 @@
|
|||||||
cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/fixup_x.dat $BOOT_ROOT
|
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/start_x.elf $BOOT_ROOT
|
|
||||||
|
|
||||||
# cleanup not more needed files
|
# cleanup not more needed files
|
||||||
rm -rf $BOOT_ROOT/loader.bin
|
rm -rf $BOOT_ROOT/loader.bin
|
||||||
|
rm -rf $BOOT_ROOT/fixup_x.dat
|
||||||
|
rm -rf $BOOT_ROOT/start_x.elf
|
||||||
|
|
||||||
# some config.txt magic
|
# some config.txt magic
|
||||||
if [ ! -f $BOOT_ROOT/config.txt ]; then
|
if [ ! -f $BOOT_ROOT/config.txt ]; then
|
||||||
@ -45,7 +45,7 @@
|
|||||||
cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \
|
cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \
|
||||||
$BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt
|
$BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt
|
||||||
else
|
else
|
||||||
sed -e "s,# gpu_mem_256=128,gpu_mem_256=100,g" -i $BOOT_ROOT/config.txt
|
sed -e "s,# gpu_mem_256=128,gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt
|
||||||
sed -e "s,# gpu_mem_512=128,gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
|
sed -e "s,# gpu_mem_512=128,gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Build optimizations (size/normal/speed)
|
# Build optimizations (size/normal/speed)
|
||||||
OPTIMIZATIONS="speed"
|
OPTIMIZATIONS="size"
|
||||||
|
|
||||||
# Project CFLAGS
|
# Project CFLAGS
|
||||||
PROJECT_CFLAGS=""
|
PROJECT_CFLAGS=""
|
||||||
@ -309,7 +309,7 @@
|
|||||||
SENSOR_SUPPORT="yes"
|
SENSOR_SUPPORT="yes"
|
||||||
|
|
||||||
# build with swap support (yes / no)
|
# build with swap support (yes / no)
|
||||||
SWAP_SUPPORT="yes"
|
SWAP_SUPPORT="no"
|
||||||
|
|
||||||
# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
|
# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
|
||||||
SWAPFILESIZE="131072"
|
SWAPFILESIZE="131072"
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user