From 6a442ce79d7de7195887e02c4eabadfafabfa725 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Feb 10 2019 00:56:02 +0000 Subject: Backport fix to build with libusb-1.0 > 1.0.21 --- diff --git a/0001-Allow-versions-of-libusb-1.0-newer-than-1.0.21-to-sa.patch b/0001-Allow-versions-of-libusb-1.0-newer-than-1.0.21-to-sa.patch new file mode 100644 index 0000000..4d1ffdf --- /dev/null +++ b/0001-Allow-versions-of-libusb-1.0-newer-than-1.0.21-to-sa.patch @@ -0,0 +1,30 @@ +From 035183d70fcd75ea3de659ac6350047b419eb600 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Fri, 30 Mar 2018 09:36:19 -0400 +Subject: [PATCH] Allow versions of libusb-1.0 newer than 1.0.21 to satisfy the + dependency + +The libusb-1.0 dependency was set to exactly require 1.0.21, which +breaks the build when trying to build against 1.0.22. + +Signed-off-by: Neal Gompa +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b0c0a25..3b1982b 100644 +--- a/meson.build ++++ b/meson.build +@@ -93,7 +93,7 @@ config_h = configure_file( + config_h_dir = include_directories('.') + + # Required dependencies +-dep_usb = dependency('libusb-1.0', version: '1.0.21') ++dep_usb = dependency('libusb-1.0', version: '>= 1.0.21') + + glib_min_version = '>= 2.54.0' + dep_glib2 = dependency('glib-2.0', version: glib_min_version) +-- +2.20.1 + diff --git a/linux-driver-management.spec b/linux-driver-management.spec index a694b9f..fae8bc6 100644 --- a/linux-driver-management.spec +++ b/linux-driver-management.spec @@ -6,13 +6,15 @@ Name: linux-driver-management Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generic driver management framework for Linux License: LGPLv2+ and CC-BY-SA URL: https://github.com/solus-project/linux-driver-management Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz +# Backports from upstream +Patch0001: 0001-Allow-versions-of-libusb-1.0-newer-than-1.0.21-to-sa.patch BuildRequires: meson BuildRequires: pkgconfig(glib-2.0) >= %{glib2_minver} @@ -153,6 +155,9 @@ controlled and configured by Linux Driver Management. %endif %changelog +* Sat Feb 09 2019 Neal Gompa - 1.0.3-4 +- Backport fix to build with libusb-1.0 > 1.0.21 + * Fri Feb 01 2019 Fedora Release Engineering - 1.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild