1 |
commit: 682af47f141f95e154b18ab76f92716455c40186 |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 3 19:29:21 2020 +0000 |
4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 3 19:30:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682af47f |
7 |
|
8 |
media-plugins/vdr-streamdev: version bump, minor fixes |
9 |
|
10 |
readdy for vdr-2.4 |
11 |
fixed prepare/install phase depend by use-flags |
12 |
|
13 |
Suggested-by: Martin Dummer <martin.dummer <AT> gmx.net> |
14 |
Closes: https://bugs.gentoo.org/703992 |
15 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
16 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
17 |
|
18 |
media-plugins/vdr-streamdev/Manifest | 1 + |
19 |
.../vdr-streamdev/vdr-streamdev-0.6.1.ebuild | 4 +- |
20 |
.../vdr-streamdev-0.6.1_p20160320.ebuild | 4 +- |
21 |
.../vdr-streamdev-0.6.1_p20170930.ebuild | 78 ++++++++++++++++++++++ |
22 |
4 files changed, 83 insertions(+), 4 deletions(-) |
23 |
|
24 |
diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest |
25 |
index daf09a582a6..e6086445fdf 100644 |
26 |
--- a/media-plugins/vdr-streamdev/Manifest |
27 |
+++ b/media-plugins/vdr-streamdev/Manifest |
28 |
@@ -1,2 +1,3 @@ |
29 |
DIST vdr-plugin-streamdev-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2 163096 BLAKE2B f451c435b24b69b0b09b5f2f041888ed3593ed7deee727a027672df9dd4d7c9183a68d40751ae5c12765037b4d5520f8ad824ead357b2a6597aaa15be7e573f5 SHA512 f9439a4c3dd453869f9cf3171ddb5e34c2a625d7873cb1648138e4b94715ec3acd8d3db69df5ae5bf1bc21f0401f9b12a126395b0f2696c129ee7725c1715902 |
30 |
+DIST vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2 163403 BLAKE2B 4cacadc091ab8d28ccd4318eaf18aaef8f45e6caab86ef461d1b1047039ec921984ebad091d29420779982b5b37606defe5aa6c6828e8f28788886ba9839efea SHA512 e1eb69f62785178c06fa6700bd1b94ac12f2c58b1a7b8067312613279b59c5ef8157474e27863e8b2d0e47700f67fca7a61595c49809512e9e1efdb27c85eac8 |
31 |
DIST vdr-streamdev-0.6.1.tgz 186546 BLAKE2B 7d5d92c8ec92e7a57e8e335bdbdf5c91bcbfcdc3ea96fe8154af7015f33d6f2822cf35681a8018cad5b19776199d90870b747bc0a551f42a7b0eedc94f040188 SHA512 bbe6231bd8e69e299c8d94173e7ed4b1f49e5b17b7bcadf2d1e827b5e8dd57c6b975c8c409fd44f252110099b3565a7d4d8c2f7d03636fc2d2e3580d0050d971 |
32 |
|
33 |
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild |
34 |
index bdacdc2493d..86fe10fda4b 100644 |
35 |
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild |
36 |
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild |
37 |
@@ -1,4 +1,4 @@ |
38 |
-# Copyright 1999-2018 Gentoo Foundation |
39 |
+# Copyright 1999-2020 Gentoo Authors |
40 |
# Distributed under the terms of the GNU General Public License v2 |
41 |
|
42 |
EAPI=5 |
43 |
@@ -14,7 +14,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" |
44 |
LICENSE="GPL-2" |
45 |
SLOT="0" |
46 |
KEYWORDS="amd64 x86" |
47 |
-IUSE="client +server" |
48 |
+IUSE="client server" |
49 |
|
50 |
DEPEND=">=media-video/vdr-1.7.25" |
51 |
RDEPEND="${DEPEND}" |
52 |
|
53 |
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild |
54 |
index 8e69d583132..855928673f0 100644 |
55 |
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild |
56 |
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2018 Gentoo Foundation |
59 |
+# Copyright 1999-2020 Gentoo Authors |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI=6 |
63 |
@@ -14,7 +14,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapsho |
64 |
LICENSE="GPL-2" |
65 |
SLOT="0" |
66 |
KEYWORDS="~amd64 ~arm ~x86" |
67 |
-IUSE="client +server" |
68 |
+IUSE="client server" |
69 |
|
70 |
DEPEND=">=media-video/vdr-1.7.25" |
71 |
RDEPEND="${DEPEND}" |
72 |
|
73 |
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild |
74 |
new file mode 100644 |
75 |
index 00000000000..b5c3b4f0a9c |
76 |
--- /dev/null |
77 |
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild |
78 |
@@ -0,0 +1,78 @@ |
79 |
+# Copyright 2020 Gentoo Authors |
80 |
+# Distributed under the terms of the GNU General Public License v2 |
81 |
+ |
82 |
+EAPI=7 |
83 |
+ |
84 |
+inherit vdr-plugin-2 |
85 |
+ |
86 |
+GIT_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813" |
87 |
+ |
88 |
+DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin" |
89 |
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-streamdev" |
90 |
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-${GIT_VERSION}.tar.bz2" |
91 |
+ |
92 |
+LICENSE="GPL-2" |
93 |
+SLOT="0" |
94 |
+KEYWORDS="~amd64 ~arm ~x86" |
95 |
+IUSE="client server" |
96 |
+REQUIRED_USE="|| ( client server )" |
97 |
+ |
98 |
+DEPEND=">=media-video/vdr-2.3" |
99 |
+RDEPEND="${DEPEND}" |
100 |
+ |
101 |
+QA_FLAGS_IGNORED=" |
102 |
+ usr/lib/vdr/plugins/libvdr-streamdev-.* |
103 |
+ usr/lib64/vdr/plugins/libvdr-streamdev-.*" |
104 |
+S="${WORKDIR}/vdr-plugin-streamdev-${GIT_VERSION}" |
105 |
+ |
106 |
+# vdr-plugin-2.eclass changes |
107 |
+PO_SUBDIR="client server" |
108 |
+ |
109 |
+src_prepare() { |
110 |
+ # make detection in vdr-plugin-2.eclass for new Makefile handling happy |
111 |
+ echo "# SOFILE" >> Makefile || die "modify Makefile failed" |
112 |
+ |
113 |
+ # rm unneeded entry |
114 |
+ sed -i Makefile -e "s:-I\$(VDRDIR)/include::" || die "modify Makefile failed" |
115 |
+ |
116 |
+ vdr-plugin-2_src_prepare |
117 |
+ |
118 |
+ for flag in client server; do |
119 |
+ if ! use ${flag}; then |
120 |
+ sed -i Makefile \ |
121 |
+ -e '/^.PHONY:/s/'${flag}'//' \ |
122 |
+ -e '/^.PHONY:/s/'install-${flag}'//' \ |
123 |
+ -e '/^all:/s/'${flag}'//' \ |
124 |
+ -e '/^install:/s/'install-${flag}'//' || die "modify Makefile failed" |
125 |
+ fi |
126 |
+ done |
127 |
+ |
128 |
+ fix_vdr_libsi_include server/livestreamer.c |
129 |
+} |
130 |
+ |
131 |
+src_install() { |
132 |
+ vdr-plugin-2_src_install |
133 |
+ |
134 |
+ if use server; then |
135 |
+ insinto /usr/share/vdr/streamdev |
136 |
+ doins streamdev-server/externremux.sh |
137 |
+ |
138 |
+ insinto /usr/share/vdr/rcscript |
139 |
+ newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh |
140 |
+ |
141 |
+ newconfd "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server |
142 |
+ |
143 |
+ insinto /etc/vdr/plugins/streamdev-server |
144 |
+ newins streamdev-server/streamdevhosts.conf streamdevhosts.conf |
145 |
+ fowners vdr:vdr /etc/vdr -R |
146 |
+ fi |
147 |
+} |
148 |
+ |
149 |
+pkg_postinst() { |
150 |
+ vdr-plugin-2_pkg_postinst |
151 |
+ |
152 |
+ if [[ -e "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then |
153 |
+ einfo "move config file to new config DIR ${EROOT}/etc/vdr/plugins/streamdev-server/" |
154 |
+ mv "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf "${EROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf |
155 |
+ fi |
156 |
+} |