diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-09-25 12:41:59 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2012-09-25 12:58:17 +0200 |
| commit | dca68e5664b3dc4f7e91b5df4b8656b5e8386b6e (patch) | |
| tree | dfb90ef1444bfcee639c773448aefc48d88df5f1 | |
| parent | a7ca5b2569106561e6846bd1699ba5397dc13f68 (diff) | |
Rename libusbredirparser.pc to libusbredirparser-0.5.pcusbredir-0.5.2
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, this patch 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.
A patch has been send to qemu-devel to adjusts qemu master's configure.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | usbredirhost/libusbredirhost.pc.in | 2 | ||||
| -rw-r--r-- | usbredirparser/Makefile.am | 2 | ||||
| -rw-r--r-- | usbredirparser/libusbredirparser-0.5.pc.in (renamed from usbredirparser/libusbredirparser.pc.in) | 2 |
5 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +usbredir-0.5.2 15 September 2012 +-------------------------------- +-usbredirparser: + -rename libusbredirparser.pc to libusbredirparser-0.5.pc + This should really have been done with the 0.5 release as API + compatibility with previous releases was broken there! + usbredir-0.5.1 19 September 2012 -------------------------------- -usbredirparser: diff --git a/configure.ac b/configure.ac index 77316d3..d73e749 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([usbredir], [0.5.1]) +AC_INIT([usbredir], [0.5.2]) AC_CONFIG_SRCDIR([configure.ac]) AM_CONFIG_HEADER([config.h]) @@ -62,7 +62,7 @@ Makefile usbredirhost/Makefile usbredirhost/libusbredirhost.pc usbredirparser/Makefile -usbredirparser/libusbredirparser.pc +usbredirparser/libusbredirparser-0.5.pc usbredirserver/Makefile usbredirtestclient/Makefile ]) diff --git a/usbredirhost/libusbredirhost.pc.in b/usbredirhost/libusbredirhost.pc.in index ce11f33..65841f2 100644 --- a/usbredirhost/libusbredirhost.pc.in +++ b/usbredirhost/libusbredirhost.pc.in @@ -7,5 +7,5 @@ Name: libusbredirhost Description: usbredirhost library Version: @VERSION@ Libs: -L${libdir} -lusbredirhost -Requires.private: libusb-1.0 libusbredirparser +Requires.private: libusb-1.0 libusbredirparser-0.5 Cflags: -I${includedir} diff --git a/usbredirparser/Makefile.am b/usbredirparser/Makefile.am index 53c1012..e9cd917 100644 --- a/usbredirparser/Makefile.am +++ b/usbredirparser/Makefile.am @@ -11,4 +11,4 @@ libusbredirparser_la_SOURCES += strtok_r.c strtok_r.h endif pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libusbredirparser.pc +pkgconfig_DATA = libusbredirparser-0.5.pc diff --git a/usbredirparser/libusbredirparser.pc.in b/usbredirparser/libusbredirparser-0.5.pc.in index 2bb1a62..4fc7acd 100644 --- a/usbredirparser/libusbredirparser.pc.in +++ b/usbredirparser/libusbredirparser-0.5.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libusbredirparser +Name: libusbredirparser-0.5 Description: usbredirparser library Version: @VERSION@ Libs: -L${libdir} -lusbredirparser |