mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
820ec0ec52
4
packages/3rdparty/lib/ccid/meta
vendored
4
packages/3rdparty/lib/ccid/meta
vendored
@ -19,12 +19,12 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="ccid"
|
PKG_NAME="ccid"
|
||||||
PKG_VERSION="1.4.9"
|
PKG_VERSION="1.4.10"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="LGPL"
|
PKG_LICENSE="LGPL"
|
||||||
PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
|
PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
|
||||||
PKG_URL="https://alioth.debian.org/frs/download.php/3866/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
PKG_URL="https://alioth.debian.org/frs/download.php/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||||
PKG_DEPENDS=""
|
PKG_DEPENDS=""
|
||||||
PKG_BUILD_DEPENDS="toolchain pcsc-lite"
|
PKG_BUILD_DEPENDS="toolchain pcsc-lite"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
8
packages/3rdparty/lib/cxxtools/build
vendored
8
packages/3rdparty/lib/cxxtools/build
vendored
@ -43,13 +43,17 @@ cd ..
|
|||||||
|
|
||||||
setup_toolchain target
|
setup_toolchain target
|
||||||
|
|
||||||
|
CFLAGS="$CFLAGS -fPIC"
|
||||||
|
CXXFLAGS="$CXXFLAGS -fPIC"
|
||||||
|
LDFLAGS="$LDFLAGS -fPIC"
|
||||||
|
|
||||||
mkdir -p .build-target && cd .build-target
|
mkdir -p .build-target && cd .build-target
|
||||||
../configure --host=$TARGET_NAME \
|
../configure --host=$TARGET_NAME \
|
||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--disable-static \
|
--enable-static \
|
||||||
--enable-shared \
|
--disable-shared \
|
||||||
--disable-demos \
|
--disable-demos \
|
||||||
--disable-unittest
|
--disable-unittest
|
||||||
|
|
||||||
|
2
packages/3rdparty/lib/libxslt/build
vendored
2
packages/3rdparty/lib/libxslt/build
vendored
@ -33,7 +33,7 @@ fi
|
|||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
--enable-shared \
|
--disable-shared \
|
||||||
$CONFIG_LIBXML \
|
$CONFIG_LIBXML \
|
||||||
--disable-ipv6 \
|
--disable-ipv6 \
|
||||||
--without-python \
|
--without-python \
|
||||||
|
2
packages/3rdparty/lib/libzip/build
vendored
2
packages/3rdparty/lib/libzip/build
vendored
@ -27,6 +27,8 @@ cd $PKG_BUILD
|
|||||||
./configure \
|
./configure \
|
||||||
--host=$TARGET_NAME \
|
--host=$TARGET_NAME \
|
||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
|
--enable-static \
|
||||||
|
--disable-shared \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
|
|
||||||
$MAKEINSTALL
|
$MAKEINSTALL
|
||||||
|
@ -25,7 +25,7 @@ PKG_ARCH="any"
|
|||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
|
PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
|
||||||
PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||||
PKG_DEPENDS="vdr curl libzip libxml2 libxslt"
|
PKG_DEPENDS="vdr curl libxml2"
|
||||||
PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
|
PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="multimedia"
|
PKG_SECTION="multimedia"
|
||||||
|
4
packages/3rdparty/system/pcsc-lite/build
vendored
4
packages/3rdparty/system/pcsc-lite/build
vendored
@ -30,8 +30,8 @@ PCSCD_ADDON_DIR="/storage/.xbmc/addons/service.system.pcscd-addon"
|
|||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--enable-shared \
|
--disable-shared \
|
||||||
--disable-static \
|
--enable-static \
|
||||||
--disable-libudev \
|
--disable-libudev \
|
||||||
--enable-libusb \
|
--enable-libusb \
|
||||||
--enable-usbdropdir=$PCSCD_ADDON_DIR/drivers
|
--enable-usbdropdir=$PCSCD_ADDON_DIR/drivers
|
||||||
|
@ -30,6 +30,3 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
|
|||||||
cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
|
cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
|
||||||
find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
|
find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
|
||||||
rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE
|
rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
cp $BUILD/libevent-[0-9]*/.libs/libevent*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
3.0.5 (in progress
|
3.0.5
|
||||||
- config cleanup (peer limits)
|
- config cleanup (peer limits)
|
||||||
|
|
||||||
3.0.4
|
3.0.4
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
PKG_NAME="transmission"
|
PKG_NAME="transmission"
|
||||||
PKG_VERSION="2.77"
|
PKG_VERSION="2.77"
|
||||||
PKG_REV="4"
|
PKG_REV="5"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
PKG_SITE="http://www.transmissionbt.com/"
|
PKG_SITE="http://www.transmissionbt.com/"
|
||||||
|
@ -80,11 +80,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
|||||||
cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
|
cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||||
cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||||
cp -P $BUILD/libzip-[0-9]*/lib/.libs/libzip*.so* $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/config/plugins/streamdev-server
|
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
|
cp -PR $BUILD/vdr-plugin-streamdev-*/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
|
||||||
|
@ -30,7 +30,3 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
|||||||
cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
|
cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||||
cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin
|
cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||||
cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
|
cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
cp -aP $BUILD/pcsc-lite-*/src/.libs/libpcsclite.so $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
cp -aP $BUILD/pcsc-lite-*/src/.libs/libpcsclite.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
3.0.11
|
||||||
|
- update to oscam-8678
|
||||||
|
|
||||||
|
3.0.10
|
||||||
|
- update to oscam-8636
|
||||||
|
|
||||||
3.0.9
|
3.0.9
|
||||||
- update to oscam-8568
|
- update to oscam-8568
|
||||||
|
|
||||||
|
@ -20,8 +20,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="oscam"
|
PKG_NAME="oscam"
|
||||||
PKG_VERSION="8636"
|
PKG_VERSION="8678"
|
||||||
PKG_REV="10"
|
PKG_REV="11"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
|
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index cd52430..b01b9fc 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -530,6 +530,7 @@ if (HAVE_PCSC)
|
||||||
|
if (NOT OSCamOperatingSystem MATCHES "Mac OS X")
|
||||||
|
if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin")
|
||||||
|
target_link_libraries (${exe_name} pcsclite)
|
||||||
|
+ target_link_libraries (${exe_name} pthread)
|
||||||
|
endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin")
|
||||||
|
endif (NOT OSCamOperatingSystem MATCHES "Mac OS X")
|
||||||
|
endif (HAVE_PCSC)
|
@ -27,10 +27,6 @@
|
|||||||
|
|
||||||
cp -Pa $BUILD/pcsc-lite-*/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin
|
cp -Pa $BUILD/pcsc-lite-*/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
cp -Pa $BUILD/pcsc-lite-*/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
cp -Pa $BUILD/pcsc-lite-*/src/spy/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
|
||||||
|
|
||||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
|
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
|
||||||
cp -Pa $BUILD/ccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
|
cp -Pa $BUILD/ccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
|
||||||
|
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
3.0.5
|
||||||
|
- update to libccid-1.4.10
|
||||||
|
|
||||||
3.0.4
|
3.0.4
|
||||||
- update to pcsc-lite-1.8.8
|
- update to pcsc-lite-1.8.8
|
||||||
- update to libccid-1.4.9
|
- update to libccid-1.4.9
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
PKG_NAME="pcscd-addon"
|
PKG_NAME="pcscd-addon"
|
||||||
PKG_VERSION="3.0"
|
PKG_VERSION="3.0"
|
||||||
PKG_REV="4"
|
PKG_REV="5"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.openelec.tv"
|
PKG_SITE="http://www.openelec.tv"
|
||||||
|
@ -29,8 +29,8 @@ cd $PKG_BUILD
|
|||||||
--exec-prefix=/usr \
|
--exec-prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--datadir=/usr/share \
|
--datadir=/usr/share \
|
||||||
--enable-shared \
|
--disable-shared \
|
||||||
--disable-static \
|
--enable-static \
|
||||||
--enable-openssl
|
--enable-openssl
|
||||||
|
|
||||||
make
|
make
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="connman"
|
PKG_NAME="connman"
|
||||||
PKG_VERSION="76c47b9"
|
PKG_VERSION="0515b22"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user