From 54f7d30876ba90e10f0fa4ab68223e3bbe32e271 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 11 Sep 2019 17:21:19 -0700 Subject: media-video/aravis: multiple fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/693700 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Bernardo Meurer Closes: https://github.com/gentoo/gentoo/pull/12907 Signed-off-by: Michał Górny --- media-video/aravis/aravis-0.6.4.ebuild | 29 ++++++++++++++++------------- media-video/aravis/aravis-9999.ebuild | 29 ++++++++++++++++------------- media-video/aravis/metadata.xml | 8 ++++---- 3 files changed, 36 insertions(+), 30 deletions(-) (limited to 'media-video/aravis') 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-65-gdbad