mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
Merge pull request #2508 from CvH/9.0-hdhomerun
tvheadend add hdhomerun
This commit is contained in:
Matthias Reichl
GitHub
commit
0aed4af345
@ -1,5 +1,5 @@
|
||||
114
|
||||
- update to 4.2.5-27
|
||||
- update to 4.2.5-31
|
||||
- addded manual Scan-Table update
|
||||
|
||||
113
|
||||
|
||||
@ -17,16 +17,16 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="tvheadend42"
|
||||
PKG_VERSION="7a8fa15"
|
||||
PKG_SHA256="317fbd5ac0167cb64021bcfbe1f31deb4edbafaf63e6ffc385c94662706e20a1"
|
||||
PKG_VERSION_NUMBER="4.2.5-27"
|
||||
PKG_VERSION="fc63a8a"
|
||||
PKG_SHA256="38c25e191733a0e0944ec3e32de2aab6a1cff9ddfc597fc328a73579f7c8bf41"
|
||||
PKG_VERSION_NUMBER="4.2.5-31"
|
||||
PKG_REV="114"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_DIR="tvheadend-${PKG_VERSION}*"
|
||||
PKG_DEPENDS_TARGET="toolchain avahi curl dvb-apps ffmpegx libdvbcsa libiconv openssl pngquant:host Python2:host tvh-dtv-scan-tables"
|
||||
PKG_DEPENDS_TARGET="toolchain avahi curl dvb-apps ffmpegx libdvbcsa libhdhomerun libiconv openssl pngquant:host Python2:host tvh-dtv-scan-tables"
|
||||
PKG_SECTION="service"
|
||||
PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
|
||||
PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T"
|
||||
@ -72,7 +72,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
|
||||
--enable-dvbcsa \
|
||||
--enable-dvben50221 \
|
||||
--disable-dvbscan \
|
||||
--disable-hdhomerun_client \
|
||||
--enable-hdhomerun_client \
|
||||
--disable-hdhomerun_static \
|
||||
--enable-epoll \
|
||||
--enable-inotify \
|
||||
@ -101,6 +101,9 @@ pre_configure_target() {
|
||||
CFLAGS="$CFLAGS -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib"
|
||||
|
||||
# pass libhdhomerun to build
|
||||
CFLAGS="$CFLAGS -I$(get_build_dir libhdhomerun)"
|
||||
|
||||
export CROSS_COMPILE="$TARGET_PREFIX"
|
||||
export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
|
||||
}
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
fixes dvb-scan for jenkins, taken from upstream master
|
||||
|
||||
From a51cd119bef3273dd1c22362890b27c99fad8d26 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 13 Feb 2018 11:00:30 +0100
|
||||
Subject: [PATCH] Makefile: fix --disable-dvbscan, fixes #4935
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -631,13 +631,16 @@ SRCS-${CONFIG_DBUS_1} += src/dbus.c
|
||||
# Watchdog
|
||||
SRCS-${CONFIG_LIBSYSTEMD_DAEMON} += src/watchdog.c
|
||||
|
||||
+# DVB scan
|
||||
+DVBSCAN-$(CONFIG_DVBSCAN) += check_dvb_scan
|
||||
+ALL-$(CONFIG_DVBSCAN) += check_dvb_scan
|
||||
+
|
||||
# File bundles
|
||||
SRCS-${CONFIG_BUNDLE} += bundle.c
|
||||
BUNDLES-yes += src/webui/static
|
||||
BUNDLES-yes += data/conf
|
||||
BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
|
||||
BUNDLES = $(BUNDLES-yes)
|
||||
-ALL-$(CONFIG_DVBSCAN) += check_dvb_scan
|
||||
|
||||
#
|
||||
# Documentation
|
||||
@@ -831,7 +834,7 @@ $(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c
|
||||
@mkdir -p $(dir $@)
|
||||
$(pCC) $(CFLAGS) -I${ROOTDIR}/src -c -o $@ $<
|
||||
|
||||
-$(BUILDDIR)/bundle.c: check_dvb_scan make_webui
|
||||
+$(BUILDDIR)/bundle.c: $(DVBSCAN-yes) make_webui
|
||||
@mkdir -p $(dir $@)
|
||||
$(pMKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
fix libhdhomerun includes
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -362,7 +362,7 @@ if enabled hdhomerun_static; then
|
||||
else
|
||||
|
||||
if enabled_or_auto hdhomerun_client; then
|
||||
- if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
|
||||
+ if check_cc_header 'hdhomerun' libhdhomerun; then
|
||||
enable hdhomerun_client
|
||||
LDFLAGS="$LDFLAGS -lhdhomerun"
|
||||
fi
|
||||
--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
|
||||
+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "htsbuf.h"
|
||||
#include "tvhdhomerun.h"
|
||||
|
||||
-#include "libhdhomerun/hdhomerun.h"
|
||||
+#include "hdhomerun.h"
|
||||
|
||||
typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
|
||||
typedef struct tvhdhomerun_device tvhdhomerun_device_t;
|
||||
@ -1,27 +1,28 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# This file is part of LibreELEC - https://libreelec.tv
|
||||
# Copyright (C) 2016-present Team LibreELEC
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC is free software: you can redistribute it and/or modify
|
||||
# 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.
|
||||
#
|
||||
# OpenELEC is distributed in the hope that it will be useful,
|
||||
# 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 OpenELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libhdhomerun"
|
||||
PKG_VERSION="20150826"
|
||||
PKG_SHA256="907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf"
|
||||
PKG_VERSION="20171221"
|
||||
PKG_SHA256="08e22db43621b96260086a834e7c586cb92aa4b3ec30adf0adf3c7588d527ff8"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
|
||||
PKG_SITE="http://www.silicondust.com"
|
||||
PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz"
|
||||
PKG_SOURCE_DIR="$PKG_NAME"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user