[packages/uhd] - up to 4.1.0.1

[baggins]

commit de08c29380ae54a94449c9e8d4647dfcd1b6f010
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 15 16:44:12 2021 +0200

    - up to 4.1.0.1

 uhd-libdir.patch    |  7 ++++---
 uhd-mpm-build.patch | 16 +++++++++-------
 uhd.spec            | 10 +++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/uhd.spec b/uhd.spec
index 5545eba..7b58f47 100644
--- a/uhd.spec
+++ b/uhd.spec
@@ -5,13 +5,13 @@
 Summary:	Universal Hardware Driver for Ettus Research products
 Summary(pl.UTF-8):	Uniwersalny sterownik sprzętowy do produktów Ettus Research
 Name:		uhd
-Version:	3.15.0.0
-Release:	2
+Version:	4.1.0.1
+Release:	1
 License:	GPL v3+
 Group:		Applications/System
 #Source0Download: https://github.com/EttusResearch/uhd/releases
 Source0:	https://github.com/EttusResearch/uhd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	cf589d5130ebd8348e3dbf129a7c5c38
+# Source0-md5:	a05185b631e7f0491d76d75a2568219e
 Patch0:		%{name}-boost.patch
 Patch1:		%{name}-libdir.patch
 Patch2:		%{name}-link.patch
@@ -160,9 +160,9 @@ Biblioteka USRP Module Peripheral Manager dla Pythona.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' host/examples/python/*.py
diff --git a/uhd-libdir.patch b/uhd-libdir.patch
index 0367d53..8f3a11f 100644
--- a/uhd-libdir.patch
+++ b/uhd-libdir.patch
@@ -1,6 +1,7 @@
---- uhd-3.15.0.0/host/CMakeLists.txt.orig	2020-07-10 06:56:50.762728346 +0200
-+++ uhd-3.15.0.0/host/CMakeLists.txt	2020-07-10 07:16:02.483155608 +0200
-@@ -416,14 +416,6 @@
+diff -urNp -x '*.orig' uhd-4.1.0.1.org/host/CMakeLists.txt uhd-4.1.0.1/host/CMakeLists.txt
+--- uhd-4.1.0.1.org/host/CMakeLists.txt	2021-07-13 17:10:44.000000000 +0200
++++ uhd-4.1.0.1/host/CMakeLists.txt	2021-08-15 16:33:42.068712434 +0200
+@@ -458,14 +458,6 @@ endif()
  ########################################################################
  # Create Pkg Config File
  ########################################################################
diff --git a/uhd-mpm-build.patch b/uhd-mpm-build.patch
index cc5ec83..7585c4f 100644
--- a/uhd-mpm-build.patch
+++ b/uhd-mpm-build.patch
@@ -1,5 +1,6 @@
---- uhd-3.15.0.0/mpm/lib/i2c/CMakeLists.txt.orig	2020-01-01 05:21:49.000000000 +0100
-+++ uhd-3.15.0.0/mpm/lib/i2c/CMakeLists.txt	2020-07-10 21:45:41.727143057 +0200
+diff -urNp -x '*.orig' uhd-4.1.0.1.org/mpm/lib/i2c/CMakeLists.txt uhd-4.1.0.1/mpm/lib/i2c/CMakeLists.txt
+--- uhd-4.1.0.1.org/mpm/lib/i2c/CMakeLists.txt	2021-07-13 17:10:44.000000000 +0200
++++ uhd-4.1.0.1/mpm/lib/i2c/CMakeLists.txt	2021-08-15 16:33:43.898704758 +0200
 @@ -3,6 +3,8 @@
  #
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -9,9 +10,10 @@
  set(I2C_SOURCES
      ${CMAKE_CURRENT_SOURCE_DIR}/i2cdev_iface.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/i2c_regs_iface.cpp
---- uhd-3.15.0.0/mpm/tools/eeprom.c.orig	2020-07-10 21:47:16.076631922 +0200
-+++ uhd-3.15.0.0/mpm/tools/eeprom.c	2020-07-10 21:47:18.816617078 +0200
-@@ -278,7 +278,7 @@
+diff -urNp -x '*.orig' uhd-4.1.0.1.org/mpm/tools/eeprom.c uhd-4.1.0.1/mpm/tools/eeprom.c
+--- uhd-4.1.0.1.org/mpm/tools/eeprom.c	2021-07-13 17:10:44.000000000 +0200
++++ uhd-4.1.0.1/mpm/tools/eeprom.c	2021-08-15 16:33:43.898704758 +0200
+@@ -278,7 +278,7 @@ void usrp_sulfur_eeprom_to_file(struct u
  	size_t len = sizeof(*ep);
  	size_t got = 0;
  
@@ -20,7 +22,7 @@
  	if (fd < 0) {
  		perror("Could not open file:\n");
  		return;
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ void usrp_sulfur_db_eeprom_to_file(struc
  	size_t len = sizeof(*ep);
  	size_t got = 0;
  
@@ -29,7 +31,7 @@
  	if (fd < 0) {
  		perror("Could not open file:\n");
  		return;
-@@ -397,7 +397,7 @@
+@@ -397,7 +397,7 @@ void usrp_sulfur_eeprom_to_i2c(struct us
  	size_t len = sizeof(*ep);
  	size_t i;
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/uhd.git/commitdiff/de08c29380ae54a94449c9e8d4647dfcd1b6f010