diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /net-misc/spice-gtk | |
parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) |
gentoo resync : 25.04.2020
Diffstat (limited to 'net-misc/spice-gtk')
-rw-r--r-- | net-misc/spice-gtk/Manifest | 9 | ||||
-rw-r--r-- | net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch | 16 | ||||
-rw-r--r-- | net-misc/spice-gtk/metadata.xml | 4 | ||||
-rw-r--r-- | net-misc/spice-gtk/spice-gtk-0.35.ebuild | 145 | ||||
-rw-r--r-- | net-misc/spice-gtk/spice-gtk-0.38.ebuild | 111 | ||||
-rw-r--r-- | net-misc/spice-gtk/spice-gtk-9999.ebuild | 38 |
6 files changed, 127 insertions, 196 deletions
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index 6f5b4e3ae050..e6415dc56e0e 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,9 +1,8 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b -AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1 AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328 -DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029 -EBUILD spice-gtk-0.35.ebuild 3615 BLAKE2B 8fc23e955020a982699667345dcd2f6a874dce2465bb860ccb850f7448fed5fba005b80d2fa9fe30b98ea1f150b72a8bc28e809a6aa0da42c36a3a419397db5d SHA512 c091e7d04abecc7c0c42f7c47c02eb7910c6fd1776b962b613966b3a1604e3edba0696cf18d4e1675ae6495f8edf12f95186336a2d352beef4822f58d2894a33 +DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3 EBUILD spice-gtk-0.37-r2.ebuild 3737 BLAKE2B 1b379af9d6f19b31fe90150bf455c93eb5b1130789b70040ee5e82f9a8d073593744e7a965c5d88742012f7ee27d98e04c181885ab107d77aa0903499676d33b SHA512 20952e0c0b3ce3e3d8ba329f28b01fd3f0d2fd580f6ef67aa651c026fe93ceefbd8f05b9023a85b3ddfe41bae562fdd7b59455e7d5aecee9fb9253bd566390c0 -EBUILD spice-gtk-9999.ebuild 3394 BLAKE2B 2014ce9d0d762a51286f1f0b6cf7802606dad6dba0c2fe7e83ffd005828c81a0f09287de4561f51ea897195ed2261b5bba354d938b0d3ff518ef725d681e7759 SHA512 f9c4cd502006ce73f3129d32907e3e52ff2a217f497021ce398f49a6e2c422e2ae6de61acc70c250778a2a6fcfc09baed4f9577f9cb65aeefa7d713bbf5e7a85 -MISC metadata.xml 1072 BLAKE2B 0dec19853765b4a606a94fb31df1e6d569bc0131a7e2a9a28d822218b7f11d0d039d27d9bf4cdc43e073ed2ea433f1af7971a48a0529cd46b10f45f7b5ec1ff7 SHA512 8f94f0d99d6bfefba369f974d0b8358f86f5e3910279e5ab8ccb08b5ffb428f911ae64bb8904415e330c543609ee46c2dbd68f34912b50aca3929016fcac26de +EBUILD spice-gtk-0.38.ebuild 2982 BLAKE2B d055699e445e617d196fc3d96439a6655ffa04c1a5470c7d075bd67dfd02c1a7ee193fe2874e633fe931c8752068b5048e4f807b6f16c7c14eb818250dd2d522 SHA512 3a16071be02e1cdcc7f6ecda433b3909594b9a65a8013d3177f21340c8114e4528dedadb835843b1e51b36219cf10ef5ce9ffec09bfeeebdac5d5cfed0e22810 +EBUILD spice-gtk-9999.ebuild 2940 BLAKE2B 0cb8a953ead5b86666cdcb1d40d73d41154747373f9a680e4dcb05fd6a0f75462da1baebc6a7dd8a230988ed5651fd151980f82a16347e67a5d2df9d2f750f97 SHA512 5d435006992d90b633bf41a20dc516ffb1c6776fb96605df13f5b52575fada55bbb66dfc525feb2bd045d82ce26cc1bb856741a315fe4dd3565c97784dc8454d +MISC metadata.xml 785 BLAKE2B b9448548d4a31423a95447eda043cf100df88fe9264889c2909442b64b54cc2d055c9faa8fa7698a161df5c838b1b38e1b1bd6d5c7b4d76ff67d33b48203cac9 SHA512 c5bf0dfd74d054fdef09eb86a98aadfa9c28fa1c2986b01a61c66151542c574db79710332ff0ccad45635278f57f7636d294ec3d0d2523a4cdc8a7c4cbbdddd0 diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch deleted file mode 100644 index 572475d79a44..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://617764.bugs.gentoo.org/attachment.cgi?id=522368 -https://bugs.gentoo.org/617764 - ---- spice-gtk-0.34.orig/src/spice-channel.c 2017-07-12 10:23:31.000000000 +0200 -+++ spice-gtk-0.34/src/spice-channel.c 2018-03-04 13:12:14.351051444 +0100 -@@ -392,8 +392,10 @@ - - g_type_class_add_private(klass, sizeof(SpiceChannelPrivate)); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - SSL_library_init(); - SSL_load_error_strings(); -+#endif - } - - /* ---------------------------------------------------------------- */ diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml index 34612a8b0bad..713b32ac3ec9 100644 --- a/net-misc/spice-gtk/metadata.xml +++ b/net-misc/spice-gtk/metadata.xml @@ -6,8 +6,6 @@ <name>Gentoo Virtualization Project</name> </maintainer> <use> - <flag name="dbus">Support for desktop integration such as - automounting and other APIs exposed by your DE via D-Bus</flag> <flag name="gtk3">Build the spice client (spicy), requires <pkg>x11-libs/gtk+</pkg>:3</flag> <flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the usbredir acl helper</flag> @@ -16,7 +14,5 @@ <flag name="mjpeg">Enable builtin mjpeg video decoder</flag> <flag name="webdav">Support for folder-sharing between guest and client using <pkg>net-libs/phodav</pkg></flag> - <flag name="gstaudio">Using gstreamer backend as audio decodec support</flag> - <flag name="gstvideo">Using gstreamer backend as video decodec support</flag> </use> </pkgmetadata> diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild deleted file mode 100644 index 485627726ec5..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -inherit autotools eutils ltprune xdg-utils vala readme.gentoo-r1 - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl" - -REQUIRED_USE="?? ( pulseaudio gstaudio )" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - pulseaudio? ( media-sound/pulseaudio[glib] ) - gstvideo? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - ) - gstaudio? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - ) - >=x11-libs/pixman-0.17.7 - media-libs/opus - gtk3? ( x11-libs/gtk+:3[introspection?] ) - >=dev-libs/glib-2.46:2 - >=x11-libs/cairo-1.2 - virtual/jpeg:0= - sys-libs/zlib - introspection? ( dev-libs/gobject-introspection ) - lz4? ( app-arch/lz4 ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - dev-libs/libgudev:= - sys-apps/hwids - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - !~sys-auth/polkit-0.111 ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91 ) -" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.12.14 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.34-openssl11.patch -) - -src_prepare() { - # bug 558558 - export GIT_CEILING_DIRECTORIES="${WORKDIR}" - - default - - eautoreconf - - use vala && vala_src_prepare -} - -src_configure() { - # Prevent sandbox violations, bug #581836 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - # Clean up environment, bug #586642 - xdg_environment_reset - - local myconf - myconf=" - $(use_enable static-libs static) - $(use_enable introspection) - $(use_with sasl) - $(use_enable smartcard) - $(use_enable usbredir) - $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) - $(use_with usbredir usb-acl-helper-dir /usr/libexec) - $(use_with gtk3 gtk 3.0) - $(use_enable policykit polkit) - $(use_enable pulseaudio pulse) - $(use_enable gstaudio) - $(use_enable gstvideo) - $(use_enable mjpeg builtin-mjpeg) - $(use_enable vala) - $(use_enable webdav) - $(use_enable dbus) - --disable-celt051 - --disable-gtk-doc - --disable-maintainer-mode - --disable-werror - --enable-pie" - - econf ${myconf} -} - -src_compile() { - # Prevent sandbox violations, bug #581836 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - default -} - -src_install() { - default - - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - - # Remove .la files if they're not needed - use static-libs || prune_libtool_files - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} diff --git a/net-misc/spice-gtk/spice-gtk-0.38.ebuild b/net-misc/spice-gtk/spice-gtk-0.38.ebuild new file mode 100644 index 000000000000..f370fa8c0e7b --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.38.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VALA_MIN_API_VERSION="0.14" +VALA_USE_DEPEND="vapigen" + +inherit desktop eutils meson readme.gentoo-r1 vala xdg-utils + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" +HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" + +LICENSE="LGPL-2.1" +SLOT="0" +SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND=" + >=dev-libs/glib-2.46:2 + dev-libs/json-glib:0= + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0[introspection?] + media-libs/opus + sys-libs/zlib + virtual/jpeg:0= + >=x11-libs/cairo-1.2 + >=x11-libs/pixman-0.17.7 + gtk3? ( x11-libs/gtk+:3[introspection?] ) + introspection? ( dev-libs/gobject-introspection ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + lz4? ( app-arch/lz4 ) + pulseaudio? ( + media-plugins/gst-plugins-pulse:1.0 + ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwids + >=sys-apps/usbredir-0.4.2 + virtual/libusb:1 + policykit? ( + sys-apps/acl + >=sys-auth/polkit-0.110-r1 + ) + ) + webdav? ( + net-libs/phodav:2.0 + >=net-libs/libsoup-2.49.91 ) +" +# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a +# configure knob. The package is relatively lightweight so we just depend +# on it unconditionally for now. It would be cleaner to transform this into +# a USE="vaapi" conditional and patch the buildsystem... +RDEPEND="${RDEPEND} + amd64? ( x11-libs/libva:= ) + arm64? ( x11-libs/libva:= ) + x86? ( x11-libs/libva:= ) +" +DEPEND="${RDEPEND} + >=app-emulation/spice-protocol-0.14.1 + dev-perl/Text-CSV + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_feature gtk3 gtk) + $(meson_feature introspection) + $(meson_use mjpeg builtin-mjpeg) + $(meson_feature policykit polkit) + $(meson_feature pulseaudio pulse) + $(meson_feature lz4) + $(meson_feature sasl) + $(meson_feature smartcard) + $(meson_feature usbredir) + $(meson_feature vala vapi) + $(meson_feature webdav) + ) + + if use usbredir; then + emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" ) + emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" + readme.gentoo_create_doc +} diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 96f51b0281d4..e262e6bf9e87 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ LICENSE="LGPL-2.1" SLOT="0" EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" KEYWORDS="" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav libressl" +IUSE="+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav" # TODO: # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h @@ -36,7 +36,9 @@ RDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) - pulseaudio? ( media-sound/pulseaudio[glib] ) + pulseaudio? ( + media-plugins/gst-plugins-pulse:1.0 + ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( @@ -46,8 +48,8 @@ RDEPEND=" policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 - !~sys-auth/polkit-0.111 ) ) + ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) @@ -73,48 +75,32 @@ DEPEND="${RDEPEND} " src_prepare() { - # bug 558558 - export GIT_CEILING_DIRECTORIES="${WORKDIR}" - default use vala && vala_src_prepare } src_configure() { - # Prevent sandbox violations, bug #581836 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - # Clean up environment, bug #586642 - xdg_environment_reset - local emesonargs=( $(meson_feature gtk3 gtk) $(meson_feature introspection) $(meson_use mjpeg builtin-mjpeg) $(meson_feature policykit polkit) $(meson_feature pulseaudio pulse) + $(meson_feature lz4) $(meson_feature sasl) $(meson_feature smartcard) $(meson_feature usbredir) - $(usex usbredir -Dusb-acl-helper-dir=/usr/libexec) - $(usex usbredir -Dusb-ids-path=/usr/share/misc/usb.ids) $(meson_feature vala vapi) $(meson_feature webdav) ) - meson_src_configure -} + if use usbredir; then + emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" ) + emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" ) + fi -src_compile() { - # Prevent sandbox violations, bug #581836 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - meson_src_compile + meson_src_configure } src_install() { |