| 1 |
commit: 49c9d9c482554ffea6bb85a2b93e71bb606c11eb |
| 2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 2 15:21:01 2016 +0000 |
| 4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 20:22:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c9d9c4 |
| 7 |
|
| 8 |
media-tv/tvheadend: Merge ffmpeg atoms |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> |
| 12 |
|
| 13 |
media-tv/tvheadend/tvheadend-3.4.27.ebuild | 5 +---- |
| 14 |
media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 +---- |
| 15 |
media-tv/tvheadend/tvheadend-4.0.8.ebuild | 5 +---- |
| 16 |
media-tv/tvheadend/tvheadend-4.0.9.ebuild | 5 +---- |
| 17 |
4 files changed, 4 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild |
| 20 |
index 541c1b0..e999669 100644 |
| 21 |
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild |
| 22 |
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild |
| 23 |
@@ -25,10 +25,7 @@ REQUIRED_USE="dvbscan? ( dvb )" |
| 24 |
DEPEND="dev-libs/openssl:0= |
| 25 |
avahi? ( net-dns/avahi ) |
| 26 |
dvb? ( virtual/linuxtv-dvb-headers ) |
| 27 |
- ffmpeg? ( |
| 28 |
- virtual/ffmpeg |
| 29 |
- <media-video/ffmpeg-3 |
| 30 |
- ) |
| 31 |
+ ffmpeg? ( <media-video/ffmpeg-3:= ) |
| 32 |
imagecache? ( net-misc/curl ) |
| 33 |
zlib? ( sys-libs/zlib ) |
| 34 |
virtual/pkgconfig" |
| 35 |
|
| 36 |
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild |
| 37 |
index 88ebb51..b8a73e9 100644 |
| 38 |
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild |
| 39 |
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild |
| 40 |
@@ -26,10 +26,7 @@ RDEPEND="dev-libs/openssl:= |
| 41 |
avahi? ( net-dns/avahi ) |
| 42 |
dbus? ( sys-apps/dbus ) |
| 43 |
ffmpeg? ( |
| 44 |
- !libav? ( |
| 45 |
- media-video/ffmpeg:0= |
| 46 |
- <media-video/ffmpeg-3 |
| 47 |
- ) |
| 48 |
+ !libav? ( <media-video/ffmpeg-3:= ) |
| 49 |
libav? ( media-video/libav:= ) |
| 50 |
) |
| 51 |
hdhomerun? ( media-libs/libhdhomerun ) |
| 52 |
|
| 53 |
diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild b/media-tv/tvheadend/tvheadend-4.0.8.ebuild |
| 54 |
index 88ebb51..b8a73e9 100644 |
| 55 |
--- a/media-tv/tvheadend/tvheadend-4.0.8.ebuild |
| 56 |
+++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild |
| 57 |
@@ -26,10 +26,7 @@ RDEPEND="dev-libs/openssl:= |
| 58 |
avahi? ( net-dns/avahi ) |
| 59 |
dbus? ( sys-apps/dbus ) |
| 60 |
ffmpeg? ( |
| 61 |
- !libav? ( |
| 62 |
- media-video/ffmpeg:0= |
| 63 |
- <media-video/ffmpeg-3 |
| 64 |
- ) |
| 65 |
+ !libav? ( <media-video/ffmpeg-3:= ) |
| 66 |
libav? ( media-video/libav:= ) |
| 67 |
) |
| 68 |
hdhomerun? ( media-libs/libhdhomerun ) |
| 69 |
|
| 70 |
diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild b/media-tv/tvheadend/tvheadend-4.0.9.ebuild |
| 71 |
index 770aa5f..939aac7 100644 |
| 72 |
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild |
| 73 |
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild |
| 74 |
@@ -26,10 +26,7 @@ RDEPEND="dev-libs/openssl:= |
| 75 |
avahi? ( net-dns/avahi ) |
| 76 |
dbus? ( sys-apps/dbus ) |
| 77 |
ffmpeg? ( |
| 78 |
- !libav? ( |
| 79 |
- media-video/ffmpeg:0= |
| 80 |
- <media-video/ffmpeg-3 |
| 81 |
- ) |
| 82 |
+ !libav? ( <media-video/ffmpeg-3:= ) |
| 83 |
libav? ( media-video/libav:= ) |
| 84 |
) |
| 85 |
hdhomerun? ( media-libs/libhdhomerun ) |
Archives