From bf0e9d0dee4077e1fa014a300f9072813cc52e62 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:21:46 +0000 Subject: [PATCH 01/17] media-tv/tvheadend: Move dtv-scan-tables version to variable Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index ec29285332530..3074292a07a4b 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -6,10 +6,12 @@ EAPI=5 inherit eutils linux-info systemd toolchain-funcs user +DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3" + DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" HOMEPAGE="https://tvheadend.org/" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 )" + dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )" LICENSE="GPL-3" SLOT="0" @@ -47,7 +49,7 @@ src_unpack() { if use dvbscan; then mkdir "${S}/data/dvb-scan" || die cd "${T}" || die - unpack dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 + unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 rmdir "${S}/data/dvb-scan" || die mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die From d17863df0d4fbcb32257f94c3d71bf606a4d406e Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:21:49 +0000 Subject: [PATCH 02/17] media-tv/tvheadend: Remove --mandir configure option That used to be an old workaround. Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 3074292a07a4b..596042b5f435a 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -71,7 +71,6 @@ src_prepare() { src_configure() { econf --prefix="${EPREFIX}"/usr \ --datadir="${EPREFIX}"/usr/share \ - --mandir="${EPREFIX}"/usr/share/man/man1 \ $(use_enable avahi) \ $(use_enable ccache) \ $(use_enable capmt) \ From a728d8583db95ba7dbe768bbc2e14dfcfed82709 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:21:52 +0000 Subject: [PATCH 03/17] media-tv/tvheadend: Remove iconv patch and USE flag The patch is wrong. The configure check only checks whether we need to link against libiconv for the iconv functions. iconv support is always activated and we need to unconditionally depend on virtual/libiconv. Signed-off-by: Sven Wegener --- .../files/4.0.6-use-glibc-version-iconv.patch | 40 ------------------- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 +-- media-tv/tvheadend/tvheadend-9999.ebuild | 1 + 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch deleted file mode 100644 index 91187869a2092..0000000000000 --- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001 -From: Olliver Schinagl -Date: Sat, 26 Sep 2015 22:36:08 +0200 -Subject: [PATCH] Use glibc version iconv - -Signed-off-by: Olliver Schinagl ---- - Makefile | 2 +- - configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 07d6965..0ec0259 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,7 +39,7 @@ else - LDFLAGS += -ldl -lpthread -lm - endif - ifeq ($(CONFIG_LIBICONV),yes) --LDFLAGS += -liconv -+LDFLAGS += - endif - ifeq ($(PLATFORM), darwin) - LDFLAGS += -framework CoreServices -diff --git a/configure b/configure -index 487456b..a6cce11 100755 ---- a/configure -+++ b/configure -@@ -214,7 +214,7 @@ int test(void) - iconv_t ic = iconv_open("ASCII", "ASCII"); - return 0; - } --' -liconv -+' - - if enabled_or_auto dvben50221; then - check_cc_snippet libdvben50221 ' --- -2.4.6 - diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 596042b5f435a..5512e71899baf 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -17,9 +17,10 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib" +IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" RDEPEND="dev-libs/openssl:= + virtual/libiconv avahi? ( net-dns/avahi ) capmt? ( virtual/linuxtv-dvb-headers ) ccache? ( dev-util/ccache sys-libs/zlib ) @@ -30,7 +31,6 @@ RDEPEND="dev-libs/openssl:= libav? ( media-video/libav:= ) ) hdhomerun? ( media-libs/libhdhomerun ) - iconv? ( virtual/libiconv ) imagecache? ( net-misc/curl ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib ) @@ -65,7 +65,6 @@ pkg_setup() { src_prepare() { # remove '-Werror' wrt bug #438424 sed -e 's:-Werror::' -i Makefile || die 'sed failed!' - epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch" } src_configure() { diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 495a3d139734f..184366eff323f 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -17,6 +17,7 @@ KEYWORDS="" IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" DEPEND="dev-libs/openssl:0= + virtual/libiconv avahi? ( net-dns/avahi ) ccache? ( dev-util/ccache ) dvb? ( virtual/linuxtv-dvb-headers ) From d66ee667c04958ab7e7222bf8983880ebe729bce Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:21:55 +0000 Subject: [PATCH 04/17] media-tv/tvheadend: Remove ccache USE flag We have the ccache portage feature for that. Also the USE flag didn't do anything, because we are forcing CC during make, overriding the ccache command the configure script added to CC. Signed-off-by: Sven Wegener --- media-tv/tvheadend/metadata.xml | 1 - media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 ++--- media-tv/tvheadend/tvheadend-9999.ebuild | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml index 154ca4bfa5de0..99ac1c4a17285 100644 --- a/media-tv/tvheadend/metadata.xml +++ b/media-tv/tvheadend/metadata.xml @@ -17,7 +17,6 @@ Enable support for IP-based Satellite TV Enable TimeShift support Use media-tv/xmltv - Use dev-util/ccache Use media-tv/linuxtv-dvb-apps Enable support for image caching Use dev-libs/uriparser diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 5512e71899baf..030b89065d9a7 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -17,13 +17,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" +IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" RDEPEND="dev-libs/openssl:= virtual/libiconv avahi? ( net-dns/avahi ) capmt? ( virtual/linuxtv-dvb-headers ) - ccache? ( dev-util/ccache sys-libs/zlib ) dbus? ( sys-apps/dbus ) dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( @@ -70,8 +69,8 @@ src_prepare() { src_configure() { econf --prefix="${EPREFIX}"/usr \ --datadir="${EPREFIX}"/usr/share \ + --disable-ccache \ $(use_enable avahi) \ - $(use_enable ccache) \ $(use_enable capmt) \ $(use_enable constcw) \ $(use_enable cwc) \ diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 184366eff323f..7cbcfded400ed 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -14,12 +14,11 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" +IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" DEPEND="dev-libs/openssl:0= virtual/libiconv avahi? ( net-dns/avahi ) - ccache? ( dev-util/ccache ) dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( virtual/ffmpeg ) uriparser? ( dev-libs/uriparser ) @@ -46,9 +45,9 @@ src_prepare() { src_configure() { econf --prefix="${EPREFIX}"/usr \ --datadir="${EPREFIX}"/usr/share \ - $(use_enable avahi) \ - $(use_enable ccache) \ + --disable-ccache \ --disable-dvbscan \ + $(use_enable avahi) \ $(use_enable dvb linuxdvb) \ $(use_enable ffmpeg libav) \ $(use_enable imagecache) \ From e794d6acafe3608a15b81bb82775387734ea6791 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:21:58 +0000 Subject: [PATCH 05/17] media-tv/tvheadend: Remove epoll USE flag The epoll support is always activated on Linux. On Darwin and FreeBSD tvheadend automatically uses kqueue support. Signed-off-by: Sven Wegener --- media-tv/tvheadend/metadata.xml | 1 - media-tv/tvheadend/tvheadend-4.0.6.ebuild | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml index 99ac1c4a17285..c6e66a8cb6130 100644 --- a/media-tv/tvheadend/metadata.xml +++ b/media-tv/tvheadend/metadata.xml @@ -11,7 +11,6 @@ Enable support for capmt (dvbapi) protocol Enable support for the constcw protocol Enable support for the cwc (newcamd) protocol - Enable epoll Linux system call Enable support for the HDHomeRun device Enable support for Internet Protocol TV Enable support for IP-based Satellite TV diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 030b89065d9a7..2f731d43eb8fd 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" +IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" RDEPEND="dev-libs/openssl:= virtual/libiconv @@ -77,8 +77,6 @@ src_configure() { $(use_enable dbus) \ $(use_enable dvb linuxdvb) \ $(use_enable dvbscan) \ - $(use_enable epoll) \ - --disable-kqueue \ $(use_enable ffmpeg libav) \ $(use_enable hdhomerun hdhomerun_client) \ $(use_enable imagecache) \ From 30e6381ccc4ed33229502d5a145942c2924b3d08 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:01 +0000 Subject: [PATCH 06/17] media-tv/tvheadend: Remove curl dependency There's no single call to curl or libcurl in the code. Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 2f731d43eb8fd..ad11c8b447827 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -30,7 +30,6 @@ RDEPEND="dev-libs/openssl:= libav? ( media-video/libav:= ) ) hdhomerun? ( media-libs/libhdhomerun ) - imagecache? ( net-misc/curl ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib ) xmltv? ( media-tv/xmltv )" From a121e0d2d43e9e1e217993e6556ea5180906c5a5 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:04 +0000 Subject: [PATCH 07/17] media-tv/tvheadend: Fixup DEPEND setting Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index ad11c8b447827..fd8c461845fca 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -34,7 +34,7 @@ RDEPEND="dev-libs/openssl:= zlib? ( sys-libs/zlib ) xmltv? ( media-tv/xmltv )" -DEPEND="${DEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" CONFIG_CHECK="~INOTIFY_USER" From ed222aff0c447ad9901fa8dbc19d4c1775d742bd Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:07 +0000 Subject: [PATCH 08/17] media-tv/tvheadend: Move xmltv to being RDEPEND-only Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index fd8c461845fca..4cab67d6be1f4 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -31,12 +31,14 @@ RDEPEND="dev-libs/openssl:= ) hdhomerun? ( media-libs/libhdhomerun ) uriparser? ( dev-libs/uriparser ) - zlib? ( sys-libs/zlib ) - xmltv? ( media-tv/xmltv )" + zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} virtual/pkgconfig" +RDEPEND+=" + xmltv? ( media-tv/xmltv )" + CONFIG_CHECK="~INOTIFY_USER" DOCS=( README.md ) From 9775c159a2935c425e0827cbbf13ed458f254150 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:10 +0000 Subject: [PATCH 09/17] media-tv/tvheadend: Move headers to being DEPEND-only Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 4cab67d6be1f4..087ea471ce642 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -22,9 +22,7 @@ IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imageca RDEPEND="dev-libs/openssl:= virtual/libiconv avahi? ( net-dns/avahi ) - capmt? ( virtual/linuxtv-dvb-headers ) dbus? ( sys-apps/dbus ) - dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:= ) @@ -34,6 +32,8 @@ RDEPEND="dev-libs/openssl:= zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} + dvb? ( virtual/linuxtv-dvb-headers ) + capmt? ( virtual/linuxtv-dvb-headers ) virtual/pkgconfig" RDEPEND+=" From 3b1a6ca1248eada3588462ab18211e858b7dca69 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:13 +0000 Subject: [PATCH 10/17] media-tv/tvheadend: Lower openssl dependency restriction Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 7cbcfded400ed..70a30ba6eef5e 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -16,7 +16,7 @@ KEYWORDS="" IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" -DEPEND="dev-libs/openssl:0= +DEPEND="dev-libs/openssl:= virtual/libiconv avahi? ( net-dns/avahi ) dvb? ( virtual/linuxtv-dvb-headers ) From cb2c426549d27d08b58867bd06abed9b17a75c95 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:16 +0000 Subject: [PATCH 11/17] media-tv/tvheadend: Update dependency syntax of live ebuild Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-9999.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 70a30ba6eef5e..a8d98b98e838b 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -16,16 +16,18 @@ KEYWORDS="" IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" -DEPEND="dev-libs/openssl:= +RDEPEND="dev-libs/openssl:= virtual/libiconv avahi? ( net-dns/avahi ) - dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( virtual/ffmpeg ) uriparser? ( dev-libs/uriparser ) - zlib? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib )" + +DEPEND="${RDEPEND} + dvb? ( virtual/linuxtv-dvb-headers ) virtual/pkgconfig" -RDEPEND="${DEPEND} +RDEPEND+=" dvbscan? ( media-tv/linuxtv-dvb-apps ) xmltv? ( media-tv/xmltv )" From b6b23b937f9d4a2dd80c5db45787e3287989393e Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:19 +0000 Subject: [PATCH 12/17] media-tv/tvheadend: Forward port the libav USE flag Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-9999.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index a8d98b98e838b..584af8acde0f6 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -14,12 +14,15 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" +IUSE="avahi +dvb +dvbscan ffmpeg libav imagecache inotify uriparser xmltv zlib" RDEPEND="dev-libs/openssl:= virtual/libiconv avahi? ( net-dns/avahi ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:= ) + ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib )" From c69dc4348380b40e043ec86e35287e737ad97e23 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:22 +0000 Subject: [PATCH 13/17] media-tv/tvheadend: Forward port additional USE flags Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-9999.ebuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 584af8acde0f6..d056a1e0fa8d2 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -14,20 +14,23 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="avahi +dvb +dvbscan ffmpeg libav imagecache inotify uriparser xmltv zlib" +IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" RDEPEND="dev-libs/openssl:= virtual/libiconv avahi? ( net-dns/avahi ) + dbus? ( sys-apps/dbus ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:= ) ) + hdhomerun? ( media-libs/libhdhomerun ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} dvb? ( virtual/linuxtv-dvb-headers ) + capmt? ( virtual/linuxtv-dvb-headers ) virtual/pkgconfig" RDEPEND+=" @@ -53,10 +56,19 @@ src_configure() { --disable-ccache \ --disable-dvbscan \ $(use_enable avahi) \ + $(use_enable capmt) \ + $(use_enable constcw) \ + $(use_enable cwc) \ + $(use_enable dbus) \ $(use_enable dvb linuxdvb) \ $(use_enable ffmpeg libav) \ + $(use_enable hdhomerun hdhomerun_client) \ $(use_enable imagecache) \ $(use_enable inotify) \ + $(use_enable iptv) \ + $(use_enable satip satip_server) \ + $(use_enable satip satip_client) \ + $(use_enable timeshift) \ $(use_enable uriparser) \ $(use_enable zlib) } From 57523b5920eb1250856de0369fc8883daad279c0 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 09:22:25 +0000 Subject: [PATCH 14/17] media-tv/tvheadend: Disable building bundled libraries Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-9999.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index d056a1e0fa8d2..b410af897a227 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -53,6 +53,8 @@ src_prepare() { src_configure() { econf --prefix="${EPREFIX}"/usr \ --datadir="${EPREFIX}"/usr/share \ + --disable-hdhomerun_static \ + --disable-libffmpeg_static \ --disable-ccache \ --disable-dvbscan \ $(use_enable avahi) \ From d3572aecbe052f52b1773003a0398870049ea8e9 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 23 Jan 2016 17:55:31 +0000 Subject: [PATCH 15/17] media-tv/tvheadend: Convert to git-r3.eclass Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index b410af897a227..731463da2f412 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils git-2 linux-info systemd toolchain-funcs user +inherit eutils git-r3 linux-info systemd toolchain-funcs user DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" HOMEPAGE="https://tvheadend.org/" From 863f9ab8fc98a98570263fbba4d5c918ba0ab13e Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sun, 24 Jan 2016 10:06:54 +0000 Subject: [PATCH 16/17] media-tv/tvheadend: Version bump, bug #572576 Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-4.0.8.ebuild | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 media-tv/tvheadend/tvheadend-4.0.8.ebuild diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild b/media-tv/tvheadend/tvheadend-4.0.8.ebuild new file mode 100644 index 0000000000000..087ea471ce642 --- /dev/null +++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils linux-info systemd toolchain-funcs user + +DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3" + +DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" +HOMEPAGE="https://tvheadend.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" + +RDEPEND="dev-libs/openssl:= + virtual/libiconv + avahi? ( net-dns/avahi ) + dbus? ( sys-apps/dbus ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:= ) + ) + hdhomerun? ( media-libs/libhdhomerun ) + uriparser? ( dev-libs/uriparser ) + zlib? ( sys-libs/zlib )" + +DEPEND="${RDEPEND} + dvb? ( virtual/linuxtv-dvb-headers ) + capmt? ( virtual/linuxtv-dvb-headers ) + virtual/pkgconfig" + +RDEPEND+=" + xmltv? ( media-tv/xmltv )" + +CONFIG_CHECK="~INOTIFY_USER" + +DOCS=( README.md ) + +src_unpack() { + unpack "${P}.tar.gz" + + if use dvbscan; then + mkdir "${S}/data/dvb-scan" || die + cd "${T}" || die + unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 + rmdir "${S}/data/dvb-scan" || die + mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die + + # This is needed to prevent make from removing files + touch "${S}/data/dvb-scan/.stamp" || die + fi +} + +pkg_setup() { + enewuser tvheadend -1 -1 /dev/null video +} + +src_prepare() { + # remove '-Werror' wrt bug #438424 + sed -e 's:-Werror::' -i Makefile || die 'sed failed!' +} + +src_configure() { + econf --prefix="${EPREFIX}"/usr \ + --datadir="${EPREFIX}"/usr/share \ + --disable-ccache \ + $(use_enable avahi) \ + $(use_enable capmt) \ + $(use_enable constcw) \ + $(use_enable cwc) \ + $(use_enable dbus) \ + $(use_enable dvb linuxdvb) \ + $(use_enable dvbscan) \ + $(use_enable ffmpeg libav) \ + $(use_enable hdhomerun hdhomerun_client) \ + $(use_enable imagecache) \ + $(use_enable inotify) \ + $(use_enable iptv) \ + $(use_enable satip satip_server) \ + $(use_enable satip satip_client) \ + $(use_enable timeshift) \ + $(use_enable uriparser) \ + $(use_enable zlib) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + default + + newinitd "${FILESDIR}/tvheadend.initd" tvheadend + newconfd "${FILESDIR}/tvheadend.confd" tvheadend + + systemd_dounit "${FILESDIR}/tvheadend.service" + + dodir /etc/tvheadend + fperms 0700 /etc/tvheadend + fowners tvheadend:video /etc/tvheadend +} + +pkg_postinst() { + elog "The Tvheadend web interface can be reached at:" + elog "http://localhost:9981/" + elog + elog "Make sure that you change the default username" + elog "and password via the Configuration / Access control" + elog "tab in the web interface." +} From a9f122016cc7c7a25c79260fa9bdfb0c516ce6f4 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sun, 24 Jan 2016 20:43:30 +0000 Subject: [PATCH 17/17] media-tv/tvheadend: Fix IMDb URL, bug #536072 Signed-off-by: Sven Wegener --- media-tv/tvheadend/tvheadend-3.4.27.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild index 0a8d85fee5529..03f12f27b6ac7 100644 --- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild +++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild @@ -49,6 +49,10 @@ src_prepare() { # remove '-Werror' wrt bug #438424 sed -e 's:-Werror::' -i Makefile || die 'sed failed!' + + # imdb changed the search url, bug #536072 + sed -e 's:akas.imdb.org:akas.imdb.com:' \ + -i src/webui/static/app/epg.js || die 'sed failed!' } src_configure() {