* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/files/, net-misc/spice-gtk/
@ 2016-08-17 6:37 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2016-08-17 6:37 UTC (permalink / raw
To: gentoo-commits
commit: dd016ae078f9dd434ea83da71d2425490b5824f4
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 05:13:16 2016 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 06:36:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd016ae0
net-misc/spice-gtk: fine tune IUSEs
1) replace IUSE=gstreamer with IUSE="gstaudio gstvideo"
so we can control audio/video backend seperately
possible has the combination USE="gstvideo -gstaudio pulseaudio"
2) introduce gentoo.readme to suggest users install mjpeg,vpx,x264
gstreamer plugins
Package-Manager: portage-2.3.0
net-misc/spice-gtk/files/README.gentoo | 14 +++
net-misc/spice-gtk/metadata.xml | 2 +
net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild | 137 ++++++++++++++++++++++++++++
3 files changed, 153 insertions(+)
diff --git a/net-misc/spice-gtk/files/README.gentoo b/net-misc/spice-gtk/files/README.gentoo
new file mode 100644
index 0000000..e18b6d8
--- /dev/null
+++ b/net-misc/spice-gtk/files/README.gentoo
@@ -0,0 +1,14 @@
+
+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
+
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 83884db..a84b4fb 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -19,5 +19,7 @@
<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.32-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
new file mode 100644
index 0000000..33d4a5b
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.12"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="http://spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="http://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/celt-0.5.1.1:0.5.1
+ media-libs/opus
+ gtk3? ( x11-libs/gtk+:3[introspection?] )
+ >=dev-libs/glib-2.36: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? (
+ sys-apps/hwids
+ >=sys-apps/usbredir-0.4.2
+ virtual/libusb:1
+ virtual/libgudev:=
+ policykit? (
+ sys-apps/acl
+ >=sys-auth/polkit-0.110-r1
+ !~sys-auth/polkit-0.111 )
+ )
+ webdav? (
+ net-libs/phodav:2.0
+ >=dev-libs/glib-2.43.90:2
+ >=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+ >=app-emulation/spice-protocol-0.12.11
+ dev-perl/Text-CSV
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.40.0
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+# Hard-deps while building from git:
+# dev-lang/vala:0.14
+# dev-lang/perl
+
+# Prevent sandbox violations, bug #581836
+# https://bugzilla.gnome.org/show_bug.cgi?id=581836
+addpredict /dev
+
+src_prepare() {
+ epatch_user
+
+ AT_NO_RECURSIVE="yes" eautoreconf
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local myconf
+
+ if use vala ; then
+ # force vala regen for MinGW, etc
+ rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+ fi
+
+ myconf="
+ --disable-maintainer-mode \
+ $(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-gtk-doc \
+ --disable-werror \
+ --enable-pie"
+
+ econf ${myconf}
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/files/, net-misc/spice-gtk/
@ 2017-05-11 5:43 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2017-05-11 5:43 UTC (permalink / raw
To: gentoo-commits
commit: 6c57d091a0e723d3182b0de13a7f1df7d54a9d6f
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 05:33:45 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu May 11 05:33:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c57d091
net-misc/spice-gtk: fix compile error, bug #604828
Fix a compilation issue
./.../libspice-client-glib-2.0.so: undefined reference to `minor'
by applying the corresponding upstream patch.
Thanks to Erik and Alexander for the patches.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../files/spice-gtk-0.33-sys-sysmacros.h.patch | 44 ++++++++++++++++++++++
...gtk-0.33-r1.ebuild => spice-gtk-0.33-r2.ebuild} | 12 +++---
2 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch b/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
new file mode 100644
index 00000000000..902ee9dd029
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
@@ -0,0 +1,44 @@
+From a27a83da30d58511b2a5f2cdb13ebd4fca7a3d0a Mon Sep 17 00:00:00 2001
+From: Pavel Grunt <pgrunt@redhat.com>
+Date: Tue, 1 Nov 2016 17:08:01 +0100
+Subject: [PATCH] Adjust include header to new location of macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+minor & major macros were moved to sysmacros.h
+
+usbutil.c: In function ‘spice_usbutil_get_sysfs_attribute’:
+usbutil.c:110:14: warning: ‘__major_from_sys_types’ is deprecated:
+ In the GNU C Library, `major' is defined by <sys/sysmacros.h>.
+ For historical compatibility, it is currently defined by
+ <sys/types.h> as well, but we plan to remove this soon.
+ To use `major', include <sys/sysmacros.h> directly.
+ If you did not intend to use a system-defined macro `major',
+ you should #undef it after including <sys/types.h>.
+ [-Wdeprecated-declarations]
+ major(stat_buf.st_rdev), minor(stat_buf.st_rdev), attribute);
+
+Acked-by: Victor Toso <victortoso@redhat.com>
+---
+ src/usbutil.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/usbutil.c b/src/usbutil.c
+index 7bfbe44..b68a2e1 100644
+--- a/src/usbutil.c
++++ b/src/usbutil.c
+@@ -30,7 +30,10 @@
+ #ifdef __linux__
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
++#ifndef major /* major and minor macros were moved to sys/sysmacros.h from sys/types.h */
+ #include <sys/types.h>
++#endif
+ #include <sys/stat.h>
+ #endif
+ #include "usbutil.h"
+--
+2.10.2
+
diff --git a/net-misc/spice-gtk/spice-gtk-0.33-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
similarity index 96%
rename from net-misc/spice-gtk/spice-gtk-0.33-r1.ebuild
rename to net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
index 2001af98eda..26dba5b782f 100644
--- a/net-misc/spice-gtk/spice-gtk-0.33-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.14"
VALA_USE_DEPEND="vapigen"
@@ -73,14 +73,14 @@ DEPEND="${RDEPEND}
vala? ( $(vala_depend) )
"
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.33-sys-sysmacros.h.patch
+)
src_prepare() {
- epatch_user
+ default
- AT_NO_RECURSIVE="yes" eautoreconf
+ eautoreconf
use vala && vala_src_prepare
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/files/, net-misc/spice-gtk/
@ 2017-05-11 14:24 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2017-05-11 14:24 UTC (permalink / raw
To: gentoo-commits
commit: d46e33e048ecb60cbb2b5052d112087e671dffb4
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 14:21:40 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu May 11 14:24:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46e33e0
net-misc/spice-gtk: drop old version 0.31
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-misc/spice-gtk/Manifest | 1 -
.../spice-gtk/files/spice-gtk-0.31-x11-libs.patch | 34 ----
.../spice-gtk/files/spice-gtk-0.32-x11-libs.patch | 34 ----
net-misc/spice-gtk/spice-gtk-0.31.ebuild | 179 ---------------------
4 files changed, 248 deletions(-)
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 73d71669a6a..9513bffbe5d 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,2 +1 @@
-DIST spice-gtk-0.31.tar.bz2 1340962 SHA256 c72b4d202b1c0b71d6e24ce5caf914d6dddbcf4010d10db9c2d8e73af728c1ca SHA512 f4aeaa8571829235c9f70b31676998d5c2c691619e63c26d374c62c3be9c2b4a0598f0fa7c5cce1db13fa60fd3b4d6053ce263fbd714add1f2791519a5c5038a WHIRLPOOL b0a2684288890c3dd7c07e56abd037eba1aa337b8bf8ec8c3dc9ceddd80772ab2eee36b4e021a5a08a86180c50625a495aa0b23f9da28508b5dafb165537c8ee
DIST spice-gtk-0.33.tar.bz2 1383927 SHA256 7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39 SHA512 ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80 WHIRLPOOL efe5f1684ac1ff569b744309ab18dfd0369411f1963e001060646ca7db5724bf2e306178963e104dba08c02c89782a08e2f8ce0db346efe28eeb495f9d5db4d8
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.31-x11-libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.31-x11-libs.patch
deleted file mode 100644
index 0d7e715db4c..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.31-x11-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac 2016-08-17 14:16:14.671302073 -0400
-+++ b/configure.ac 2016-08-17 14:14:57.351587309 -0400
-@@ -151,8 +151,12 @@
- SPICE_GTK_REQUIRES="${SPICE_GTK_REQUIRES} gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
-
- PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no])
--AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])])
-+AS_IF([test "x$have_x11" = "xyes"], [
-+AC_DEFINE([HAVE_X11], 1, [Have x11?])
-+PKG_CHECK_MODULES(X11, x11)])
- AM_CONDITIONAL([WITH_DISPLAY_X11], [test "x$have_x11" = "xyes"])
-+AC_SUBST(X11_CFLAGS)
-+AC_SUBST(X11_LIBS)
-
- PKG_CHECK_EXISTS([gtk+-quartz-$with_gtk], [have_quartz=yes], [have_quartz=no])
- AS_IF([test "x$have_quartz" = "xyes"], [AC_DEFINE([HAVE_QUARTZ], 1, [Have Quartz?])])
---- a/src/Makefile.am 2016-02-18 10:29:04.000000000 -0500
-+++ b/src/Makefile.am 2016-08-17 14:18:46.340742557 -0400
-@@ -103,6 +103,7 @@
- $(GUDEV_CFLAGS) \
- $(SOUP_CFLAGS) \
- $(PHODAV_CFLAGS) \
-+ $(X11_CFLAGS) \
- $(LZ4_CFLAGS) \
- $(NULL)
-
-@@ -123,6 +124,7 @@
- $(GTK_LIBS) \
- $(CAIRO_LIBS) \
- $(EPOXY_LIBS) \
-+ $(X11_LIBS) \
- $(LIBM) \
- $(NULL)
-
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.32-x11-libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.32-x11-libs.patch
deleted file mode 100644
index 02ea218e545..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.32-x11-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac 2016-06-16 07:34:31.000000000 -0400
-+++ b/configure.ac 2016-08-17 15:41:03.322532729 -0400
-@@ -163,6 +163,13 @@
- AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
-
- AC_CHECK_HEADERS([X11/XKBlib.h])
-+AS_IF([test "x$have_quartz" != "xyes"],[
-+ AS_IF([test "x$have_win32" != "xyes"],[
-+ PKG_CHECK_MODULES(X11,x11)
-+ ])
-+])
-+AC_SUBST(X11_CFLAGS)
-+AC_SUBST(X11_LIBS)
-
- AC_ARG_WITH([pnp-ids-path],
- AC_HELP_STRING([--with-pnp-ids-path],
---- a/src/Makefile.am 2016-08-17 15:44:42.081663331 -0400
-+++ b/src/Makefile.am 2016-08-17 15:45:24.701493950 -0400
-@@ -100,6 +100,7 @@
- $(GUDEV_CFLAGS) \
- $(SOUP_CFLAGS) \
- $(PHODAV_CFLAGS) \
-+ $(X11_CFLAGS) \
- $(LZ4_CFLAGS) \
- $(NULL)
-
-@@ -119,6 +120,7 @@
- libspice-client-glib-2.0.la \
- $(GTK_LIBS) \
- $(CAIRO_LIBS) \
-+ $(X11_LIBS) \
- $(LIBM) \
- $(NULL)
-
diff --git a/net-misc/spice-gtk/spice-gtk-0.31.ebuild b/net-misc/spice-gtk/spice-gtk-0.31.ebuild
deleted file mode 100644
index fa846e02e01..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.31.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multibuild python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )
-"
-
-# 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="
- ${PYTHON_DEPS}
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- 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/celt-0.5.1.1:0.5.1
- media-libs/opus
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.28:2
- >=x11-libs/cairo-1.2
- x11-libs/libX11
- virtual/jpeg:0=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=dev-libs/glib-2.43.90:2
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- ~app-emulation/spice-protocol-0.12.11
- dev-perl/Text-CSV
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- ${PYTHON_DEPS}
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-x11-libs.patch
- epatch_user
-
- AT_NO_RECURSIVE="yes" 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
-
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- --disable-maintainer-mode \
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(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_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- --disable-gtk-doc \
- --disable-werror \
- --enable-pie"
-
- # Parameter of --with-gtk
- MULTIBUILD_VARIANTS=( 2.0 )
- use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-
- configure() {
- local myconf=()
- myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
-
- if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
- myconf+=( $(use_with python) )
- else
- myconf+=( --without-python )
- fi
-
- ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
- }
- multibuild_foreach_variant run_in_build_dir configure ${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
-
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
- # 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
-
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- multibuild_foreach_variant run_in_build_dir default
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/files/, net-misc/spice-gtk/
@ 2018-03-19 15:31 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2018-03-19 15:31 UTC (permalink / raw
To: gentoo-commits
commit: bd6ee50aacb0fb9bd65ffd81e40e2266bf2b7b03
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 15:29:37 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 15:29:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6ee50a
net-misc/spice-gtk: Apply openssl11/libressl patches
Bug: https://bugs.gentoo.org/631250
Bug: https://bugs.gentoo.org/617764
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../spice-gtk/files/spice-gtk-0.34-libressl.patch | 43 ++++++
.../spice-gtk/files/spice-gtk-0.34-openssl11.patch | 16 +++
net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild | 153 +++++++++++++++++++++
3 files changed, 212 insertions(+)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
new file mode 100644
index 00000000000..e39efaee274
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/631250
+https://631250.bugs.gentoo.org/attachment.cgi?id=513720
+
+diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
+index a9ed650..821faa9 100644
+--- a/spice-common/common/ssl_verify.c
++++ b/spice-common/common/ssl_verify.c
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <gio/gio.h>
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+ {
+ return M_ASN1_STRING_data(asn1);
+diff --git a/src/bio-gio.c b/src/bio-gio.c
+index 9358fae..30aa73b 100644
+--- a/src/bio-gio.c
++++ b/src/bio-gio.c
+@@ -23,7 +23,7 @@
+ #include "spice-util.h"
+ #include "bio-gio.h"
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static BIO_METHOD one_static_bio;
+
+ static int BIO_meth_set_read(BIO_METHOD *biom,
+diff --git a/src/spice-channel.c b/src/spice-channel.c
+index 4c3db9d..9df0203 100644
+--- a/src/spice-channel.c
++++ b/src/spice-channel.c
+@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
+ static void spice_channel_send_migration_handshake(SpiceChannel *channel);
+ static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
+ {
+ if (pkey->type != EVP_PKEY_RSA) {
+
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
new file mode 100644
index 00000000000..572475d79a4
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
@@ -0,0 +1,16 @@
+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/spice-gtk-0.34-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
new file mode 100644
index 00000000000..3bba2079f5f
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 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.36: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? (
+ sys-apps/hwids
+ >=sys-apps/usbredir-0.4.2
+ virtual/libusb:1
+ virtual/libgudev:=
+ policykit? (
+ sys-apps/acl
+ >=sys-auth/polkit-0.110-r1
+ !~sys-auth/polkit-0.111 )
+ )
+ webdav? (
+ net-libs/phodav:2.0
+ >=dev-libs/glib-2.43.90:2
+ >=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+ >=app-emulation/spice-protocol-0.12.13
+ dev-perl/Text-CSV
+ >=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}-libressl.patch
+ "${FILESDIR}"/${P}-openssl11.patch
+)
+
+src_prepare() {
+ # bug 558558
+ export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+ echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
+
+ 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
+
+ if use vala ; then
+ # force vala regen for MinGW, etc
+ rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+ fi
+
+ 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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/files/, net-misc/spice-gtk/
@ 2019-10-15 16:33 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2019-10-15 16:33 UTC (permalink / raw
To: gentoo-commits
commit: f5cfa9720519e4f6fd27d91fdb8d0a20ec856c15
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 16:30:51 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 16:33:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cfa972
net-misc/spice-gtk: fix scaling bug
* Backport a patch to 0.37
Closes: https://bugs.gentoo.org/686570
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../spice-gtk-0.37-adjust-to-window-scaling.patch | 132 +++++++++++++++++++++
net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild | 1 +
2 files changed, 133 insertions(+)
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
new file mode 100644
index 00000000000..504cb7c4848
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
@@ -0,0 +1,132 @@
+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
+
diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
index 264775d7926..cb24fbda3a8 100644
--- a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
@@ -74,6 +74,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
+ "${FILESDIR}"/${P}-adjust-to-window-scaling.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-15 16:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-11 14:24 [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/files/, net-misc/spice-gtk/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2019-10-15 16:33 Matthias Maier
2018-03-19 15:31 Matthias Maier
2017-05-11 5:43 Matthias Maier
2016-08-17 6:37 Yixun Lan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox