mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #1723 from CvH/8.2-tvh
various backports from master
This commit is contained in:
Christian Hewitt
GitHub
commit
aff51d88d9
@ -158,13 +158,13 @@
|
||||
INITRAMFS_PARTED_SUPPORT="no"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
SWAP_SUPPORT="yes"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="256"
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="yes"
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
################################################################################
|
||||
# This file is part of LibreELEC - https://libreelec.tv
|
||||
# Copyright (C) 2017-present Team LibreELEC
|
||||
#
|
||||
# LibreELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# LibreELEC 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 LibreELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="blindscan-s2"
|
||||
PKG_VERSION="94cb626"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://bitbucket.org/majortom/blindscan-s2"
|
||||
PKG_URL="https://github.com/persianpros/blindscan-s2/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="blindscan-s2 is a program to blindscan digital satellite signals"
|
||||
PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
makeinstall_target() {
|
||||
:
|
||||
}
|
||||
@ -19,13 +19,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvb-fe-tool"
|
||||
PKG_VERSION="1388a04"
|
||||
PKG_VERSION="326060c"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://linuxtv.org/"
|
||||
PKG_URL="https://git.linuxtv.org/cgit.cgi/v4l-utils.git/snapshot/$PKG_VERSION.tar.xz"
|
||||
PKG_SOURCE_DIR="$PKG_VERSION*"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_TARGET="toolchain systemd"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="dvb-fe-tool: Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
|
||||
PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
################################################################################
|
||||
# This file is part of LibreELEC - https://libreelec.tv
|
||||
# Copyright (C) 2017-present Team LibreELEC
|
||||
#
|
||||
# LibreELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# LibreELEC 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 LibreELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvbsnoop"
|
||||
PKG_VERSION="c1ec72f"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://dvbsnoop.sourceforge.net/"
|
||||
PKG_URL="https://github.com/persianpros/dvbsnoop/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
|
||||
PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
makeinstall_target() {
|
||||
:
|
||||
}
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mumudvb"
|
||||
PKG_VERSION="fa9ff6e"
|
||||
PKG_VERSION="b3c9ae7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://mumudvb.net/"
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
################################################################################
|
||||
# This file is part of LibreELEC - https://libreelec.tv
|
||||
# Copyright (C) 2017-present Team LibreELEC
|
||||
#
|
||||
# LibreELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# LibreELEC 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 LibreELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="szap-s2"
|
||||
PKG_VERSION="69ff358"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
|
||||
PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_DIR="CrazyCat-${PKG_NAME}-${PKG_VERSION}*"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
|
||||
PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
makeinstall_target() {
|
||||
:
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
################################################################################
|
||||
# This file is part of LibreELEC - https://libreelec.tv
|
||||
# Copyright (C) 2017-present Team LibreELEC
|
||||
#
|
||||
# LibreELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# LibreELEC 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 LibreELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="tune-s2"
|
||||
PKG_VERSION="60cc4aa"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
|
||||
PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_DIR="CrazyCat-${PKG_NAME}-${PKG_VERSION}*"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
|
||||
PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
makeinstall_target() {
|
||||
:
|
||||
}
|
||||
@ -1,3 +1,6 @@
|
||||
103
|
||||
- update mpd to 0.20.9
|
||||
|
||||
102
|
||||
- update mpd to 0.20.3
|
||||
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mpd"
|
||||
PKG_VERSION="0.20.3"
|
||||
PKG_REV="102"
|
||||
PKG_VERSION="0.20.9"
|
||||
PKG_REV="103"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.musicpd.org"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
111
|
||||
- update to Tvheadend 4.2.2-32
|
||||
- update to Tvheadend 4.2.2-75
|
||||
|
||||
110
|
||||
- added tv_grab_file support for compressed files (gz bz2 xz)
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="tvheadend42"
|
||||
PKG_VERSION="76dbc3e"
|
||||
PKG_VERSION_NUMBER="4.2.2-32"
|
||||
PKG_VERSION="a84adb2"
|
||||
PKG_VERSION_NUMBER="4.2.2-75"
|
||||
PKG_REV="111"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@ -79,6 +79,8 @@ pre_configure_target() {
|
||||
# transcoding
|
||||
if [ "$TARGET_ARCH" = x86_64 ]; then
|
||||
export AS=$TOOLCHAIN/bin/yasm
|
||||
export LDFLAGS="$LDFLAGS -lX11 -lm -lvdpau -lva -lva-drm -lva-x11"
|
||||
export ARCH=$TARGET_ARCH
|
||||
fi
|
||||
|
||||
export CROSS_COMPILE=$TARGET_PREFIX
|
||||
@ -94,7 +96,6 @@ fi
|
||||
|
||||
post_make_target() {
|
||||
$CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
|
||||
$STRIP $PKG_BUILD/build.linux/tvheadend
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Subject: [PATCH] tvheadend: HACK ffmpeg 3.1.5 instead of 3.3
|
||||
|
||||
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
||||
--- a/Makefile.ffmpeg
|
||||
+++ b/Makefile.ffmpeg
|
||||
@@ -94,10 +94,10 @@ LIBMFX_URL = https://github.com/lu-zero/mfx_dispatch/archive/$(LIBMFX_TB)
|
||||
LIBMFX_SHA1 = 84dbdf4a6b409067e863eb9564bb2efdec6d39ce
|
||||
LIBMFX_DIFFS = libmfx.linux.path.diff
|
||||
|
||||
-FFMPEG = ffmpeg-3.3
|
||||
-FFMPEG_TB = $(FFMPEG).tar.bz2
|
||||
+FFMPEG = ffmpeg-3.1.5
|
||||
+FFMPEG_TB = $(FFMPEG).tar.bz2
|
||||
FFMPEG_URL = http://ffmpeg.org/releases/$(FFMPEG_TB)
|
||||
-FFMPEG_SHA1 = 2590af8c754ce8d55745b1e5647e498bf271dc77
|
||||
+FFMPEG_SHA1 = 053dfea8c9e057fdf237885decd03147cb2412b1
|
||||
|
||||
|
||||
# ##############################################################################
|
||||
@ -1,3 +1,11 @@
|
||||
103
|
||||
- added blindscan-s2
|
||||
- added dvbsnoop
|
||||
- added szap-s2
|
||||
- added tune-s2
|
||||
- updated dvb-fe-tool to 1.12.5
|
||||
- updated MuMuDVB to b3c9ae7
|
||||
|
||||
102
|
||||
- added MuMuDVB
|
||||
- updated w_scan to 20170107
|
||||
|
||||
@ -26,7 +26,7 @@ PKG_URL=""
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SECTION="virtual"
|
||||
PKG_SHORTDESC="DVB-Tools: is a bundle of dvb tools and programs"
|
||||
PKG_LONGDESC="This bundle currently includes dvb-apps, dvb-fe-tool, dvblast, mumudvb and w_scan."
|
||||
PKG_LONGDESC="This bundle currently includes blindscan-s2, dvb-apps, dvb-fe-tool, dvblast, dvbsnoop, mumudvb, szap-s2, tune-s2 and w_scan."
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
PKG_IS_ADDON="yes"
|
||||
@ -34,14 +34,22 @@ PKG_ADDON_NAME="DVB Tools"
|
||||
PKG_ADDON_TYPE="xbmc.python.script"
|
||||
|
||||
PKG_DEPENDS_TARGET="toolchain \
|
||||
blindscan-s2 \
|
||||
dvb-apps \
|
||||
dvb-fe-tool \
|
||||
dvblast \
|
||||
dvbsnoop \
|
||||
mumudvb \
|
||||
szap-s2 \
|
||||
tune-s2 \
|
||||
w_scan"
|
||||
|
||||
addon() {
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
||||
|
||||
# blindscan-s2
|
||||
cp -P $(get_build_dir blindscan-s2)/blindscan-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# dvb-apps
|
||||
cp -P $(get_build_dir dvb-apps)/util/dvbdate/dvbdate $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
cp -P $(get_build_dir dvb-apps)/util/dvbnet/dvbnet $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
@ -61,9 +69,18 @@ addon() {
|
||||
# dvblast
|
||||
cp -P $(get_build_dir dvblast)/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# dvbsnoop
|
||||
cp -P $(get_build_dir dvbsnoop)/.$TARGET_NAME/src/dvbsnoop $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# mumudvb
|
||||
cp -P $(get_build_dir mumudvb)/.$TARGET_NAME/src/mumudvb $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# szap-s2
|
||||
cp -P $(get_build_dir szap-s2)/szap-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# tune-s2
|
||||
cp -P $(get_build_dir tune-s2)/tune-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# w_scan
|
||||
cp -P $(get_build_dir w_scan)/.$TARGET_NAME/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
|
||||
@ -112,15 +112,6 @@
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="no"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
@ -117,15 +117,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="yes"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
@ -130,15 +130,6 @@
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
@ -118,15 +118,6 @@
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="no"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
@ -124,15 +124,6 @@
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
@ -118,15 +118,6 @@
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
@ -126,15 +126,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
# swap support enabled per default (yes / no)
|
||||
SWAP_ENABLED_DEFAULT="no"
|
||||
|
||||
# swapfile size if SWAP_SUPPORT=yes in MB
|
||||
SWAPFILESIZE="128"
|
||||
|
||||
# build with installer (yes / no)
|
||||
INSTALLER_SUPPORT="no"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user