Skip to content
Snippets Groups Projects
Verified Commit 4bf2d871 authored by Spotlight Deveaux's avatar Spotlight Deveaux :fox:
Browse files

chore: remove outdated packages

parent 04417864
No related branches found
No related tags found
No related merge requests found
AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9
DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929
DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148
EBUILD gtk-vnc-1.0.0.ebuild 1783 BLAKE2B f077fb5eb057b873c52b10f31151d5f4074abba1ce54225735fbfd0346d02a04a03cd009857834dc26ce15dbe0af899602eee440821337a7c070f8b23d02a558 SHA512 857ecda74d26ea3e7e76765bbfe50f1599a9629ce422c032762ca571e882301390f22a3bd2136e30ccfe5b14cb64cdaaddb78e69fa1c565a51f384c7068841e3
MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
From a51acc0c353959e8af06a031724a79cfe6b60963 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Sun, 5 Apr 2020 00:05:49 +0300
Subject: [PATCH] meson: Find python explicitly to honor downstream python
choice
---
src/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/meson.build b/src/meson.build
index 461d8d2..a09aee9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -308,7 +308,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
'vncdisplaykeymap.c',
]
-python = import('python').find_installation()
+python = import('python').find_installation('python3')
keymaps = [
'xorgevdev',
'xorgkbd',
--
2.20.1
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8} )
inherit gnome.org vala meson python-any-r1 xdg
DESCRIPTION="VNC viewer widget for GTK"
HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection pulseaudio sasl +vala"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
>=dev-libs/glib-2.42.0:2
>=x11-libs/gdk-pixbuf-2.12.0:2
>=dev-libs/libgcrypt-1.5.0:0=
>=net-libs/gnutls-3.1.18:0=
>=sys-libs/zlib-1.2.5
sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
>=x11-libs/gtk+-3.0.0:3[introspection?]
>=x11-libs/cairo-1.2.0
>=x11-libs/libX11-1.6.5
pulseaudio? ( >=media-sound/pulseaudio-10.0 )
introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
"
# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
# perl for pod2man
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
>=dev-lang/perl-5
dev-util/glib-utils
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
vala? ( $(vala_depend) )
"
PATCHES=(
# Few fixes from origin/master + optionality patches filed as https://gitlab.gnome.org/GNOME/gtk-vnc/merge_requests/6
"${WORKDIR}"/patches
"${FILESDIR}"/${PV}-honor-python-ver.patch
)
src_prepare() {
vala_src_prepare
xdg_src_prepare
# Don't add -O2 explicitly to CFLAGS
sed -i -e "/'-O2'/d" meson.build || die
}
src_configure() {
local emesonargs=(
$(meson_use introspection)
$(meson_feature pulseaudio)
$(meson_feature sasl)
-Denable-werror=false
-Dwith-coroutine=gthread
$(meson_use vala with-vala)
)
meson_src_configure
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
</pkgmetadata>
AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328
DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
EBUILD spice-gtk-0.39.ebuild 3232 BLAKE2B de6cb55a6b352ae179bd9cdb314c815508f4b1271b56718e983d51f8e4b1a1ae03616321de8e596c5d894febaf7030ae36346fab0694b515b5b83779fa1fa85d SHA512 4b71351032ac02c35c66babc482276c8012bd8d324e02f260cfdf94051409d6b5b30f3a3cc9ddaf3acdb6add802b0aabd0d88b8f241d620caff261058bf97df2
MISC metadata.xml 785 BLAKE2B b9448548d4a31423a95447eda043cf100df88fe9264889c2909442b64b54cc2d055c9faa8fa7698a161df5c838b1b38e1b1bd6d5c7b4d76ff67d33b48203cac9 SHA512 c5bf0dfd74d054fdef09eb86a98aadfa9c28fa1c2986b01a61c66151542c574db79710332ff0ccad45635278f57f7636d294ec3d0d2523a4cdc8a7c4cbbdddd0
If you choose to enable the video streaming support of gstreamer,
please try to install addtional gst-plugins which matching the video codecs
One the client side:
mjpeg,x264 media-plugins/gst-plugins-libav:1.0
vpx media-plugins/gst-plugins-vpx:1.0
One the server side (which app-emulation/qemu running), you should also install
additional gstreamer plugins for the app-emulation/spice package:
mjpeg media-plugins/gst-plugins-libav:1.0
vpx media-plugins/gst-plugins-vpx:1.0
x264 media-plugins/gst-plugins-x264:1.0
From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001
From: Snir Sheriber <ssheribe@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 <ssheribe@redhat.com>
Acked-by: Victor Toso <victortoso@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
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
<use>
<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>
<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
devices to another machine over TCP</flag>
<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>
</use>
</pkgmetadata>
# 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 eutils 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 libressl lz4 mjpeg policykit sasl smartcard usbredir vala wayland 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 )
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.3
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
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 lz4)
$(meson_feature sasl)
$(meson_feature smartcard)
$(meson_feature usbredir)
$(meson_feature vala vapi)
$(meson_feature webdav)
$(meson_feature wayland wayland-protocols)
-Dcoroutine=gthread
)
if use usbredir; then
emesonargs+=(
-Dusb-acl-helper-dir=/usr/libexec
-Dusb-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
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment