From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- media-video/aravis/Manifest | 6 +++--- media-video/aravis/aravis-0.6.4.ebuild | 29 ++++++++++++++++------------- media-video/aravis/aravis-9999.ebuild | 29 ++++++++++++++++------------- media-video/aravis/metadata.xml | 8 ++++---- 4 files changed, 39 insertions(+), 33 deletions(-) (limited to 'media-video/aravis') diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest index b9c3dc40f62d..8415ab9aaa08 100644 --- a/media-video/aravis/Manifest +++ b/media-video/aravis/Manifest @@ -1,4 +1,4 @@ DIST aravis-0.6.4.tar.gz 2972111 BLAKE2B b7f1c4da08bb4e7d11faffcd4ef90b7215b803e5e74ba1730388e04304685b761024ffea49b082c94e3fddc9dc65201545167a277b1088ad7273d41d50fae5b0 SHA512 6090fd730ad9fe8e1641e48c52189e8961bf03a88cefb57135a2de985c2ca607c21b05d472a60586976aa1e05ba2121246b06b75179dd3241e1f703aad8dd7be -EBUILD aravis-0.6.4.ebuild 2334 BLAKE2B a94fadb74204da7d244cab54aadf9ab3528682e08fc9319327e461ce056099bc3aa08e6c1a70b11b9ad8634af651779979e0c5612bb5823aa7ba02a874f3b0cf SHA512 5cc140f9e395f1a44b2e5e9577793dfd524766d5a27599c8e83e453d0f9a36f3bef035ef255332b8a4470bd757b79b771adead6f9e72d7feadf01a8e2a03ef4a -EBUILD aravis-9999.ebuild 2334 BLAKE2B a94fadb74204da7d244cab54aadf9ab3528682e08fc9319327e461ce056099bc3aa08e6c1a70b11b9ad8634af651779979e0c5612bb5823aa7ba02a874f3b0cf SHA512 5cc140f9e395f1a44b2e5e9577793dfd524766d5a27599c8e83e453d0f9a36f3bef035ef255332b8a4470bd757b79b771adead6f9e72d7feadf01a8e2a03ef4a -MISC metadata.xml 1033 BLAKE2B b1f6f5e7f9a1c8f81dbb5717bbef6c6828bb922537f7408dadd4b03f6a5329ae1e451a1371fe411a78c9212f78497ba4f57fb433a7d31fd6aaccf2c196794e11 SHA512 f13cf2a72f4194f01d4f744611d525c95bc77d3e1faf0a5e01671696bd7ed1cf13b35a87bddfff8626f4bc206e5c9eeef175c15889affa726309c3b07bd48841 +EBUILD aravis-0.6.4.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff +EBUILD aravis-9999.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff +MISC metadata.xml 1034 BLAKE2B 61fbcc77a880be8ad08247941fd60fb7efcd04dda5b95928b15121d3e0343b570c95d617845afffd8cab943a0bdca8d598e2145686d7a6528c95b5336b2c4e7a SHA512 4c86b8bfc2c0c4f8da3be0f08cccf0d18c5897edd41c40939ea0a6f79881353991629d02a8e28d1b3cdb2da2d77d7275fd77bb23f7a394a82f4a2cfabe177004 diff --git a/media-video/aravis/aravis-0.6.4.ebuild b/media-video/aravis/aravis-0.6.4.ebuild index 0f78ce56983b..5ffb500be0c2 100644 --- a/media-video/aravis/aravis-0.6.4.ebuild +++ b/media-video/aravis/aravis-0.6.4.ebuild @@ -16,30 +16,33 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="LGPL-2" +LICENSE="LGPL-2+" SLOT="0" # FIXME: As of right now tests are always built, once that changes a USE flag # should be added. c.f. https://github.com/AravisProject/aravis/issues/286 -IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb X" +IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer" GST_DEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 " BDEPEND=" - >=dev-util/meson-0.47.0 + dev-util/glib-utils virtual/pkgconfig - doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + introspection? ( dev-libs/gobject-introspection:= ) " DEPEND=" - >=dev-libs/glib-2.34 - dev-libs/libxml2:= - sys-libs/zlib:= + >=dev-libs/glib-2.34:2 + dev-libs/libxml2:2 + sys-libs/zlib gstreamer? ( ${GST_DEPEND} ) packet-socket? ( sys-process/audit ) usb? ( virtual/libusb:1 ) - X? ( + viewer? ( ${GST_DEPEND} >=x11-libs/gtk+-3.12:3 x11-libs/libnotify @@ -53,13 +56,13 @@ fi src_configure() { local emesonargs=( - $(meson_use doc documentation) + $(meson_use gtk-doc documentation) $(meson_use fast-heartbeat) $(meson_use gstreamer gst-plugin) $(meson_use introspection) $(meson_use packet-socket) $(meson_use usb) - $(meson_use X viewer) + $(meson_use viewer) ) meson_src_configure } @@ -74,12 +77,12 @@ src_install() { local install_p="${PN}-${install_pv}" # Properly place icons - if use X; then + if use viewer; then cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons" fi # Symlink versioned binaries to non-versioned dosym "arv-tool-${install_pv}" "usr/bin/arv-tool" dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera" - use X && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" + use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" } diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild index 0f78ce56983b..5ffb500be0c2 100644 --- a/media-video/aravis/aravis-9999.ebuild +++ b/media-video/aravis/aravis-9999.ebuild @@ -16,30 +16,33 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="LGPL-2" +LICENSE="LGPL-2+" SLOT="0" # FIXME: As of right now tests are always built, once that changes a USE flag # should be added. c.f. https://github.com/AravisProject/aravis/issues/286 -IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb X" +IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer" GST_DEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 " BDEPEND=" - >=dev-util/meson-0.47.0 + dev-util/glib-utils virtual/pkgconfig - doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + introspection? ( dev-libs/gobject-introspection:= ) " DEPEND=" - >=dev-libs/glib-2.34 - dev-libs/libxml2:= - sys-libs/zlib:= + >=dev-libs/glib-2.34:2 + dev-libs/libxml2:2 + sys-libs/zlib gstreamer? ( ${GST_DEPEND} ) packet-socket? ( sys-process/audit ) usb? ( virtual/libusb:1 ) - X? ( + viewer? ( ${GST_DEPEND} >=x11-libs/gtk+-3.12:3 x11-libs/libnotify @@ -53,13 +56,13 @@ fi src_configure() { local emesonargs=( - $(meson_use doc documentation) + $(meson_use gtk-doc documentation) $(meson_use fast-heartbeat) $(meson_use gstreamer gst-plugin) $(meson_use introspection) $(meson_use packet-socket) $(meson_use usb) - $(meson_use X viewer) + $(meson_use viewer) ) meson_src_configure } @@ -74,12 +77,12 @@ src_install() { local install_p="${PN}-${install_pv}" # Properly place icons - if use X; then + if use viewer; then cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons" fi # Symlink versioned binaries to non-versioned dosym "arv-tool-${install_pv}" "usr/bin/arv-tool" dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera" - use X && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" + use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" } diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml index 0ea071b7518a..7ee4d3d51ac3 100644 --- a/media-video/aravis/metadata.xml +++ b/media-video/aravis/metadata.xml @@ -19,9 +19,9 @@ simulator and a simple video viewer. - Build the GTK+-based video viewer. - Enable faster heartbeat rate. - Build the GStreamer plugin. - Enable packet socket support. + Enable faster heartbeat rate. + Build the GStreamer plugin. + Enable packet socket support. + Build the GTK+-based video viewer. -- cgit v1.2.3