commit: 65870053ec411056eefe286d150b3707bc68d539 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Dec 24 21:44:35 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Dec 25 00:02:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65870053
net-misc/spice-gtk: drop 0.37-r3, 0.38-r2, 0.38-r3 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/spice-gtk/Manifest | 2 - .../spice-gtk-0.37-adjust-to-window-scaling.patch | 132 ------------------- net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild | 140 --------------------- net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild | 110 ---------------- net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild | 125 ------------------ 5 files changed, 509 deletions(-) diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index 4be76f585699..5de070645502 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,3 +1 @@ -DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029 -DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2 diff --git a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch deleted file mode 100644 index 504cb7c4848b..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001 -From: Snir Sheriber <ssher...@redhat.com> -Date: Thu, 28 Feb 2019 11:44:34 +0200 -Subject: [PATCH] Adjust to window scaling - -When GDK_SCALE is != 1 and egl is used, the image presented does not -fit to the window (scale of 2 is often used with hidpi monitors). -Usually this is not a problem since all components are adjusted by -gdk/gtk but with egl, pixel-based data is not being scaled. In this -case window's scale value can be used in order to determine whether -to use a pixel resource with higher resolution data. - -In order to reproduce the problem set spice with virgl/Intel-vGPU -and run spice-gtk with GDK_SCALE=2 - -This issue was also reported at freedesktop gitlab repo: -https://gitlab.freedesktop.org/spice/spice-gtk/issues/99 - -Signed-off-by: Snir Sheriber <ssher...@redhat.com> -Acked-by: Victor Toso <victort...@redhat.com> ---- - src/spice-widget-egl.c | 7 ++++--- - src/spice-widget.c | 27 +++++++++++++++++++-------- - 2 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c -index 43fccd7..7bae4e5 100644 ---- a/src/spice-widget-egl.c -+++ b/src/spice-widget-egl.c -@@ -360,9 +360,9 @@ gboolean spice_egl_realize_display(SpiceDisplay *display, GdkWindow *win, GError - DISPLAY_DEBUG(display, "egl realize"); - if (!spice_widget_init_egl_win(display, win, err)) - return FALSE; -- -- spice_egl_resize_display(display, gdk_window_get_width(win), -- gdk_window_get_height(win)); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, gdk_window_get_width(win) * scale_factor, -+ gdk_window_get_height(win) * scale_factor); - - return TRUE; - } -@@ -426,6 +426,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display) - #endif - } - -+/* w and h should be adjusted to gdk scaling */ - G_GNUC_INTERNAL - void spice_egl_resize_display(SpiceDisplay *display, int w, int h) - { -diff --git a/src/spice-widget.c b/src/spice-widget.c -index 1f2a154..a9ba1f1 100644 ---- a/src/spice-widget.c -+++ b/src/spice-widget.c -@@ -1382,7 +1382,8 @@ static void set_egl_enabled(SpiceDisplay *display, bool enabled) - } - - if (enabled && d->egl.context_ready) { -- spice_egl_resize_display(display, d->ww, d->wh); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor); - } - - d->egl.enabled = enabled; -@@ -1978,11 +1979,14 @@ static void transform_input(SpiceDisplay *display, - SpiceDisplayPrivate *d = display->priv; - int display_x, display_y, display_w, display_h; - double is; -+ gint scale_factor = 1; - - spice_display_get_scaling(display, NULL, - &display_x, &display_y, - &display_w, &display_h); -- -+ if (egl_enabled(d)) { -+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ } - /* For input we need a different scaling factor in order to - be able to reach the full width of a display. For instance, consider - a display of 100 pixels showing in a window 10 pixels wide. The normal -@@ -1998,7 +2002,7 @@ static void transform_input(SpiceDisplay *display, - coordinates in the inverse direction (window -> display) as the fb size - (display -> window). - */ -- is = (double)(d->area.width-1) / (double)(display_w-1); -+ is = ((double)(d->area.width-1) / (double)(display_w-1)) * scale_factor; - - window_x -= display_x; - window_y -= display_y; -@@ -2183,8 +2187,10 @@ static void size_allocate(GtkWidget *widget, GtkAllocation *conf, gpointer data) - d->wh = conf->height; - recalc_geometry(widget); - #if HAVE_EGL -- if (egl_enabled(d)) -- spice_egl_resize_display(display, conf->width, conf->height); -+ if (egl_enabled(d)) { -+ gint scale_factor = gtk_widget_get_scale_factor(widget); -+ spice_egl_resize_display(display, conf->width * scale_factor, conf->height * scale_factor); -+ } - #endif - } - -@@ -2942,10 +2948,14 @@ void spice_display_get_scaling(SpiceDisplay *display, - int ww, wh; - int x, y, w, h; - double s; -+ gint scale_factor = 1; - - if (gtk_widget_get_realized (GTK_WIDGET(display))) { -- ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)); -- wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)); -+ if (egl_enabled(d)) { -+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ } -+ ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)) * scale_factor; -+ wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)) * scale_factor; - } else { - ww = fbw; - wh = fbh; -@@ -3091,7 +3101,8 @@ void spice_display_widget_gl_scanout(SpiceDisplay *display) - g_clear_error(&err); - } - -- spice_egl_resize_display(display, d->ww, d->wh); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor); - } - #endif - --- -2.21.0 - diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild deleted file mode 100644 index e6215587090b..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -inherit autotools desktop 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs 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 ) - dev-libs/openssl:0= - lz4? ( app-arch/lz4 ) - pulseaudio? ( media-sound/pulseaudio[glib] ) - 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 - !~sys-auth/polkit-0.111 ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) -" -# 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.0 - 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}"/${P}-adjust-to-window-scaling.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_with gtk3 gtk 3.0) - $(use_enable introspection) - $(use_enable mjpeg builtin-mjpeg) - $(use_enable policykit polkit) - $(use_enable pulseaudio pulse) - $(use_with sasl) - $(use_enable smartcard) - $(use_enable static-libs static) - $(use_enable usbredir) - $(use_with usbredir usb-acl-helper-dir /usr/libexec) - $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) - $(use_enable vala) - $(use_enable webdav) - --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 - - # Remove .la files if they're not needed - use static-libs || find "${D}" -name '*.la' -delete || die - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild deleted file mode 100644 index d70e837b73f2..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 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 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 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 ) - dev-libs/openssl: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:2.4 ) -" -# 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-0.38-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild deleted file mode 100644 index 3d714471af99..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 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" - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit desktop meson python-any-r1 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 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 ) - dev-libs/openssl: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:2.4 ) -" -# 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) ) -" - -BDEPEND=" - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - ') -" - -python_check_deps() { - has_version "dev-python/six[${PYTHON_USEDEP}]" && - has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - sed -i -e "/^ '-Werror',/d" \ - subprojects/spice-common/meson.build || die - 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 -}
