rpms/spice-gtk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Prepare for building with usbredir >= 0.5.2

Browse Source 
Not actually building this, just making sure the next time we do a build
it does not break because of the usbredir changes.
This commit is contained in:
Hans de Goede 2012-09-25 22:41:39 +02:00
parent d24980b2dd
commit d68791c908
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
0001-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch Normal file
View File

@ -0,0 +1,57 @@
From 6d1505386982aee3622afc1d25f1989965832a55 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 25 Sep 2012 12:59:13 +0200
Subject: [PATCH spice-gtk] Deal with libusbredirparser.pc rename to
libusbredirparser-0.5.pc
The usbredir 0.5 release introduced the new API for 64 bit packet ids, but
it kept the libusbredirparser.pc name as is, meaning that older versions of
qemu will still have their pkg-config check for usbredirparser fulfilled,
and build with the usb-redir device. Due to the API change there will be
some compiler warnings, but the build will succeed, however the usb-redir
device will be broken on 32 bit machines.
To solve this, the usbredir-0.5.2 release renames the libusbredirparser.pc
file to libusbredirparser-0.5.pc, so that it will no longer fulfill the
pkg-config check of the qemu-1.2 and older releases, stopping the (silent)
breakage.
spice-gtk does not use the changed parts of the API, but does
use libusbredirparser for the usbredirfilter* functions. This patch adapts
spice-gtk's configure to accept both the libusbredirparser-0.5 and the
libusbredirparser pkg-config names.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
configure.ac | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index c7367cc..7c59575 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,10 +349,17 @@ AC_ARG_ENABLE([usbredir],
if test "x$enable_usbredir" = "xno"; then
have_usbredir="no"
else
- PKG_CHECK_MODULES([USBREDIR],
- [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
- [have_usbredir=yes],
- [have_usbredir=no])
+ if ${PKG_CONFIG} libusbredirparser-0.5; then
+ PKG_CHECK_MODULES([USBREDIR],
+ [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5],
+ [have_usbredir=yes],
+ [have_usbredir=no])
+ else
+ PKG_CHECK_MODULES([USBREDIR],
+ [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
+ [have_usbredir=yes],
+ [have_usbredir=no])
+ fi
if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then
AC_MSG_ERROR([usbredir support explicitly requested, but some required packages are not available])
fi
--
1.7.12

10
spice-gtk.spec
View File

@ -21,10 +21,11 @@ License: LGPLv2+
URL: http://spice-space.org/page/Spice-Gtk
#VCS: git:git://anongit.freedesktop.org/spice/spice-gtk
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
Patch0: 0001-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch
BuildRequires: intltool
BuildRequires: gtk2-devel >= 2.14
BuildRequires: usbredir-devel >= 0.5
BuildRequires: usbredir-devel >= 0.5.2
BuildRequires: libusb1-devel >= 1.0.9
BuildRequires: libgudev1-devel
BuildRequires: perl-Text-CSV
@ -146,9 +147,10 @@ if [ -n '%{?_version_suffix}' ]; then
mv spice-gtk-%{version}%{?_version_suffix} spice-gtk-%{version}
fi
#pushd spice-gtk-%{version}
#patch1 -p1
#popd
pushd spice-gtk-%{version}
%patch0 -p1
autoreconf -f -i
popd
%if %{with_gtk3}
cp -a spice-gtk-%{version} spice-gtk3-%{version}