mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
Stephan Raue
commit
e61360c9d3
45
packages/3rdparty/lib/xine-lib/build
vendored
45
packages/3rdparty/lib/xine-lib/build
vendored
@ -1,45 +0,0 @@
|
||||
#!/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_GUI_ADDON_DIR="/storage/.xbmc/addons/script.video.vdr-gui"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
strip_lto
|
||||
|
||||
./autogen.sh --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--with-external-ffmpeg \
|
||||
--disable-dxr3 \
|
||||
--disable-aalib \
|
||||
--disable-vcd \
|
||||
--disable-musepack
|
||||
|
||||
sed -i "s|XINE_PLUGINDIR .*|XINE_PLUGINDIR \"$VDR_GUI_ADDON_DIR/lib/xine/plugins/2.1\"|" include/configure.h
|
||||
sed -i "s|XINE_PLUGINROOT .*|XINE_PLUGINROOT \"$VDR_GUI_ADDON_DIR/lib/xine/plugins/2\"|" include/configure.h
|
||||
|
||||
# same for fonts and locales and copy them
|
||||
|
||||
make
|
||||
$MAKEINSTALL
|
||||
35
packages/3rdparty/lib/xine-lib/meta
vendored
35
packages/3rdparty/lib/xine-lib/meta
vendored
@ -1,35 +0,0 @@
|
||||
################################################################################
|
||||
# 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="xine-lib"
|
||||
PKG_VERSION="1-2-25f276f9211a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.xine-project.org/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="ffmpeg"
|
||||
PKG_BUILD_DEPENDS="toolchain ffmpeg"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="xine is a high-performance, portable and reusable multimedia playback engine."
|
||||
PKG_LONGDESC="xine is a high-performance, portable and reusable multimedia playback engine."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-plugin-dvbapi"
|
||||
PKG_VERSION="e87e15f"
|
||||
PKG_VERSION="cd93752"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d18b016..278af2b 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -156,7 +156,7 @@ libdvbapi-dvbufs9xx.so: device-ufs9xx.o
|
||||
|
||||
ifndef LIBDVBCSA
|
||||
$(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
|
||||
- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
|
||||
+ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
|
||||
endif
|
||||
|
||||
install-lib: $(SOFILE)
|
||||
16
packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch
vendored
Normal file
16
packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch
vendored
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 278af2b..996dc77 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -85,8 +85,9 @@ OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o dll.o DVBAPI.o DVBAPISetup.o SCDeviceProb
|
||||
|
||||
ifndef LIBDVBCSA
|
||||
# FFdeCSA
|
||||
-PARALLEL ?= PARALLEL_128_SSE2
|
||||
-CSAFLAGS ?= -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
|
||||
+CPUOPT ?= pentium
|
||||
+PARALLEL ?= PARALLEL_32_INT
|
||||
+CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
|
||||
FFDECSADIR = FFdecsa
|
||||
FFDECSA = $(FFDECSADIR)/FFdecsa.o
|
||||
DECSALIB = $(FFDECSA)
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur vdr-dvbapi-plugin-6e8cad7/Makefile vdr-dvbapi-plugin-6e8cad7.patch/Makefile
|
||||
--- vdr-dvbapi-plugin-6e8cad7/Makefile 2011-12-25 14:24:33.000000000 +0100
|
||||
+++ vdr-dvbapi-plugin-6e8cad7.patch/Makefile 2011-12-29 18:59:21.847652339 +0100
|
||||
@@ -80,7 +80,7 @@
|
||||
gcc -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o $@ $< -ldl
|
||||
|
||||
$(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
|
||||
- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS) -march=$(CPUOPT)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
|
||||
+ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
|
||||
|
||||
dist: clean
|
||||
@-rm -rf $(TMPDIR)/$(ARCHIVE)
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a8c7d97..6084cec 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -54,9 +54,9 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
||||
OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o DVBAPI.o DVBAPISetup.o SCDeviceProbe.o SCDVBDevice.o UDPSocket.o SCCIAdapter.o Frame.o SCCAMSlot.o
|
||||
|
||||
# FFdeCSA
|
||||
-CPUOPT ?= athlon64
|
||||
-PARALLEL ?= PARALLEL_128_SSE
|
||||
-CSAFLAGS ?= -fPIC -O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
|
||||
+CPUOPT ?= pentium
|
||||
+PARALLEL ?= PARALLEL_32_INT
|
||||
+CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
|
||||
FFDECSADIR = FFdecsa
|
||||
FFDECSA = $(FFDECSADIR)/FFdecsa.o
|
||||
FFDECSATEST = $(FFDECSADIR)/FFdecsa_test.done
|
||||
@ -1,35 +0,0 @@
|
||||
################################################################################
|
||||
# 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-skinanthra_1280_OS"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://anthra.justlinux.de/common/overview.html"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="vdr"
|
||||
PKG_BUILD_DEPENDS="toolchain vdr"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="anthra skin for text2skin plugin."
|
||||
PKG_LONGDESC="anthra skin for text2skin plugin."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
36
packages/3rdparty/multimedia/vdr-text2skin/build
vendored
36
packages/3rdparty/multimedia/vdr-text2skin/build
vendored
@ -1,36 +0,0 @@
|
||||
#!/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]*`
|
||||
|
||||
# you can not use GraphTFT together with Text2Skin if you use Imlib2!
|
||||
#IMAGELIB=imagemagick
|
||||
IMAGELIB=imlib2
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
make VDRDIR="../$VDR_DIR" \
|
||||
LIBDIR="." \
|
||||
LOCALEDIR="./locale" \
|
||||
IMAGELIB=$IMAGELIB
|
||||
35
packages/3rdparty/multimedia/vdr-text2skin/meta
vendored
35
packages/3rdparty/multimedia/vdr-text2skin/meta
vendored
@ -1,35 +0,0 @@
|
||||
################################################################################
|
||||
# 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-text2skin"
|
||||
PKG_VERSION="20120506"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://linuxtv.org/vdrwiki/index.php/Text2skin-plugin"
|
||||
PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS="vdr"
|
||||
PKG_BUILD_DEPENDS="toolchain vdr imlib2"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="text2skin is a plugin to make On Screen Display in VDR."
|
||||
PKG_LONGDESC="text2skin plugin is designed to load and interpret a set of files describing the layout of the On Screen Display and to make this "Skin" available to VDR via Setup -> OSD in the main menu."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@ -1,51 +0,0 @@
|
||||
#!/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]*)
|
||||
|
||||
export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}buildd/lib/pkgconfig"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
./configure --enable-x11 \
|
||||
--enable-vdr \
|
||||
--enable-libxine \
|
||||
--disable-dbus-glib-1 \
|
||||
--cc=$CC \
|
||||
--cxx=$CXX \
|
||||
--add-cflags="$CFLAGS"
|
||||
|
||||
# mpg2c is running on host
|
||||
make mpg2c \
|
||||
CC="$HOST_CC" \
|
||||
CFLAGS="$HOST_CFLAGS" \
|
||||
LDFLAGS="$HOST_LDFLAGS" \
|
||||
VDRDIR="../$VDR_DIR" \
|
||||
LIBDIR="." \
|
||||
LOCALEDIR="./locale"
|
||||
|
||||
make VDRDIR="../$VDR_DIR" \
|
||||
LIBDIR="." \
|
||||
LDFLAGS="-lm" \
|
||||
LOCALEDIR="./locale"
|
||||
@ -1,35 +0,0 @@
|
||||
################################################################################
|
||||
# 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-xineliboutput"
|
||||
PKG_VERSION="20120506"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://sourceforge.net/projects/xineliboutput/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="vdr xine-lib"
|
||||
PKG_BUILD_DEPENDS="toolchain vdr xine-lib"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="xine-lib based software output device for VDR."
|
||||
PKG_LONGDESC="xine-lib based software output device for VDR."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@ -37,7 +37,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
|
||||
cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live
|
||||
cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
|
||||
cp $PKG_DIR/config.plugins/commands.conf $ADDON_BUILD/$PKG_ADDON_ID/config
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
|
||||
cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
|
||||
@ -62,8 +61,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
|
||||
cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
|
||||
cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
|
||||
cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
|
||||
cp -PR $BUILD/vdr-xineliboutput-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin
|
||||
cp -PR $BUILD/vdr-text2skin-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin
|
||||
|
||||
# ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2"
|
||||
# for plugin in $ENABLED_PLUGINS; do
|
||||
@ -89,18 +86,5 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
cp -P $BUILD/libxslt-[0-9]*/libxslt/.libs/libxslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
cp -P $BUILD/libxslt-[0-9]*/libexslt/.libs/libexslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/loaders/
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/filters/
|
||||
cp $SYSROOT_PREFIX/usr/lib/libImlib2.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib/
|
||||
cp $SYSROOT_PREFIX/usr/lib/imlib2/loaders/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/loaders/
|
||||
cp $SYSROOT_PREFIX/usr/lib/imlib2/filters/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/filters/
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
|
||||
cp -PR $BUILD/vdr-plugin-streamdev-*/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/
|
||||
cp -PR $BUILD/vdr-skinanthra_1280_OS-*/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/
|
||||
rm -fr $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/themes
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/themes
|
||||
cp -P $BUILD/vdr-skinanthra_1280_OS-*/themes/* $ADDON_BUILD/$PKG_ADDON_ID/config/themes/
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
Exit -> XBMC : killall -9 vdr-sxfe
|
||||
Reboot : reboot
|
||||
PowerOff : poweroff -f
|
||||
@ -18,7 +18,4 @@
|
||||
<setting id="ENABLE_ROTORNG" value="false" />
|
||||
<setting id="ENABLE_EPGSEARCH" value="false" />
|
||||
<setting id="SOFTCAM_PLUGIN" value="sc" />
|
||||
<setting id="ENABLE_TEXT2SKIN" value="false" />
|
||||
<setting id="ENABLE_XINELIBOUTPUT" value="false" />
|
||||
<setting id="XINELIBOUTPUT_PORT" value="37890" />
|
||||
</settings>
|
||||
|
||||
@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS"
|
||||
PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="service.multimedia"
|
||||
PKG_SHORTDESC="vdr: A powerful DVB TV application"
|
||||
|
||||
@ -83,12 +83,6 @@ fi
|
||||
if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P xmltv2vdr"
|
||||
fi
|
||||
if [ "$ENABLE_XINELIBOUTPUT" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P 'xineliboutput --local=none --remote=$XINELIBOUTPUT_PORT' -s $ADDON_HOME/vdr-shutdown.sh"
|
||||
fi
|
||||
if [ "$ENABLE_TEXT2SKIN" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P text2skin"
|
||||
fi
|
||||
# dynamite must be LAST loaded plugin
|
||||
if [ "$ENABLE_DYNAMITE" == "true" ] ; then
|
||||
VDR_ARG="$VDR_ARG -P dynamite"
|
||||
@ -110,21 +104,9 @@ fi
|
||||
|
||||
if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then
|
||||
sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^OSDHeight.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^OSDSkin.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^OSDTheme.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^xineliboutput.OSD.Blending.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^xineliboutput.OSD.Size.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^xineliboutput.OSD.SoftOSD.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
|
||||
fi
|
||||
cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
|
||||
OSDHeight = 1080
|
||||
OSDSkin = anthra_1280_OS
|
||||
OSDTheme = yabluelight
|
||||
xineliboutput.OSD.Blending = 1
|
||||
xineliboutput.OSD.Size = 1280x720
|
||||
xineliboutput.OSD.SoftOSD = 1
|
||||
epgsearch.SVDRPPort = 2004
|
||||
MYDATA
|
||||
|
||||
|
||||
@ -25,9 +25,6 @@
|
||||
<string id="1045">Enable plugin: xmltv2vdr</string>
|
||||
<string id="1046">Enable epgdata.com</string>
|
||||
<string id="1047">epgdata.com PIN</string>
|
||||
<string id="1048">Enable plugin: xineliboutput</string>
|
||||
<string id="1049">xineliboutput: listen on port</string>
|
||||
<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>
|
||||
|
||||
@ -30,9 +30,6 @@
|
||||
<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
|
||||
<setting id="ENABLE_EPGDATA" type="bool" label="1046" default="false" />
|
||||
<setting id="EPGDATA_PIN" type="number" label="1047" values="" enable="!eq(-1,false)" default="1234"/>
|
||||
<setting id="ENABLE_XINELIBOUTPUT" type="bool" label="1048" default="false" />
|
||||
<setting id="XINELIBOUTPUT_PORT" type="number" label="1049" values="" enable="!eq(-1,false)" default="37890"/>
|
||||
<setting id="ENABLE_TEXT2SKIN" type="bool" label="1050" default="false" />
|
||||
<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
|
||||
<setting type="sep" />
|
||||
<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="73d99ed"
|
||||
PKG_VERSION="f715140"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manual|auto" sort="yes" default="manual" />
|
||||
<setting label="2050" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon|imonlcd|mdm166a|MtxOrb|dm140|lis|hd44780|CFontz" sort="yes" default="none" />
|
||||
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon|imonlcd|mdm166a|MtxOrb|dm140|lis|hd44780|CFontz|SureElec" sort="yes" default="none" />
|
||||
<setting label="2060" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="HDD_STANDBY" type="bool" label="2061" default="false" />
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-addon-xvdr"
|
||||
PKG_VERSION="0b3b2d4"
|
||||
PKG_VERSION="34070b5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
58
packages/mediacenter/xbmc/patches/xbmc-990.10-PR2208.patch
Normal file
58
packages/mediacenter/xbmc/patches/xbmc-990.10-PR2208.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From c1cc1b3dd1065c7a1dea33cf57fbbcae19b38c3b Mon Sep 17 00:00:00 2001
|
||||
From: Andy Maloney <andy@forident.com>
|
||||
Date: Sun, 10 Feb 2013 08:31:51 -0500
|
||||
Subject: [PATCH] Fix memory leaks & Use correct "delete" for arrays
|
||||
|
||||
---
|
||||
xbmc/network/AirTunesServer.cpp | 6 +++++-
|
||||
xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp | 2 +-
|
||||
xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp | 2 +-
|
||||
3 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
|
||||
index fe3d78d..2f30773 100644
|
||||
--- a/xbmc/network/AirTunesServer.cpp
|
||||
+++ b/xbmc/network/AirTunesServer.cpp
|
||||
@@ -339,8 +339,12 @@ ao_device* CAirTunesServer::AudioOutputFunctions::ao_open_live(int driver_id, ao
|
||||
header.durationMs = 0;
|
||||
|
||||
if (device->pipe->Write(&header, sizeof(header)) == 0)
|
||||
+ {
|
||||
+ delete device->pipe;
|
||||
+ delete device;
|
||||
return 0;
|
||||
-
|
||||
+ }
|
||||
+
|
||||
ThreadMessage tMsg = { TMSG_MEDIA_STOP };
|
||||
CApplicationMessenger::Get().SendMessage(tMsg, true);
|
||||
|
||||
diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp
|
||||
index 2191505..ffd39b9 100644
|
||||
--- a/xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp
|
||||
+++ b/xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp
|
||||
@@ -1347,7 +1347,7 @@ void Renderer::Sphere(int del_uhol_x, int del_uhol_y, float size)
|
||||
// g_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, i*2*(del_y+1), 2*del_y );
|
||||
m_pD3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2*del_uhol_y, &v[i*2*(del_uhol_y+1)], sizeof(PosColNormalUVVertex));
|
||||
|
||||
- delete v;
|
||||
+ delete [] v;
|
||||
// pd->DrawPrimitive( D3DPT_TRIANGLESTRIP, i*2*(del_y+1), 2*del_y );
|
||||
}
|
||||
|
||||
diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
|
||||
index 71e32c7..d04141b 100644
|
||||
--- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
|
||||
+++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
|
||||
@@ -634,7 +634,7 @@ void CEGLNativeTypeRaspberryPI::GetSupportedModes(HDMI_RES_GROUP_T group, std::v
|
||||
}
|
||||
}
|
||||
if (supported_modes)
|
||||
- delete supported_modes;
|
||||
+ delete [] supported_modes;
|
||||
}
|
||||
|
||||
void CEGLNativeTypeRaspberryPI::TvServiceCallback(uint32_t reason, uint32_t param1, uint32_t param2)
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
From 87cc3d07ec7eb27c065920f0741e649f72b86acd Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <peter.fruehberger@gmail.com>
|
||||
Date: Tue, 12 Feb 2013 22:29:27 +0100
|
||||
Subject: [PATCH] AE: make sure we reOpen when the flag is set or we run into
|
||||
trouble
|
||||
|
||||
---
|
||||
xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 15 +++------------
|
||||
1 file changed, 3 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
|
||||
index dc01abe..085ae30 100644
|
||||
--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
|
||||
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
|
||||
@@ -1055,21 +1055,12 @@ void CSoftAE::Run()
|
||||
{
|
||||
bool restart = false;
|
||||
|
||||
- /* Clean Up what the suspend guy might have forgotten */
|
||||
- // ProcessSuspending() cannot guarantee that we get our sink back softresumed
|
||||
- // that is a big problem as another thread could start adding packets
|
||||
- // this must be checked here, before writing anything on the sinks
|
||||
- if(m_sinkIsSuspended && m_sink)
|
||||
- {
|
||||
- CLog::Log(LOGDEBUG, "CSoftAE::Run - Someone has forgotten to resume us (device resumed)");
|
||||
- m_reOpen = !m_sink->SoftResume() || m_reOpen;
|
||||
- m_sinkIsSuspended = false;
|
||||
- }
|
||||
- if ((this->*m_outputStageFn)(hasAudio) > 0)
|
||||
+ /* with the new non blocking implementation - we just reOpen here, when it tells reOpen */
|
||||
+ if (!m_reOpen && (this->*m_outputStageFn)(hasAudio) > 0)
|
||||
hasAudio = false; /* taken some audio - reset our silence flag */
|
||||
|
||||
/* if we have enough room in the buffer */
|
||||
- if (m_buffer.Free() >= m_frameSize)
|
||||
+ if (!m_reOpen && m_buffer.Free() >= m_frameSize)
|
||||
{
|
||||
/* take some data for our use from the buffer */
|
||||
uint8_t *out = (uint8_t*)m_buffer.Take(m_frameSize);
|
||||
--
|
||||
1.7.10
|
||||
|
||||
174
packages/mediacenter/xbmc/patches/xbmc-990.12-2058.patch
Normal file
174
packages/mediacenter/xbmc/patches/xbmc-990.12-2058.patch
Normal file
@ -0,0 +1,174 @@
|
||||
From 6e28059b93220b1188461bfc99709cf7d27ae11c Mon Sep 17 00:00:00 2001
|
||||
From: norbini <norbini@norbini.co.uk>
|
||||
Date: Wed, 9 Jan 2013 23:08:02 +0000
|
||||
Subject: [PATCH] Override CSFTPDirectory::Exists() method to correctly report
|
||||
whether an SFTP url represents a directory or not. Fixes
|
||||
ticket #13784.
|
||||
|
||||
Refactored CSFTPSession::Exists() into FileExists() and DirectoryExists() methods, and have CSFTPFile and CSFTPDirectory classes use them.
|
||||
This means that Exists() calls on these classes correctly only return true if the url refers to an item of the appropriate type (e.g. a file or a directory).
|
||||
---
|
||||
xbmc/filesystem/SFTPDirectory.cpp | 15 ++++++++++
|
||||
xbmc/filesystem/SFTPDirectory.h | 1 +
|
||||
xbmc/filesystem/SFTPFile.cpp | 55 +++++++++++++++++++++++++++++--------
|
||||
xbmc/filesystem/SFTPFile.h | 4 ++-
|
||||
4 files changed, 63 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/xbmc/filesystem/SFTPDirectory.cpp b/xbmc/filesystem/SFTPDirectory.cpp
|
||||
index ed04eb2..a7d7c93 100644
|
||||
--- a/xbmc/filesystem/SFTPDirectory.cpp
|
||||
+++ b/xbmc/filesystem/SFTPDirectory.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "SFTPDirectory.h"
|
||||
#ifdef HAS_FILESYSTEM_SFTP
|
||||
+#include "utils/log.h"
|
||||
#include "URL.h"
|
||||
|
||||
using namespace XFILE;
|
||||
@@ -39,4 +40,18 @@ bool CSFTPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &item
|
||||
CSFTPSessionPtr session = CSFTPSessionManager::CreateSession(url);
|
||||
return session->GetDirectory(url.GetWithoutFilename().c_str(), url.GetFileName().c_str(), items);
|
||||
}
|
||||
+
|
||||
+bool CSFTPDirectory::Exists(const char* strPath)
|
||||
+{
|
||||
+ CURL url(strPath);
|
||||
+
|
||||
+ CSFTPSessionPtr session = CSFTPSessionManager::CreateSession(url);
|
||||
+ if (session)
|
||||
+ return session->DirectoryExists(url.GetFileName().c_str());
|
||||
+ else
|
||||
+ {
|
||||
+ CLog::Log(LOGERROR, "SFTPDirectory: Failed to create session to check exists");
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
#endif
|
||||
diff --git a/xbmc/filesystem/SFTPDirectory.h b/xbmc/filesystem/SFTPDirectory.h
|
||||
index 82ef542..bc94a83 100644
|
||||
--- a/xbmc/filesystem/SFTPDirectory.h
|
||||
+++ b/xbmc/filesystem/SFTPDirectory.h
|
||||
@@ -35,6 +35,7 @@
|
||||
CSFTPDirectory(void);
|
||||
virtual ~CSFTPDirectory(void);
|
||||
virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
|
||||
+ virtual bool Exists(const char* strPath);
|
||||
};
|
||||
}
|
||||
#endif
|
||||
diff --git a/xbmc/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp
|
||||
index d176969..34b797f 100644
|
||||
--- a/xbmc/filesystem/SFTPFile.cpp
|
||||
+++ b/xbmc/filesystem/SFTPFile.cpp
|
||||
@@ -35,6 +35,11 @@
|
||||
#pragma comment(lib, "ssh.lib")
|
||||
#endif
|
||||
|
||||
+#ifdef TARGET_WINDOWS
|
||||
+#define S_ISDIR(m) ((m & _S_IFDIR) != 0)
|
||||
+#define S_ISREG(m) ((m & _S_IFREG) != 0)
|
||||
+#endif
|
||||
+
|
||||
#ifdef _MSC_VER
|
||||
#define O_RDONLY _O_RDONLY
|
||||
#endif
|
||||
@@ -187,19 +192,20 @@ bool CSFTPSession::GetDirectory(const CStdString &base, const CStdString &folder
|
||||
return false;
|
||||
}
|
||||
|
||||
-bool CSFTPSession::Exists(const char *path)
|
||||
+bool CSFTPSession::DirectoryExists(const char *path)
|
||||
{
|
||||
bool exists = false;
|
||||
- CSingleLock lock(m_critSect);
|
||||
- if(m_connected)
|
||||
- {
|
||||
- sftp_attributes attributes = sftp_stat(m_sftp_session, CorrectPath(path).c_str());
|
||||
- exists = attributes != NULL;
|
||||
+ uint32_t permissions = 0;
|
||||
+ exists = GetItemPermissions(path, permissions);
|
||||
+ return exists && S_ISDIR(permissions);
|
||||
+}
|
||||
|
||||
- if (attributes)
|
||||
- sftp_attributes_free(attributes);
|
||||
- }
|
||||
- return exists;
|
||||
+bool CSFTPSession::FileExists(const char *path)
|
||||
+{
|
||||
+ bool exists = false;
|
||||
+ uint32_t permissions = 0;
|
||||
+ exists = GetItemPermissions(path, permissions);
|
||||
+ return exists && S_ISREG(permissions);
|
||||
}
|
||||
|
||||
int CSFTPSession::Stat(const char *path, struct __stat64* buffer)
|
||||
@@ -422,6 +428,33 @@ void CSFTPSession::Disconnect()
|
||||
m_session = NULL;
|
||||
}
|
||||
|
||||
+/*!
|
||||
+ \brief Gets POSIX compatible permissions information about the specified file or directory.
|
||||
+ \param path Remote SSH path to the file or directory.
|
||||
+ \param permissions POSIX compatible permissions information for the file or directory (if it exists). i.e. can use macros S_ISDIR() etc.
|
||||
+ \return Returns \e true, if it was possible to get permissions for the file or directory, \e false otherwise.
|
||||
+ */
|
||||
+bool CSFTPSession::GetItemPermissions(const char *path, uint32_t &permissions)
|
||||
+{
|
||||
+ bool gotPermissions = false;
|
||||
+ CSingleLock lock(m_critSect);
|
||||
+ if(m_connected)
|
||||
+ {
|
||||
+ sftp_attributes attributes = sftp_stat(m_sftp_session, CorrectPath(path).c_str());
|
||||
+ if (attributes)
|
||||
+ {
|
||||
+ if (attributes->flags & SSH_FILEXFER_ATTR_PERMISSIONS)
|
||||
+ {
|
||||
+ permissions = attributes->permissions;
|
||||
+ gotPermissions = true;
|
||||
+ }
|
||||
+
|
||||
+ sftp_attributes_free(attributes);
|
||||
+ }
|
||||
+ }
|
||||
+ return gotPermissions;
|
||||
+}
|
||||
+
|
||||
CCriticalSection CSFTPSessionManager::m_critSect;
|
||||
map<CStdString, CSFTPSessionPtr> CSFTPSessionManager::sessions;
|
||||
|
||||
@@ -554,7 +587,7 @@ bool CSFTPFile::Exists(const CURL& url)
|
||||
{
|
||||
CSFTPSessionPtr session = CSFTPSessionManager::CreateSession(url);
|
||||
if (session)
|
||||
- return session->Exists(url.GetFileName().c_str());
|
||||
+ return session->FileExists(url.GetFileName().c_str());
|
||||
else
|
||||
{
|
||||
CLog::Log(LOGERROR, "SFTPFile: Failed to create session to check exists");
|
||||
diff --git a/xbmc/filesystem/SFTPFile.h b/xbmc/filesystem/SFTPFile.h
|
||||
index 7d3574c..1ac83c8 100644
|
||||
--- a/xbmc/filesystem/SFTPFile.h
|
||||
+++ b/xbmc/filesystem/SFTPFile.h
|
||||
@@ -58,7 +58,8 @@ class CSFTPSession
|
||||
sftp_file CreateFileHande(const CStdString &file);
|
||||
void CloseFileHandle(sftp_file handle);
|
||||
bool GetDirectory(const CStdString &base, const CStdString &folder, CFileItemList &items);
|
||||
- bool Exists(const char *path);
|
||||
+ bool DirectoryExists(const char *path);
|
||||
+ bool FileExists(const char *path);
|
||||
int Stat(const char *path, struct __stat64* buffer);
|
||||
int Seek(sftp_file handle, uint64_t position);
|
||||
int Read(sftp_file handle, void *buffer, size_t length);
|
||||
@@ -68,6 +69,7 @@ class CSFTPSession
|
||||
bool VerifyKnownHost(ssh_session session);
|
||||
bool Connect(const CStdString &host, unsigned int port, const CStdString &username, const CStdString &password);
|
||||
void Disconnect();
|
||||
+ bool GetItemPermissions(const char *path, uint32_t &permissions);
|
||||
CCriticalSection m_critSect;
|
||||
|
||||
bool m_connected;
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="73d99ed"
|
||||
PKG_VERSION="f715140"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
# some config.txt magic
|
||||
if [ ! -f $BOOT_ROOT/config.txt ]; then
|
||||
cp $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT
|
||||
elif [ ! `grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt` ]; then
|
||||
elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then
|
||||
mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk
|
||||
cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \
|
||||
$BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt
|
||||
|
||||
@ -295,7 +295,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES="uvesafb xhci-hcd"
|
||||
|
||||
@ -295,7 +295,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES="uvesafb xhci-hcd"
|
||||
|
||||
@ -295,7 +295,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES="uvesafb xhci-hcd"
|
||||
|
||||
@ -295,7 +295,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES="uvesafb xhci-hcd"
|
||||
|
||||
@ -295,7 +295,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES="xhci-hcd"
|
||||
|
||||
@ -295,7 +295,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES=""
|
||||
@ -309,10 +309,10 @@
|
||||
SENSOR_SUPPORT="yes"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
SWAP_SUPPORT="yes"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
|
||||
SWAPFILESIZE="262144"
|
||||
SWAPFILESIZE="131072"
|
||||
|
||||
# build with automatic update support (yes / no)
|
||||
UPDATE_SUPPORT="yes"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -290,7 +290,7 @@
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz"
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec"
|
||||
|
||||
# Modules to install in initramfs for early boot
|
||||
INITRAMFS_MODULES="uvesafb xhci-hcd"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user