Merge pull request #1551 from CvH/dvb-addons-8

backport of #1550
This commit is contained in:
Christian Hewitt 2017-04-21 20:31:36 +04:00 committed by GitHub
commit 29658ecb0f
9 changed files with 59 additions and 32 deletions

View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-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
@ -17,7 +17,7 @@
################################################################################
PKG_NAME="bitstream"
PKG_VERSION="1.1"
PKG_VERSION="1.2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.videolan.org"

View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-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
@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libev"
PKG_VERSION="4.22"
PKG_VERSION="4.24"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://software.schmorp.de/pkg/libev.html"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dvb-fe-tool"
PKG_VERSION="fa2f7d9"
PKG_VERSION="1388a04"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://linuxtv.org/"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dvblast"
PKG_VERSION="3.0"
PKG_VERSION="3.1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.videolan.org"

View File

@ -1,17 +0,0 @@
diff -Naur dvblast-3.0/Makefile dvblast-3.0.patch/Makefile
--- dvblast-3.0/Makefile 2015-10-05 17:51:14.000000000 +0200
+++ dvblast-3.0.patch/Makefile 2016-03-26 22:54:59.953303040 +0100
@@ -55,11 +55,11 @@
dvblast: $(OBJ_DVBLAST)
@echo "LINK $@"
- $(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDLIBS_DVBLAST) $(LDLIBS)
+ $(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDFLAGS) $(LDLIBS_DVBLAST) $(LDLIBS)
dvblastctl: $(OBJ_DVBLASTCTL)
@echo "LINK $@"
- $(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDLIBS)
+ $(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDFLAGS) $(LDLIBS)
clean:
@echo "CLEAN $(CLEAN_OBJS)"

View File

@ -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="mumudvb"
PKG_VERSION="fa9ff6e"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://mumudvb.net/"
PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_DIR="MuMuDVB-${PKG_VERSION}*"
PKG_DEPENDS_TARGET="toolchain libdvbcsa"
PKG_SECTION="tools"
PKG_SHORTDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
PKG_AUTORECONF="yes"
makeinstall_target() {
:
}

View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-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
@ -17,7 +17,7 @@
################################################################################
PKG_NAME="w_scan"
PKG_VERSION="20141122"
PKG_VERSION="20170107"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

View File

@ -1,3 +1,9 @@
102
- added MuMuDVB
- updated w_scan to 20170107
- updated dvblast to 3.1
- updated dvb-fe-tool to 1.12.3
101
- added w_scan

View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-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
@ -18,7 +18,7 @@
PKG_NAME="dvb-tools"
PKG_VERSION=""
PKG_REV="101"
PKG_REV="102"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE=""
@ -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 and w_scan."
PKG_LONGDESC="This bundle currently includes dvb-apps, dvb-fe-tool, dvblast, mumudvb and w_scan."
PKG_AUTORECONF="no"
PKG_IS_ADDON="yes"
@ -37,6 +37,7 @@ PKG_DEPENDS_TARGET="toolchain \
dvb-apps \
dvb-fe-tool \
dvblast \
mumudvb \
w_scan"
addon() {
@ -60,6 +61,9 @@ addon() {
# dvblast
cp -P $(get_build_dir dvblast)/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin
# mumudvb
cp -P $(get_build_dir mumudvb)/.$TARGET_NAME/src/mumudvb $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