diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt index 5472e5b599..9189ccadb9 100644 --- a/packages/addons/service/tvheadend42/changelog.txt +++ b/packages/addons/service/tvheadend42/changelog.txt @@ -1,6 +1,9 @@ +8.0.103 +- update to Tvheadend 4.1.2134 + 8.0.102 -- Update for LibreELEC 8.0 -- Update to Tvheadend 4.1.1945 +- update for LibreELEC 8.0 +- update to Tvheadend 4.1.1945 - fix the XMLTV import script 7.0.100 diff --git a/packages/addons/service/tvheadend42/icon/icon.png b/packages/addons/service/tvheadend42/icon/icon.png index 846eb14b18..79094c4668 100644 Binary files a/packages/addons/service/tvheadend42/icon/icon.png and b/packages/addons/service/tvheadend42/icon/icon.png differ diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 710722ca81..83e73e71a7 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -17,9 +17,9 @@ ################################################################################ PKG_NAME="tvheadend42" -PKG_VERSION="5374573" -PKG_VERSION_NUMBER="4.1.1945" -PKG_REV="102" +PKG_VERSION="0bc30b9" +PKG_VERSION_NUMBER="4.1.2134" +PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="GPL" 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_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" +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_ADDON_NAME="Tvheadend 4.2" PKG_ADDON_TYPE="xbmc.service" -PKG_AUTORECONF="no" PKG_ADDON_REPOVERSION="8.0" # transcoding only for generic @@ -62,6 +62,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --disable-uriparser \ $TVH_TRANSCODING \ --enable-tvhcsa \ + --enable-trace \ --nowerror \ --python=$ROOT/$TOOLCHAIN/bin/python" diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-01_makefile.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-01_makefile.patch index 710d1b91fe..b1ad8ebf86 100644 --- a/packages/addons/service/tvheadend42/patches/tvheadend42-01_makefile.patch +++ b/packages/addons/service/tvheadend42/patches/tvheadend42-01_makefile.patch @@ -1,12 +1,12 @@ 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 --- a/Makefile +++ b/Makefile -@@ -91,50 +91,65 @@ FFMPEG_CONFIG := \ +@@ -97,50 +97,65 @@ FFMPEG_CONFIG := \ PKG_CONFIG_LIBDIR=$(FFMPEG_LIBDIR)/pkgconfig $(PKG_CONFIG) \ --define-variable=prefix=$(FFMPEG_PREFIX) --static @@ -78,7 +78,7 @@ diff --git a/Makefile b/Makefile endif # LIBAV ######################################################################## -@@ -606,7 +606,7 @@ +@@ -613,7 +628,7 @@ reconfigure: # Binary ${PROG}: .config.mk make_webui $(OBJS) diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-02_makefile_ffmpeg.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-02_makefile_ffmpeg.patch index 1f4db67b52..c011dd2cbe 100644 --- a/packages/addons/service/tvheadend42/patches/tvheadend42-02_makefile_ffmpeg.patch +++ b/packages/addons/service/tvheadend42/patches/tvheadend42-02_makefile_ffmpeg.patch @@ -1,12 +1,12 @@ 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 --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg -@@ -24,6 +24,9 @@ +@@ -24,6 +24,9 @@ FFMPEG_HOST := $(ARCH)-linux-gnu FFMPEG_TARGET := x86-linux-gcc endif @@ -16,7 +16,7 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg unexport CFLAGS unexport LDFLAGS -@@ -135,7 +141,7 @@ +@@ -145,7 +148,7 @@ $(LIB_ROOT)/$(YASM)/.tvh_download: $(LIB_ROOT)/$(YASM)/.tvh_build: \ $(LIB_ROOT)/$(YASM)/.tvh_download @@ -25,7 +25,7 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg DESTDIR=$(EBUILDIR) \ $(MAKE) -C $(LIB_ROOT)/$(YASM) install @touch $@ -@@ -224,6 +226,7 @@ +@@ -238,6 +241,7 @@ $(LIB_ROOT)/$(LIBX265)/.tvh_build: \ cd $(LIB_ROOT)/$(LIBX265)/build/linux && cmake -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX="/ffmpeg" \ -DENABLE_SHARED:BOOL=OFF \ @@ -33,7 +33,7 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg ../../source DESTDIR=$(EBUILDIR) \ $(MAKE) -C $(LIB_ROOT)/$(LIBX265)/build/linux install -@@ -257,7 +260,7 @@ +@@ -271,7 +275,7 @@ endif ifeq (yes,$(CONFIG_LIBVPX_STATIC)) ifneq (,$(FFMPEG_TARGET)) @@ -42,36 +42,36 @@ diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg endif $(LIB_ROOT)/$(LIBVPX)/.tvh_download: -@@ -268,7 +271,7 @@ - $(LIB_ROOT)/$(LIBVPX)/.tvh_build: \ +@@ -283,7 +287,7 @@ $(LIB_ROOT)/$(LIBVPX)/.tvh_build: \ $(LIB_ROOT)/$(YASM)/.tvh_build \ $(LIB_ROOT)/$(LIBVPX)/.tvh_download -- cd $(LIB_ROOT)/$(LIBVPX) && $(CONFIGURE) \ -+ cd $(LIB_ROOT)/$(LIBVPX) && CROSS=$(FFMPEG_TARGET)- $(CONFIGURE) \ + cd $(LIB_ROOT)/$(LIBVPX) && \ +- ASFLAGS="-DENABLE_PIC=1 -DPIC=1" $(CONFIGURE) \ ++ ASFLAGS="-DENABLE_PIC=1 -DPIC=1" CROSS=$(FFMPEG_TARGET)- $(CONFIGURE) \ + --extra-cflags="$(CFLAGS_PI)" \ --disable-examples \ --disable-docs \ - --disable-unit-tests \ -@@ -342,7 +345,8 @@ - $(LIB_ROOT)/$(LIBOGG)/.tvh_build \ +@@ -359,7 +363,8 @@ $(LIB_ROOT)/$(LIBTHEORA)/.tvh_build: \ $(LIB_ROOT)/$(LIBTHEORA)/.tvh_download - cd $(LIB_ROOT)/$(LIBTHEORA) && $(CONFIGURE) \ + cd $(LIB_ROOT)/$(LIBTHEORA) && \ + CFLAGS="$(CFLAGS_PI)" $(CONFIGURE) \ - --with-ogg=$(EPREFIX) \ + OGG_CFLAGS=-I$(EPREFIX)/include \ + OGG_LIBS=-L$(EPREFIX)/lib \ --disable-examples \ + --disable-spec \ $(LIBTHEORA_HOST) - DESTDIR=$(EBUILDIR) \ -@@ -387,7 +391,8 @@ - $(LIB_ROOT)/$(LIBOGG)/.tvh_build \ +@@ -406,7 +411,8 @@ $(LIB_ROOT)/$(LIBVORBIS)/.tvh_build: \ $(LIB_ROOT)/$(LIBVORBIS)/.tvh_download - cd $(LIB_ROOT)/$(LIBVORBIS) && $(CONFIGURE) \ + cd $(LIB_ROOT)/$(LIBVORBIS) && \ + CFLAGS="$(CFLAGS_PI)" $(CONFIGURE) \ - --with-ogg=$(EPREFIX) + OGG_CFLAGS=-I$(EPREFIX)/include \ + OGG_LIBS=-L$(EPREFIX)/lib DESTDIR=$(EBUILDIR) \ $(MAKE) -C $(LIB_ROOT)/$(LIBVORBIS) install @touch $@ -@@ -538,6 +543,8 @@ +@@ -559,6 +565,8 @@ $(LIB_ROOT)/$(FFMPEG)/.tvh_build: \ $(LIB_ROOT)/$(LIBMFX)/.tvh_build \ $(LIB_ROOT)/$(FFMPEG)/.tvh_download cd $(LIB_ROOT)/$(FFMPEG) && $(CONFIGURE) \ diff --git a/packages/addons/service/tvheadend42/source/defaults/config b/packages/addons/service/tvheadend42/source/defaults/config index 4d6fa4c747..7ac5627deb 100644 --- a/packages/addons/service/tvheadend42/source/defaults/config +++ b/packages/addons/service/tvheadend42/source/defaults/config @@ -3,6 +3,7 @@ "uilevel_nochange": false, "ui_quicktips": true, "cookie_expires": 14, + "caclient_ui": true, "epg_compress": true, "prefer_picon": true, "chiconpath": "file:///storage/picons/tvh/%C.png",