[jhbuild] sysdeps-3.20: Add libusb 1.0.9 to keep compatibility with FreeBSD
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] sysdeps-3.20: Add libusb 1.0.9 to keep compatibility with FreeBSD
- Date: Mon, 29 Feb 2016 03:39:32 +0000 (UTC)
commit 7a8490efbf497d04cfc244a2af0fc7361ad8dd17
Author: Ting-Wei Lan <lantw src gnome org>
Date: Mon Feb 29 11:13:32 2016 +0800
sysdeps-3.20: Add libusb 1.0.9 to keep compatibility with FreeBSD
FreeBSD seems to use a libusb implementation that is different from
libusb found on other operating systems, so the latest version may
be unavailable. FreeBSD 10.x (release and stable snapshot) only has
libusb 1.0.9 and FreeBSD 11.0 (development snapshot) has libusb 1.0.13.
To keep JHBuild working on FreeBSD, a system module called libusb1-1.0.9
is added to lower the version requirement.
Move usbredir and gnome-boxes to libusb1-1.0.9 because this is the
version requirement they set in their configure.ac.
Make libusb dependency of colord optional because it is only used
when libgusb support is enabled.
modulesets/gnome-apps-3.20.modules | 4 ++--
modulesets/gnome-suites-core-deps-3.20.modules | 2 +-
modulesets/gnome-sysdeps-3.20.modules | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 7ae1b85..62375fa 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -340,7 +340,7 @@
version="0.7"
hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
<dependencies>
- <dep package="libusb1"/>
+ <dep package="libusb1-1.0.9"/>
</dependencies>
</autotools>
@@ -559,7 +559,7 @@
<dep package="gtk-vnc"/>
<dep package="libgovirt"/>
<dep package="libosinfo"/>
- <dep package="libusb1"/>
+ <dep package="libusb1-1.0.9"/>
<dep package="libvirt-glib"/>
<dep package="gtk+"/>
<dep package="spice-gtk"/>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index d5a3584..f7d2793 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -237,7 +237,6 @@
<dep package="argyll"/>
<dep package="glib"/>
<dep package="dbus"/>
- <dep package="libusb1"/>
<dep package="sqlite3"/>
<dep package="lcms2"/>
<dep package="gobject-introspection"/>
@@ -245,6 +244,7 @@
<!-- and sane -->
<if condition-set="linux">
<dep package="libgusb"/>
+ <dep package="libusb1"/>
<dep package="gudev"/>
</if>
<if condition-set="systemd">
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 252ea1a..17734a0 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -760,6 +760,12 @@
<branch repo="system" version="1.0.19"/>
</systemmodule>
+ <!-- This system module is used to Keep compatibility with FreeBSD -->
+ <systemmodule id="libusb1-1.0.9">
+ <pkg-config>libusb-1.0.pc</pkg-config>
+ <branch repo="system" version="1.0.9"/>
+ </systemmodule>
+
<systemmodule id="libuuid">
<pkg-config>uuid.pc</pkg-config>
<branch repo="system"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]