From e3cf2c86fca1750343c1885311f857f185ee4f2d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Sep 2019 01:07:24 +0100 Subject: gentoo resync : 08.09.2019 --- media-video/aravis/Manifest | 10 ++- media-video/aravis/aravis-0.5.10.ebuild | 67 ------------------- media-video/aravis/aravis-0.6.1.ebuild | 67 ------------------- media-video/aravis/aravis-0.6.4.ebuild | 85 ++++++++++++++++++++++++ media-video/aravis/aravis-9999.ebuild | 110 +++++++++++++++++++------------- media-video/aravis/metadata.xml | 43 +++++++------ 6 files changed, 176 insertions(+), 206 deletions(-) delete mode 100644 media-video/aravis/aravis-0.5.10.ebuild delete mode 100644 media-video/aravis/aravis-0.6.1.ebuild create mode 100644 media-video/aravis/aravis-0.6.4.ebuild (limited to 'media-video/aravis') diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest index 0a1d1d40def3..b9c3dc40f62d 100644 --- a/media-video/aravis/Manifest +++ b/media-video/aravis/Manifest @@ -1,6 +1,4 @@ -DIST aravis-0.5.10.tar.xz 540700 BLAKE2B f12a2bfa2bf8ac1875b28ec0549e5ebe3e5eb1cd646e417acc52a760546343893e19d7fb13741799346286dc69d9ecf2a7d7a3c9ada6ffefafab5c6450468848 SHA512 27a182a8fce66416e14baa16609b91307683613fab9324c96f94b9a7dd956ba0d60f5c966b2ec5184374ab8f9f527ad4d7733dffd2c40faa409ff196c344eb29 -DIST aravis-0.6.1.tar.xz 547700 BLAKE2B 7230cf49e08865b6f4e6621585c394633c54b94b921e4c686757eb21a02d5f51406f5084f92d41ad1880468001c908eb648fd2c2247def46bcbceea92bffa3ce SHA512 098a079c7efc5e5f9d198beef8a6271f525779947d1767eba81262a33c38afa6d9f01f254e25b714b9c74550795beed144bb463c0e14d2a46e6e96d1af19bde4 -EBUILD aravis-0.5.10.ebuild 1399 BLAKE2B a8c91562b5588799226c3f49849aec8f2d92e07768eecc5d96654ed16347676dc0aa01565881d8062594ffcc8547f5ad17065f331465d35bbb2b93820f49affc SHA512 7abf119d3e2ce6379e63590121c98137b888e22bfa37fbaeaec5ce1f75ecb391e3fce3e7000fd8c8b1ef43c0034f3aeb8916f492b1323f1a63c3d578ce6bbca4 -EBUILD aravis-0.6.1.ebuild 1396 BLAKE2B fe6f9314bdf863139f810e9aa285e51d0edb238ef78ef6685d9cc69ebc967f052351a0559254f25b405c2a87a2de5e81eed46bed389f03a58799c7d8eaf61711 SHA512 dadd49b753aed368b2af5651066c8757c4401566357b1ce0c3ccdd9b789ff6643f9f7ac6a705ab5c43b0d4727fdb1a58e64dfd6d087b223fca9a5b4796a55bcc -EBUILD aravis-9999.ebuild 1399 BLAKE2B a8c91562b5588799226c3f49849aec8f2d92e07768eecc5d96654ed16347676dc0aa01565881d8062594ffcc8547f5ad17065f331465d35bbb2b93820f49affc SHA512 7abf119d3e2ce6379e63590121c98137b888e22bfa37fbaeaec5ce1f75ecb391e3fce3e7000fd8c8b1ef43c0034f3aeb8916f492b1323f1a63c3d578ce6bbca4 -MISC metadata.xml 664 BLAKE2B 95779521829c716f4efdc591e0422c62be595b83c3eb3fd9d947314381cc92b8a74d62ce8f2338f073ab99f62a9e696a18e17d70fe4ea6f77664d47ea48af8cd SHA512 023c02e3a69fad5c7302d2dc857fa0de23096ecb80640f9adba7d12ab10e969be2a10f1183e44cf3a3afc6e57ec1585826b73907103490b78052bd10b0857cac +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 diff --git a/media-video/aravis/aravis-0.5.10.ebuild b/media-video/aravis/aravis-0.5.10.ebuild deleted file mode 100644 index b62b492a853b..000000000000 --- a/media-video/aravis/aravis-0.5.10.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/AravisProject/aravis.git" - inherit git-r3 autotools -else - SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Library for video acquisition using Genicam cameras" -HOMEPAGE="https://wiki.gnome.org/Projects/Aravis" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="X gstreamer caps" - -GST_DEPEND="media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0" - -RDEPEND=">=dev-libs/glib-2.26 - dev-libs/libxml2 - X? ( - >=x11-libs/gtk+-3.12:3 - ${GST_DEPEND} - media-libs/gst-plugins-base:1.0 - x11-libs/libnotify - ) - caps? ( - sys-libs/libcap-ng - sys-process/audit - ) - gstreamer? ( ${GST_DEPEND} )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-libs/gobject-introspection" - -if [[ ${PV} != *9999 ]]; then - DEPEND+=" dev-util/gtk-doc dev-util/intltool" -fi - -src_prepare() { - default - if [[ ${PV} = *9999 ]]; then - intltoolize || die - gtkdocize || die - eautoreconf - fi -} - -src_configure() { - econf \ - --disable-silent-rules \ - --disable-static \ - $(use_enable X viewer) \ - $(use_enable gstreamer gst-plugin) \ - $(use_enable caps packet-socket) \ - --enable-introspection -} - -src_install() { - emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}" - find "${D}" -name '*.la' -delete -} diff --git a/media-video/aravis/aravis-0.6.1.ebuild b/media-video/aravis/aravis-0.6.1.ebuild deleted file mode 100644 index 6136076e6a19..000000000000 --- a/media-video/aravis/aravis-0.6.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/AravisProject/aravis.git" - inherit git-r3 autotools -else - SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Library for video acquisition using Genicam cameras" -HOMEPAGE="https://wiki.gnome.org/Projects/Aravis" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="X gstreamer caps" - -GST_DEPEND="media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0" - -RDEPEND=">=dev-libs/glib-2.32 - dev-libs/libxml2 - X? ( - >=x11-libs/gtk+-3.12:3 - ${GST_DEPEND} - media-libs/gst-plugins-base:1.0 - x11-libs/libnotify - ) - caps? ( - sys-libs/libcap-ng - sys-process/audit - ) - gstreamer? ( ${GST_DEPEND} )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-libs/gobject-introspection" - -if [[ ${PV} != *9999 ]]; then - DEPEND+=" dev-util/gtk-doc dev-util/intltool" -fi - -src_prepare() { - default - if [[ ${PV} = *9999 ]]; then - intltoolize || die - gtkdocize || die - eautoreconf - fi -} - -src_configure() { - econf \ - --disable-silent-rules \ - --disable-static \ - $(use_enable X viewer) \ - $(use_enable gstreamer gst-plugin) \ - $(use_enable caps packet-socket) \ - --enable-introspection -} - -src_install() { - emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}" - find "${D}" -name '*.la' -delete -} diff --git a/media-video/aravis/aravis-0.6.4.ebuild b/media-video/aravis/aravis-0.6.4.ebuild new file mode 100644 index 000000000000..0f78ce56983b --- /dev/null +++ b/media-video/aravis/aravis-0.6.4.ebuild @@ -0,0 +1,85 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit meson xdg + +DESCRIPTION="Library for video acquisition using Genicam cameras" +HOMEPAGE="https://github.com/AravisProject/aravis" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AravisProject/${PN}" +else + MY_P="${PN^^}_${PV//./_}" + SRC_URI="https://github.com/AravisProject/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +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" + +GST_DEPEND=" + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 +" +BDEPEND=" + >=dev-util/meson-0.47.0 + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) +" +DEPEND=" + >=dev-libs/glib-2.34 + dev-libs/libxml2:= + sys-libs/zlib:= + gstreamer? ( ${GST_DEPEND} ) + packet-socket? ( sys-process/audit ) + usb? ( virtual/libusb:1 ) + X? ( + ${GST_DEPEND} + >=x11-libs/gtk+-3.12:3 + x11-libs/libnotify + ) +" +RDEPEND="${DEPEND}" + +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}/${PN}-${MY_P}" +fi + +src_configure() { + local emesonargs=( + $(meson_use 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_src_configure +} + +src_install() { + meson_src_install + # Aravis appends the major and min versions (but not the patch) to it's + # binaries and it's folder in /usr/share. Things then end up like + # `arv-tool-0.6`. We use this little hack to find out the version of the + # current build in a way that works even for a -9999 ebuild. + local install_pv="$(ls ${ED}/usr/share | grep aravis- | cut -f 2 -d '-')" + local install_p="${PN}-${install_pv}" + + # Properly place icons + if use X; 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" +} diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild index b62b492a853b..0f78ce56983b 100644 --- a/media-video/aravis/aravis-9999.ebuild +++ b/media-video/aravis/aravis-9999.ebuild @@ -1,67 +1,85 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit meson xdg -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/AravisProject/aravis.git" - inherit git-r3 autotools +DESCRIPTION="Library for video acquisition using Genicam cameras" +HOMEPAGE="https://github.com/AravisProject/aravis" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AravisProject/${PN}" else - SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~amd64" + MY_P="${PN^^}_${PV//./_}" + SRC_URI="https://github.com/AravisProject/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" fi -DESCRIPTION="Library for video acquisition using Genicam cameras" -HOMEPAGE="https://wiki.gnome.org/Projects/Aravis" - -LICENSE="LGPL-2.1" +LICENSE="LGPL-2" SLOT="0" -IUSE="X gstreamer caps" - -GST_DEPEND="media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.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" -RDEPEND=">=dev-libs/glib-2.26 - dev-libs/libxml2 +GST_DEPEND=" + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 +" +BDEPEND=" + >=dev-util/meson-0.47.0 + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) +" +DEPEND=" + >=dev-libs/glib-2.34 + dev-libs/libxml2:= + sys-libs/zlib:= + gstreamer? ( ${GST_DEPEND} ) + packet-socket? ( sys-process/audit ) + usb? ( virtual/libusb:1 ) X? ( - >=x11-libs/gtk+-3.12:3 ${GST_DEPEND} - media-libs/gst-plugins-base:1.0 + >=x11-libs/gtk+-3.12:3 x11-libs/libnotify ) - caps? ( - sys-libs/libcap-ng - sys-process/audit - ) - gstreamer? ( ${GST_DEPEND} )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-libs/gobject-introspection" +" +RDEPEND="${DEPEND}" -if [[ ${PV} != *9999 ]]; then - DEPEND+=" dev-util/gtk-doc dev-util/intltool" +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}/${PN}-${MY_P}" fi -src_prepare() { - default - if [[ ${PV} = *9999 ]]; then - intltoolize || die - gtkdocize || die - eautoreconf - fi -} - src_configure() { - econf \ - --disable-silent-rules \ - --disable-static \ - $(use_enable X viewer) \ - $(use_enable gstreamer gst-plugin) \ - $(use_enable caps packet-socket) \ - --enable-introspection + local emesonargs=( + $(meson_use 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_src_configure } src_install() { - emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}" - find "${D}" -name '*.la' -delete + meson_src_install + # Aravis appends the major and min versions (but not the patch) to it's + # binaries and it's folder in /usr/share. Things then end up like + # `arv-tool-0.6`. We use this little hack to find out the version of the + # current build in a way that works even for a -9999 ebuild. + local install_pv="$(ls ${ED}/usr/share | grep aravis- | cut -f 2 -d '-')" + local install_p="${PN}-${install_pv}" + + # Properly place icons + if use X; 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" } diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml index 1bfe243d4f2d..0ea071b7518a 100644 --- a/media-video/aravis/metadata.xml +++ b/media-video/aravis/metadata.xml @@ -1,24 +1,27 @@ - - lu_zero@gentoo.org - - - - media-video@gentoo.org - Gentoo Video project - - - - - Build the GTK+-based video viewer for aravis. This requires - GStreamer and a few plugins but technically not the GST plugin - for aravis. - - - - Build the GStreamer plugin for aravis, but not the video viewer. - - + + bernardo@standard.ai + Bernardo Meurer + + + lu_zero@gentoo.org + + + media-video@gentoo.org + Gentoo Video project + + + Aravis is a glib/gobject based library for video acquisition using Genicam + cameras. It currently implements the gigabit ethernet and USB3 protocols + used by industrial cameras. It also provides a basic ethernet camera + simulator and a simple video viewer. + + + Build the GTK+-based video viewer. + Enable faster heartbeat rate. + Build the GStreamer plugin. + Enable packet socket support. + -- cgit v1.2.3