From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- media-video/aravis/Manifest | 6 +-- media-video/aravis/aravis-0.6.4.ebuild | 88 ---------------------------------- media-video/aravis/aravis-0.7.2.ebuild | 68 ++++++++++++++++++++++++++ media-video/aravis/aravis-9999.ebuild | 24 +--------- 4 files changed, 73 insertions(+), 113 deletions(-) delete mode 100644 media-video/aravis/aravis-0.6.4.ebuild create mode 100644 media-video/aravis/aravis-0.7.2.ebuild (limited to 'media-video/aravis') diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest index 8415ab9aaa08..d3fdaf5489e3 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 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff -EBUILD aravis-9999.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff +DIST aravis-0.7.2.tar.gz 940928 BLAKE2B 67b6772aaf6195e393caf2f3fcf6d24acace9d7160023c801f93d479e9d488e4082dcd11d40a8db18dea6cd516e0b24cb78e46de09d455a3c822208d9f33af5b SHA512 5cc6c01f77462c595a87a5899df752a5018e72b4de108fc3bcebbb39542482fc535401a7f10732270d98998fe807c929ae9e7750cc7ac0ce089763d1eb148e2a +EBUILD aravis-0.7.2.ebuild 1583 BLAKE2B edd715fb9fdb9165a09220f99d56aa291c61aa9a0b712dd842f875a2c3141cd9d89c7506fa9eb4c1cfd8c81d76f70a76f9c3df8ed16d20c2628cbf870c6ed2ac SHA512 22684658e389605e30f2e23d7bcc2c9cb2f59955d84d51e915a65b97a1ee4a86dd3b887ac83350eeca19ce5bc99f5dff553eb13f907bb6d764ffb06154f09cc3 +EBUILD aravis-9999.ebuild 1583 BLAKE2B edd715fb9fdb9165a09220f99d56aa291c61aa9a0b712dd842f875a2c3141cd9d89c7506fa9eb4c1cfd8c81d76f70a76f9c3df8ed16d20c2628cbf870c6ed2ac SHA512 22684658e389605e30f2e23d7bcc2c9cb2f59955d84d51e915a65b97a1ee4a86dd3b887ac83350eeca19ce5bc99f5dff553eb13f907bb6d764ffb06154f09cc3 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 deleted file mode 100644 index 5ffb500be0c2..000000000000 --- a/media-video/aravis/aravis-0.6.4.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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="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/glib-utils - virtual/pkgconfig - gtk-doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 - ) - introspection? ( dev-libs/gobject-introspection:= ) -" -DEPEND=" - >=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 ) - viewer? ( - ${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 gtk-doc documentation) - $(meson_use fast-heartbeat) - $(meson_use gstreamer gst-plugin) - $(meson_use introspection) - $(meson_use packet-socket) - $(meson_use usb) - $(meson_use 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 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 viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" -} diff --git a/media-video/aravis/aravis-0.7.2.ebuild b/media-video/aravis/aravis-0.7.2.ebuild new file mode 100644 index 000000000000..f2dd9137fe00 --- /dev/null +++ b/media-video/aravis/aravis-0.7.2.ebuild @@ -0,0 +1,68 @@ +# 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="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/glib-utils + virtual/pkgconfig + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + introspection? ( dev-libs/gobject-introspection:= ) +" +DEPEND=" + dev-libs/glib:2[gtk-doc?] + dev-libs/libxml2:2 + sys-libs/zlib + gstreamer? ( ${GST_DEPEND} ) + packet-socket? ( sys-process/audit ) + usb? ( virtual/libusb:1 ) + viewer? ( + ${GST_DEPEND} + x11-libs/gtk+:3 + x11-libs/libnotify + ) +" +RDEPEND="${DEPEND}" + +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}/${PN}-${MY_P}" +fi + +src_configure() { + local emesonargs=( + $(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 viewer) + ) + meson_src_configure +} diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild index 5ffb500be0c2..f2dd9137fe00 100644 --- a/media-video/aravis/aravis-9999.ebuild +++ b/media-video/aravis/aravis-9999.ebuild @@ -36,7 +36,7 @@ BDEPEND=" introspection? ( dev-libs/gobject-introspection:= ) " DEPEND=" - >=dev-libs/glib-2.34:2 + dev-libs/glib:2[gtk-doc?] dev-libs/libxml2:2 sys-libs/zlib gstreamer? ( ${GST_DEPEND} ) @@ -44,7 +44,7 @@ DEPEND=" usb? ( virtual/libusb:1 ) viewer? ( ${GST_DEPEND} - >=x11-libs/gtk+-3.12:3 + x11-libs/gtk+:3 x11-libs/libnotify ) " @@ -66,23 +66,3 @@ src_configure() { ) 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 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 viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer" -} -- cgit v1.2.3