1 |
commit: de29ffbf0822d0f53bf6fcb10b91e4c036fa172b |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 20 15:17:12 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 20 15:30:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de29ffbf |
7 |
|
8 |
media-tv/tvheadend: Version bump to 4.2.8, loosen ffmpeg dependency |
9 |
|
10 |
It builds against ffmpeg 4 now. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/673062 |
13 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
15 |
|
16 |
media-tv/tvheadend/Manifest | 1 + |
17 |
...vheadend-9999.ebuild => tvheadend-4.2.8.ebuild} | 49 ++++++---------------- |
18 |
media-tv/tvheadend/tvheadend-9999.ebuild | 2 +- |
19 |
3 files changed, 14 insertions(+), 38 deletions(-) |
20 |
|
21 |
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest |
22 |
index 7026baf3a26..f1516f1c434 100644 |
23 |
--- a/media-tv/tvheadend/Manifest |
24 |
+++ b/media-tv/tvheadend/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537 SHA512 14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9 |
27 |
+DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f |
28 |
|
29 |
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild |
30 |
similarity index 63% |
31 |
copy from media-tv/tvheadend/tvheadend-9999.ebuild |
32 |
copy to media-tv/tvheadend/tvheadend-4.2.8.ebuild |
33 |
index 8aa2d256431..0673c7bc7a3 100644 |
34 |
--- a/media-tv/tvheadend/tvheadend-9999.ebuild |
35 |
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild |
36 |
@@ -3,17 +3,17 @@ |
37 |
|
38 |
EAPI=7 |
39 |
|
40 |
-inherit git-r3 linux-info systemd toolchain-funcs user |
41 |
+inherit linux-info systemd toolchain-funcs user |
42 |
|
43 |
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" |
44 |
HOMEPAGE="https://tvheadend.org/" |
45 |
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
46 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
47 |
|
48 |
LICENSE="GPL-3" |
49 |
SLOT="0" |
50 |
-KEYWORDS="" |
51 |
+KEYWORDS="~amd64 ~arm ~x86" |
52 |
|
53 |
-IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib" |
54 |
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib" |
55 |
|
56 |
BDEPEND=" |
57 |
sys-devel/gettext |
58 |
@@ -23,7 +23,8 @@ RDEPEND=" |
59 |
virtual/libiconv |
60 |
dbus? ( sys-apps/dbus ) |
61 |
dvbcsa? ( media-libs/libdvbcsa ) |
62 |
- ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) |
63 |
+ dvben50221? ( media-tv/linuxtv-dvb-apps ) |
64 |
+ ffmpeg? ( media-video/ffmpeg:0= ) |
65 |
hdhomerun? ( media-libs/libhdhomerun ) |
66 |
!libressl? ( dev-libs/openssl:0= ) |
67 |
libressl? ( dev-libs/libressl:= ) |
68 |
@@ -31,26 +32,15 @@ RDEPEND=" |
69 |
zeroconf? ( net-dns/avahi ) |
70 |
zlib? ( sys-libs/zlib )" |
71 |
|
72 |
-# ffmpeg sub-dependencies needed for headers only. Check under |
73 |
-# src/transcoding/codec/codecs/libs for include statements. |
74 |
- |
75 |
DEPEND=" |
76 |
${RDEPEND} |
77 |
- dvb? ( virtual/linuxtv-dvb-headers ) |
78 |
- ffmpeg? ( |
79 |
- opus? ( media-libs/opus ) |
80 |
- vpx? ( media-libs/libvpx ) |
81 |
- x264? ( media-libs/x264 ) |
82 |
- x265? ( media-libs/x265 ) |
83 |
- )" |
84 |
+ dvb? ( virtual/linuxtv-dvb-headers )" |
85 |
|
86 |
RDEPEND+=" |
87 |
dvb? ( media-tv/dtv-scan-tables ) |
88 |
xmltv? ( media-tv/xmltv )" |
89 |
|
90 |
-REQUIRED_USE=" |
91 |
- ddci? ( dvb ) |
92 |
-" |
93 |
+REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )" |
94 |
|
95 |
# Some patches from: |
96 |
# https://github.com/rpmfusion/tvheadend |
97 |
@@ -70,13 +60,6 @@ pkg_setup() { |
98 |
enewuser tvheadend -1 -1 /etc/tvheadend video |
99 |
} |
100 |
|
101 |
-# We unconditionally enable codecs that do not require additional |
102 |
-# dependencies when building tvheadend. If support is missing from |
103 |
-# ffmpeg at runtime then tvheadend will simply disable these codecs. |
104 |
- |
105 |
-# It is not necessary to specific all the --disable-*-static options as |
106 |
-# most of them only take effect when --enable-ffmpeg_static is given. |
107 |
- |
108 |
src_configure() { |
109 |
CC="$(tc-getCC)" \ |
110 |
PKG_CONFIG="${CHOST}-pkg-config" \ |
111 |
@@ -86,33 +69,25 @@ src_configure() { |
112 |
--disable-dvbscan \ |
113 |
--disable-ffmpeg_static \ |
114 |
--disable-hdhomerun_static \ |
115 |
- --enable-libfdkaac \ |
116 |
- --enable-libtheora \ |
117 |
- --enable-libvorbis \ |
118 |
--nowerror \ |
119 |
+ $(use_enable capmt) \ |
120 |
+ $(use_enable constcw) \ |
121 |
+ $(use_enable cwc) \ |
122 |
$(use_enable dbus dbus_1) \ |
123 |
$(use_enable debug trace) \ |
124 |
- $(use_enable ddci) \ |
125 |
$(use_enable dvb linuxdvb) \ |
126 |
$(use_enable dvbcsa) \ |
127 |
- $(use_enable dvbcsa capmt) \ |
128 |
- $(use_enable dvbcsa cccam) \ |
129 |
- $(use_enable dvbcsa constcw) \ |
130 |
- $(use_enable dvbcsa cwc) \ |
131 |
+ $(use_enable dvben50221) \ |
132 |
$(use_enable ffmpeg libav) \ |
133 |
$(use_enable hdhomerun hdhomerun_client) \ |
134 |
$(use_enable imagecache) \ |
135 |
$(use_enable inotify) \ |
136 |
$(use_enable iptv) \ |
137 |
- $(use_enable opus libopus) \ |
138 |
$(use_enable satip satip_server) \ |
139 |
$(use_enable satip satip_client) \ |
140 |
$(use_enable systemd libsystemd_daemon) \ |
141 |
$(use_enable timeshift) \ |
142 |
$(use_enable uriparser) \ |
143 |
- $(use_enable vpx libvpx) \ |
144 |
- $(use_enable x264 libx264) \ |
145 |
- $(use_enable x265 libx265) \ |
146 |
$(use_enable zeroconf avahi) \ |
147 |
$(use_enable zlib) |
148 |
} |
149 |
|
150 |
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild |
151 |
index 8aa2d256431..700a7cc5a1d 100644 |
152 |
--- a/media-tv/tvheadend/tvheadend-9999.ebuild |
153 |
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild |
154 |
@@ -23,7 +23,7 @@ RDEPEND=" |
155 |
virtual/libiconv |
156 |
dbus? ( sys-apps/dbus ) |
157 |
dvbcsa? ( media-libs/libdvbcsa ) |
158 |
- ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) |
159 |
+ ffmpeg? ( media-video/ffmpeg:0=[opus?,vpx?,x264?,x265?] ) |
160 |
hdhomerun? ( media-libs/libhdhomerun ) |
161 |
!libressl? ( dev-libs/openssl:0= ) |
162 |
libressl? ( dev-libs/libressl:= ) |