| 1 |
dev-zero 12/10/29 10:19:26 |
| 2 |
|
| 3 |
Added: |
| 4 |
0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch |
| 5 |
Log: |
| 6 |
Allow building with usbredir >=0.5.2 (bug #439972) which is safe according to the comment in the patch. |
| 7 |
|
| 8 |
(Portage version: 2.1.11.20/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch |
| 17 |
=================================================================== |
| 18 |
From a8a6ac1d0f4893860efad48833ce6168f684054a Mon Sep 17 00:00:00 2001 |
| 19 |
From: Hans de Goede <hdegoede@××××××.com> |
| 20 |
Date: Tue, 25 Sep 2012 12:59:13 +0200 |
| 21 |
Subject: [PATCH 01/21] Deal with libusbredirparser.pc rename to |
| 22 |
libusbredirparser-0.5.pc |
| 23 |
|
| 24 |
The usbredir 0.5 release introduced the new API for 64 bit packet ids, but |
| 25 |
it kept the libusbredirparser.pc name as is, meaning that older versions of |
| 26 |
qemu will still have their pkg-config check for usbredirparser fulfilled, |
| 27 |
and build with the usb-redir device. Due to the API change there will be |
| 28 |
some compiler warnings, but the build will succeed, however the usb-redir |
| 29 |
device will be broken on 32 bit machines. |
| 30 |
|
| 31 |
To solve this, the usbredir-0.5.2 release renames the libusbredirparser.pc |
| 32 |
file to libusbredirparser-0.5.pc, so that it will no longer fulfill the |
| 33 |
pkg-config check of the qemu-1.2 and older releases, stopping the (silent) |
| 34 |
breakage. |
| 35 |
|
| 36 |
spice-gtk does not use the changed parts of the API, but does |
| 37 |
use libusbredirparser for the usbredirfilter* functions. This patch adapts |
| 38 |
spice-gtk's configure to accept both the libusbredirparser-0.5 and the |
| 39 |
libusbredirparser pkg-config names. |
| 40 |
|
| 41 |
Signed-off-by: Hans de Goede <hdegoede@××××××.com> |
| 42 |
--- |
| 43 |
configure.ac | 15 +++++++++++---- |
| 44 |
1 file changed, 11 insertions(+), 4 deletions(-) |
| 45 |
|
| 46 |
diff --git a/configure.ac b/configure.ac |
| 47 |
index c7367cc..7c59575 100644 |
| 48 |
--- a/configure.ac |
| 49 |
+++ b/configure.ac |
| 50 |
@@ -349,10 +349,17 @@ AC_ARG_ENABLE([usbredir], |
| 51 |
if test "x$enable_usbredir" = "xno"; then |
| 52 |
have_usbredir="no" |
| 53 |
else |
| 54 |
- PKG_CHECK_MODULES([USBREDIR], |
| 55 |
- [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4], |
| 56 |
- [have_usbredir=yes], |
| 57 |
- [have_usbredir=no]) |
| 58 |
+ if ${PKG_CONFIG} libusbredirparser-0.5; then |
| 59 |
+ PKG_CHECK_MODULES([USBREDIR], |
| 60 |
+ [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5], |
| 61 |
+ [have_usbredir=yes], |
| 62 |
+ [have_usbredir=no]) |
| 63 |
+ else |
| 64 |
+ PKG_CHECK_MODULES([USBREDIR], |
| 65 |
+ [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4], |
| 66 |
+ [have_usbredir=yes], |
| 67 |
+ [have_usbredir=no]) |
| 68 |
+ fi |
| 69 |
if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then |
| 70 |
AC_MSG_ERROR([usbredir support explicitly requested, but some required packages are not available]) |
| 71 |
fi |
| 72 |
-- |
| 73 |
1.7.12.1 |
Archives