commit: de29ffbf0822d0f53bf6fcb10b91e4c036fa172b Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Jan 20 15:17:12 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jan 20 15:30:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de29ffbf
media-tv/tvheadend: Version bump to 4.2.8, loosen ffmpeg dependency It builds against ffmpeg 4 now. Closes: https://bugs.gentoo.org/673062 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-tv/tvheadend/Manifest | 1 + ...vheadend-9999.ebuild => tvheadend-4.2.8.ebuild} | 49 ++++++---------------- media-tv/tvheadend/tvheadend-9999.ebuild | 2 +- 3 files changed, 14 insertions(+), 38 deletions(-) diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest index 7026baf3a26..f1516f1c434 100644 --- a/media-tv/tvheadend/Manifest +++ b/media-tv/tvheadend/Manifest @@ -1 +1,2 @@ DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537 SHA512 14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9 +DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild similarity index 63% copy from media-tv/tvheadend/tvheadend-9999.ebuild copy to media-tv/tvheadend/tvheadend-4.2.8.ebuild index 8aa2d256431..0673c7bc7a3 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild @@ -3,17 +3,17 @@ EAPI=7 -inherit git-r3 linux-info systemd toolchain-funcs user +inherit linux-info systemd toolchain-funcs user DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" HOMEPAGE="https://tvheadend.org/"; -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~x86" -IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib" +IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib" BDEPEND=" sys-devel/gettext @@ -23,7 +23,8 @@ RDEPEND=" virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) - ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) + dvben50221? ( media-tv/linuxtv-dvb-apps ) + ffmpeg? ( media-video/ffmpeg:0= ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -31,26 +32,15 @@ RDEPEND=" zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib )" -# ffmpeg sub-dependencies needed for headers only. Check under -# src/transcoding/codec/codecs/libs for include statements. - DEPEND=" ${RDEPEND} - dvb? ( virtual/linuxtv-dvb-headers ) - ffmpeg? ( - opus? ( media-libs/opus ) - vpx? ( media-libs/libvpx ) - x264? ( media-libs/x264 ) - x265? ( media-libs/x265 ) - )" + dvb? ( virtual/linuxtv-dvb-headers )" RDEPEND+=" dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )" -REQUIRED_USE=" - ddci? ( dvb ) -" +REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )" # Some patches from: # https://github.com/rpmfusion/tvheadend @@ -70,13 +60,6 @@ pkg_setup() { enewuser tvheadend -1 -1 /etc/tvheadend video } -# We unconditionally enable codecs that do not require additional -# dependencies when building tvheadend. If support is missing from -# ffmpeg at runtime then tvheadend will simply disable these codecs. - -# It is not necessary to specific all the --disable-*-static options as -# most of them only take effect when --enable-ffmpeg_static is given. - src_configure() { CC="$(tc-getCC)" \ PKG_CONFIG="${CHOST}-pkg-config" \ @@ -86,33 +69,25 @@ src_configure() { --disable-dvbscan \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ - --enable-libfdkaac \ - --enable-libtheora \ - --enable-libvorbis \ --nowerror \ + $(use_enable capmt) \ + $(use_enable constcw) \ + $(use_enable cwc) \ $(use_enable dbus dbus_1) \ $(use_enable debug trace) \ - $(use_enable ddci) \ $(use_enable dvb linuxdvb) \ $(use_enable dvbcsa) \ - $(use_enable dvbcsa capmt) \ - $(use_enable dvbcsa cccam) \ - $(use_enable dvbcsa constcw) \ - $(use_enable dvbcsa cwc) \ + $(use_enable dvben50221) \ $(use_enable ffmpeg libav) \ $(use_enable hdhomerun hdhomerun_client) \ $(use_enable imagecache) \ $(use_enable inotify) \ $(use_enable iptv) \ - $(use_enable opus libopus) \ $(use_enable satip satip_server) \ $(use_enable satip satip_client) \ $(use_enable systemd libsystemd_daemon) \ $(use_enable timeshift) \ $(use_enable uriparser) \ - $(use_enable vpx libvpx) \ - $(use_enable x264 libx264) \ - $(use_enable x265 libx265) \ $(use_enable zeroconf avahi) \ $(use_enable zlib) } diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 8aa2d256431..700a7cc5a1d 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -23,7 +23,7 @@ RDEPEND=" virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) - ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) + ffmpeg? ( media-video/ffmpeg:0=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
