1 |
commit: 54f7d30876ba90e10f0fa4ab68223e3bbe32e271 |
2 |
Author: Bernardo Meurer <bernardo <AT> standard <DOT> ai> |
3 |
AuthorDate: Thu Sep 12 00:21:19 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 19 06:42:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f7d308 |
7 |
|
8 |
media-video/aravis: multiple fixes |
9 |
|
10 |
Closes: https://bugs.gentoo.org/693700 |
11 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
12 |
Signed-off-by: Bernardo Meurer <bernardo <AT> standard.ai> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/12907 |
14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
15 |
|
16 |
media-video/aravis/aravis-0.6.4.ebuild | 29 ++++++++++++++++------------- |
17 |
media-video/aravis/aravis-9999.ebuild | 29 ++++++++++++++++------------- |
18 |
media-video/aravis/metadata.xml | 8 ++++---- |
19 |
3 files changed, 36 insertions(+), 30 deletions(-) |
20 |
|
21 |
diff --git a/media-video/aravis/aravis-0.6.4.ebuild b/media-video/aravis/aravis-0.6.4.ebuild |
22 |
index 0f78ce56983..5ffb500be0c 100644 |
23 |
--- a/media-video/aravis/aravis-0.6.4.ebuild |
24 |
+++ b/media-video/aravis/aravis-0.6.4.ebuild |
25 |
@@ -16,30 +16,33 @@ else |
26 |
KEYWORDS="~amd64 ~x86" |
27 |
fi |
28 |
|
29 |
-LICENSE="LGPL-2" |
30 |
+LICENSE="LGPL-2+" |
31 |
SLOT="0" |
32 |
# FIXME: As of right now tests are always built, once that changes a USE flag |
33 |
# should be added. c.f. https://github.com/AravisProject/aravis/issues/286 |
34 |
-IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb X" |
35 |
+IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer" |
36 |
|
37 |
GST_DEPEND=" |
38 |
media-libs/gstreamer:1.0 |
39 |
media-libs/gst-plugins-base:1.0 |
40 |
" |
41 |
BDEPEND=" |
42 |
- >=dev-util/meson-0.47.0 |
43 |
+ dev-util/glib-utils |
44 |
virtual/pkgconfig |
45 |
- doc? ( dev-util/gtk-doc ) |
46 |
- introspection? ( dev-libs/gobject-introspection ) |
47 |
+ gtk-doc? ( |
48 |
+ dev-util/gtk-doc |
49 |
+ app-text/docbook-xml-dtd:4.3 |
50 |
+ ) |
51 |
+ introspection? ( dev-libs/gobject-introspection:= ) |
52 |
" |
53 |
DEPEND=" |
54 |
- >=dev-libs/glib-2.34 |
55 |
- dev-libs/libxml2:= |
56 |
- sys-libs/zlib:= |
57 |
+ >=dev-libs/glib-2.34:2 |
58 |
+ dev-libs/libxml2:2 |
59 |
+ sys-libs/zlib |
60 |
gstreamer? ( ${GST_DEPEND} ) |
61 |
packet-socket? ( sys-process/audit ) |
62 |
usb? ( virtual/libusb:1 ) |
63 |
- X? ( |
64 |
+ viewer? ( |
65 |
${GST_DEPEND} |
66 |
>=x11-libs/gtk+-3.12:3 |
67 |
x11-libs/libnotify |
68 |
@@ -53,13 +56,13 @@ fi |
69 |
|
70 |
src_configure() { |
71 |
local emesonargs=( |
72 |
- $(meson_use doc documentation) |
73 |
+ $(meson_use gtk-doc documentation) |
74 |
$(meson_use fast-heartbeat) |
75 |
$(meson_use gstreamer gst-plugin) |
76 |
$(meson_use introspection) |
77 |
$(meson_use packet-socket) |
78 |
$(meson_use usb) |
79 |
- $(meson_use X viewer) |
80 |
+ $(meson_use viewer) |
81 |
) |
82 |
meson_src_configure |
83 |
} |
84 |
@@ -74,12 +77,12 @@ src_install() { |
85 |
local install_p="${PN}-${install_pv}" |
86 |
|
87 |
# Properly place icons |
88 |
- if use X; then |
89 |
+ if use viewer; then |
90 |
cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons" |
91 |
fi |
92 |
|
93 |
# Symlink versioned binaries to non-versioned |
94 |
dosym "arv-tool-${install_pv}" "usr/bin/arv-tool" |
95 |
dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera" |
96 |
- use X && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" |
97 |
+ use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" |
98 |
} |
99 |
|
100 |
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild |
101 |
index 0f78ce56983..5ffb500be0c 100644 |
102 |
--- a/media-video/aravis/aravis-9999.ebuild |
103 |
+++ b/media-video/aravis/aravis-9999.ebuild |
104 |
@@ -16,30 +16,33 @@ else |
105 |
KEYWORDS="~amd64 ~x86" |
106 |
fi |
107 |
|
108 |
-LICENSE="LGPL-2" |
109 |
+LICENSE="LGPL-2+" |
110 |
SLOT="0" |
111 |
# FIXME: As of right now tests are always built, once that changes a USE flag |
112 |
# should be added. c.f. https://github.com/AravisProject/aravis/issues/286 |
113 |
-IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb X" |
114 |
+IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer" |
115 |
|
116 |
GST_DEPEND=" |
117 |
media-libs/gstreamer:1.0 |
118 |
media-libs/gst-plugins-base:1.0 |
119 |
" |
120 |
BDEPEND=" |
121 |
- >=dev-util/meson-0.47.0 |
122 |
+ dev-util/glib-utils |
123 |
virtual/pkgconfig |
124 |
- doc? ( dev-util/gtk-doc ) |
125 |
- introspection? ( dev-libs/gobject-introspection ) |
126 |
+ gtk-doc? ( |
127 |
+ dev-util/gtk-doc |
128 |
+ app-text/docbook-xml-dtd:4.3 |
129 |
+ ) |
130 |
+ introspection? ( dev-libs/gobject-introspection:= ) |
131 |
" |
132 |
DEPEND=" |
133 |
- >=dev-libs/glib-2.34 |
134 |
- dev-libs/libxml2:= |
135 |
- sys-libs/zlib:= |
136 |
+ >=dev-libs/glib-2.34:2 |
137 |
+ dev-libs/libxml2:2 |
138 |
+ sys-libs/zlib |
139 |
gstreamer? ( ${GST_DEPEND} ) |
140 |
packet-socket? ( sys-process/audit ) |
141 |
usb? ( virtual/libusb:1 ) |
142 |
- X? ( |
143 |
+ viewer? ( |
144 |
${GST_DEPEND} |
145 |
>=x11-libs/gtk+-3.12:3 |
146 |
x11-libs/libnotify |
147 |
@@ -53,13 +56,13 @@ fi |
148 |
|
149 |
src_configure() { |
150 |
local emesonargs=( |
151 |
- $(meson_use doc documentation) |
152 |
+ $(meson_use gtk-doc documentation) |
153 |
$(meson_use fast-heartbeat) |
154 |
$(meson_use gstreamer gst-plugin) |
155 |
$(meson_use introspection) |
156 |
$(meson_use packet-socket) |
157 |
$(meson_use usb) |
158 |
- $(meson_use X viewer) |
159 |
+ $(meson_use viewer) |
160 |
) |
161 |
meson_src_configure |
162 |
} |
163 |
@@ -74,12 +77,12 @@ src_install() { |
164 |
local install_p="${PN}-${install_pv}" |
165 |
|
166 |
# Properly place icons |
167 |
- if use X; then |
168 |
+ if use viewer; then |
169 |
cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons" |
170 |
fi |
171 |
|
172 |
# Symlink versioned binaries to non-versioned |
173 |
dosym "arv-tool-${install_pv}" "usr/bin/arv-tool" |
174 |
dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera" |
175 |
- use X && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" |
176 |
+ use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" |
177 |
} |
178 |
|
179 |
diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml |
180 |
index 0ea071b7518..7ee4d3d51ac 100644 |
181 |
--- a/media-video/aravis/metadata.xml |
182 |
+++ b/media-video/aravis/metadata.xml |
183 |
@@ -19,9 +19,9 @@ |
184 |
simulator and a simple video viewer. |
185 |
</longdescription> |
186 |
<use> |
187 |
- <flag name="X"> Build the GTK+-based video viewer.</flag> |
188 |
- <flag name="fast-heartbeat"> Enable faster heartbeat rate. </flag> |
189 |
- <flag name="gstreamer"> Build the GStreamer plugin.</flag> |
190 |
- <flag name="packet-socket"> Enable packet socket support.</flag> |
191 |
+ <flag name="fast-heartbeat">Enable faster heartbeat rate. </flag> |
192 |
+ <flag name="gstreamer">Build the GStreamer plugin.</flag> |
193 |
+ <flag name="packet-socket">Enable packet socket support.</flag> |
194 |
+ <flag name="viewer">Build the GTK+-based video viewer.</flag> |
195 |
</use> |
196 |
</pkgmetadata> |