mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
tvheadend42: update to 4.1.2134
- update TvH icon to the new official icon
This commit is contained in:
parent
952c425aa1
commit
c502a72ded
@ -1,6 +1,9 @@
|
|||||||
|
8.0.103
|
||||||
|
- update to Tvheadend 4.1.2134
|
||||||
|
|
||||||
8.0.102
|
8.0.102
|
||||||
- Update for LibreELEC 8.0
|
- update for LibreELEC 8.0
|
||||||
- Update to Tvheadend 4.1.1945
|
- update to Tvheadend 4.1.1945
|
||||||
- fix the XMLTV import script
|
- fix the XMLTV import script
|
||||||
|
|
||||||
7.0.100
|
7.0.100
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 19 KiB |
@ -17,9 +17,9 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="tvheadend42"
|
PKG_NAME="tvheadend42"
|
||||||
PKG_VERSION="5374573"
|
PKG_VERSION="0bc30b9"
|
||||||
PKG_VERSION_NUMBER="4.1.1945"
|
PKG_VERSION_NUMBER="4.1.2134"
|
||||||
PKG_REV="102"
|
PKG_REV="103"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.tvheadend.org"
|
PKG_SITE="http://www.tvheadend.org"
|
||||||
@ -29,12 +29,12 @@ PKG_DEPENDS_TARGET="toolchain curl libdvbcsa libiconv libressl Python:host yasm"
|
|||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="service"
|
PKG_SECTION="service"
|
||||||
PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
|
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"
|
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"
|
||||||
|
PKG_AUTORECONF="no"
|
||||||
|
|
||||||
PKG_IS_ADDON="yes"
|
PKG_IS_ADDON="yes"
|
||||||
PKG_ADDON_NAME="Tvheadend 4.2"
|
PKG_ADDON_NAME="Tvheadend 4.2"
|
||||||
PKG_ADDON_TYPE="xbmc.service"
|
PKG_ADDON_TYPE="xbmc.service"
|
||||||
PKG_AUTORECONF="no"
|
|
||||||
PKG_ADDON_REPOVERSION="8.0"
|
PKG_ADDON_REPOVERSION="8.0"
|
||||||
|
|
||||||
# transcoding only for generic
|
# transcoding only for generic
|
||||||
@ -62,6 +62,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
|
|||||||
--disable-uriparser \
|
--disable-uriparser \
|
||||||
$TVH_TRANSCODING \
|
$TVH_TRANSCODING \
|
||||||
--enable-tvhcsa \
|
--enable-tvhcsa \
|
||||||
|
--enable-trace \
|
||||||
--nowerror \
|
--nowerror \
|
||||||
--python=$ROOT/$TOOLCHAIN/bin/python"
|
--python=$ROOT/$TOOLCHAIN/bin/python"
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
From: Team LibreELEC - https://LibreELEC.tv
|
From: Team LibreELEC - https://LibreELEC.tv
|
||||||
Subject: adjust Tvheadend ffmpeg build to work with LibreELEC (transcoding) 06.04.2016
|
Subject: adjust Tvheadend ffmpeg build to work with LibreELEC (transcoding) 07.05.2016
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -91,50 +91,65 @@ FFMPEG_CONFIG := \
|
@@ -97,50 +97,65 @@ FFMPEG_CONFIG := \
|
||||||
PKG_CONFIG_LIBDIR=$(FFMPEG_LIBDIR)/pkgconfig $(PKG_CONFIG) \
|
PKG_CONFIG_LIBDIR=$(FFMPEG_LIBDIR)/pkgconfig $(PKG_CONFIG) \
|
||||||
--define-variable=prefix=$(FFMPEG_PREFIX) --static
|
--define-variable=prefix=$(FFMPEG_PREFIX) --static
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ diff --git a/Makefile b/Makefile
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# LIBAV ########################################################################
|
# LIBAV ########################################################################
|
||||||
@@ -606,7 +606,7 @@
|
@@ -613,7 +628,7 @@ reconfigure:
|
||||||
|
|
||||||
# Binary
|
# Binary
|
||||||
${PROG}: .config.mk make_webui $(OBJS)
|
${PROG}: .config.mk make_webui $(OBJS)
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
From: Team LibreELEC - https://LibreELEC.tv
|
From: Team LibreELEC - https://LibreELEC.tv
|
||||||
Subject: adjust Tvheadend ffmpeg build to work with LibreELEC (transcoding) 06.04.2016
|
Subject: adjust Tvheadend ffmpeg build to work with LibreELEC (transcoding) 07.05.2016
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
||||||
--- a/Makefile.ffmpeg
|
--- a/Makefile.ffmpeg
|
||||||
+++ b/Makefile.ffmpeg
|
+++ b/Makefile.ffmpeg
|
||||||
@@ -24,6 +24,9 @@
|
@@ -24,6 +24,9 @@ FFMPEG_HOST := $(ARCH)-linux-gnu
|
||||||
FFMPEG_TARGET := x86-linux-gcc
|
FFMPEG_TARGET := x86-linux-gcc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
|||||||
unexport CFLAGS
|
unexport CFLAGS
|
||||||
unexport LDFLAGS
|
unexport LDFLAGS
|
||||||
|
|
||||||
@@ -135,7 +141,7 @@
|
@@ -145,7 +148,7 @@ $(LIB_ROOT)/$(YASM)/.tvh_download:
|
||||||
|
|
||||||
$(LIB_ROOT)/$(YASM)/.tvh_build: \
|
$(LIB_ROOT)/$(YASM)/.tvh_build: \
|
||||||
$(LIB_ROOT)/$(YASM)/.tvh_download
|
$(LIB_ROOT)/$(YASM)/.tvh_download
|
||||||
@ -25,7 +25,7 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
|||||||
DESTDIR=$(EBUILDIR) \
|
DESTDIR=$(EBUILDIR) \
|
||||||
$(MAKE) -C $(LIB_ROOT)/$(YASM) install
|
$(MAKE) -C $(LIB_ROOT)/$(YASM) install
|
||||||
@touch $@
|
@touch $@
|
||||||
@@ -224,6 +226,7 @@
|
@@ -238,6 +241,7 @@ $(LIB_ROOT)/$(LIBX265)/.tvh_build: \
|
||||||
cd $(LIB_ROOT)/$(LIBX265)/build/linux && cmake -G "Unix Makefiles" \
|
cd $(LIB_ROOT)/$(LIBX265)/build/linux && cmake -G "Unix Makefiles" \
|
||||||
-DCMAKE_INSTALL_PREFIX="/ffmpeg" \
|
-DCMAKE_INSTALL_PREFIX="/ffmpeg" \
|
||||||
-DENABLE_SHARED:BOOL=OFF \
|
-DENABLE_SHARED:BOOL=OFF \
|
||||||
@ -33,7 +33,7 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
|||||||
../../source
|
../../source
|
||||||
DESTDIR=$(EBUILDIR) \
|
DESTDIR=$(EBUILDIR) \
|
||||||
$(MAKE) -C $(LIB_ROOT)/$(LIBX265)/build/linux install
|
$(MAKE) -C $(LIB_ROOT)/$(LIBX265)/build/linux install
|
||||||
@@ -257,7 +260,7 @@
|
@@ -271,7 +275,7 @@ endif
|
||||||
ifeq (yes,$(CONFIG_LIBVPX_STATIC))
|
ifeq (yes,$(CONFIG_LIBVPX_STATIC))
|
||||||
|
|
||||||
ifneq (,$(FFMPEG_TARGET))
|
ifneq (,$(FFMPEG_TARGET))
|
||||||
@ -42,36 +42,36 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
$(LIB_ROOT)/$(LIBVPX)/.tvh_download:
|
$(LIB_ROOT)/$(LIBVPX)/.tvh_download:
|
||||||
@@ -268,7 +271,7 @@
|
@@ -283,7 +287,7 @@ $(LIB_ROOT)/$(LIBVPX)/.tvh_build: \
|
||||||
$(LIB_ROOT)/$(LIBVPX)/.tvh_build: \
|
|
||||||
$(LIB_ROOT)/$(YASM)/.tvh_build \
|
$(LIB_ROOT)/$(YASM)/.tvh_build \
|
||||||
$(LIB_ROOT)/$(LIBVPX)/.tvh_download
|
$(LIB_ROOT)/$(LIBVPX)/.tvh_download
|
||||||
- cd $(LIB_ROOT)/$(LIBVPX) && $(CONFIGURE) \
|
cd $(LIB_ROOT)/$(LIBVPX) && \
|
||||||
+ cd $(LIB_ROOT)/$(LIBVPX) && CROSS=$(FFMPEG_TARGET)- $(CONFIGURE) \
|
- ASFLAGS="-DENABLE_PIC=1 -DPIC=1" $(CONFIGURE) \
|
||||||
|
+ ASFLAGS="-DENABLE_PIC=1 -DPIC=1" CROSS=$(FFMPEG_TARGET)- $(CONFIGURE) \
|
||||||
|
--extra-cflags="$(CFLAGS_PI)" \
|
||||||
--disable-examples \
|
--disable-examples \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-unit-tests \
|
@@ -359,7 +363,8 @@ $(LIB_ROOT)/$(LIBTHEORA)/.tvh_build: \
|
||||||
@@ -342,7 +345,8 @@
|
|
||||||
$(LIB_ROOT)/$(LIBOGG)/.tvh_build \
|
|
||||||
$(LIB_ROOT)/$(LIBTHEORA)/.tvh_download
|
$(LIB_ROOT)/$(LIBTHEORA)/.tvh_download
|
||||||
cd $(LIB_ROOT)/$(LIBTHEORA) && $(CONFIGURE) \
|
cd $(LIB_ROOT)/$(LIBTHEORA) && \
|
||||||
|
CFLAGS="$(CFLAGS_PI)" $(CONFIGURE) \
|
||||||
- --with-ogg=$(EPREFIX) \
|
- --with-ogg=$(EPREFIX) \
|
||||||
+ OGG_CFLAGS=-I$(EPREFIX)/include \
|
+ OGG_CFLAGS=-I$(EPREFIX)/include \
|
||||||
+ OGG_LIBS=-L$(EPREFIX)/lib \
|
+ OGG_LIBS=-L$(EPREFIX)/lib \
|
||||||
--disable-examples \
|
--disable-examples \
|
||||||
|
--disable-spec \
|
||||||
$(LIBTHEORA_HOST)
|
$(LIBTHEORA_HOST)
|
||||||
DESTDIR=$(EBUILDIR) \
|
@@ -406,7 +411,8 @@ $(LIB_ROOT)/$(LIBVORBIS)/.tvh_build: \
|
||||||
@@ -387,7 +391,8 @@
|
|
||||||
$(LIB_ROOT)/$(LIBOGG)/.tvh_build \
|
|
||||||
$(LIB_ROOT)/$(LIBVORBIS)/.tvh_download
|
$(LIB_ROOT)/$(LIBVORBIS)/.tvh_download
|
||||||
cd $(LIB_ROOT)/$(LIBVORBIS) && $(CONFIGURE) \
|
cd $(LIB_ROOT)/$(LIBVORBIS) && \
|
||||||
|
CFLAGS="$(CFLAGS_PI)" $(CONFIGURE) \
|
||||||
- --with-ogg=$(EPREFIX)
|
- --with-ogg=$(EPREFIX)
|
||||||
+ OGG_CFLAGS=-I$(EPREFIX)/include \
|
+ OGG_CFLAGS=-I$(EPREFIX)/include \
|
||||||
+ OGG_LIBS=-L$(EPREFIX)/lib
|
+ OGG_LIBS=-L$(EPREFIX)/lib
|
||||||
DESTDIR=$(EBUILDIR) \
|
DESTDIR=$(EBUILDIR) \
|
||||||
$(MAKE) -C $(LIB_ROOT)/$(LIBVORBIS) install
|
$(MAKE) -C $(LIB_ROOT)/$(LIBVORBIS) install
|
||||||
@touch $@
|
@touch $@
|
||||||
@@ -538,6 +543,8 @@
|
@@ -559,6 +565,8 @@ $(LIB_ROOT)/$(FFMPEG)/.tvh_build: \
|
||||||
$(LIB_ROOT)/$(LIBMFX)/.tvh_build \
|
$(LIB_ROOT)/$(LIBMFX)/.tvh_build \
|
||||||
$(LIB_ROOT)/$(FFMPEG)/.tvh_download
|
$(LIB_ROOT)/$(FFMPEG)/.tvh_download
|
||||||
cd $(LIB_ROOT)/$(FFMPEG) && $(CONFIGURE) \
|
cd $(LIB_ROOT)/$(FFMPEG) && $(CONFIGURE) \
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
"uilevel_nochange": false,
|
"uilevel_nochange": false,
|
||||||
"ui_quicktips": true,
|
"ui_quicktips": true,
|
||||||
"cookie_expires": 14,
|
"cookie_expires": 14,
|
||||||
|
"caclient_ui": true,
|
||||||
"epg_compress": true,
|
"epg_compress": true,
|
||||||
"prefer_picon": true,
|
"prefer_picon": true,
|
||||||
"chiconpath": "file:///storage/picons/tvh/%C.png",
|
"chiconpath": "file:///storage/picons/tvh/%C.png",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user