Accepting request 1207954 from hardware

- Update to version 1.5.42+git.de9f01e:
  * CMake: bump the minimal required version to 3.5
  * python: move from distutils to sysconfig
  * CMake: use ${PC_LIBUSB_LIBRARIES} instead of a library name
  * CMake: fix multiarch support
  * CMake: make the project compatible with building as a subproject
  * ftdipp/CMakeLists.txt: remove VIM modline settings
  * CMake: rework subdirectory handling
  * CMake: rework findlibusb module
  * CMake: report CMake version
  * CMake: use dedicated recipe for documentation generation
D 0001-Fix-race-during-build-of-python-bindings.patch
Patch got integrated mainline

OBS-URL: https://build.opensuse.org/request/show/1207954
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libftdi1?expand=0&rev=23
This commit is contained in:
Ana Guerrero 2024-10-15 12:57:50 +00:00 committed by Git OBS Bridge
commit b83fd2abef
8 changed files with 31 additions and 47 deletions

View File

@ -1,34 +0,0 @@
From 579f5cb2df5e337df2848f686af3308e45950b81 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Thu, 16 Mar 2023 10:55:18 +0100
Subject: [PATCH] Fix race during build of python bindings
The CMake documentation says about add_custom_command that the output must
not be used as dependency in more than one target, but this was the case
here: Both the doc_i target and the SWIG target depended on ftdi1_doc.i.
Make the SWIG target depend on doc_i instead.
This fixes that ftdi1_doc.i was built twice with parallel builds, leading
to random errors.
Signed-off-by: Fabian Vogt <fvogt@suse.de>
---
python/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 5b6f420..1a8142b 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories ( ${CMAKE_CURRENT_BINARY_DIR}/../src )
if ( DOCUMENTATION )
set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
# manually add dependency for new cmake / swig versions
- set_property(SOURCE ftdi1.i PROPERTY DEPENDS ftdi1_doc.i)
+ set_property(SOURCE ftdi1.i PROPERTY DEPENDS doc_i)
endif()
if(NOT CMAKE_VERSION VERSION_LESS 3.8.0)
swig_add_library ( ftdi1 LANGUAGE python SOURCES ftdi1.i )
--
2.39.2

View File

@ -1,5 +1,5 @@
<services> <services>
<service name="obs_scm" mode="localonly"> <service name="obs_scm" mode="manual">
<param name="url">git://developer.intra2net.com/libftdi</param> <param name="url">git://developer.intra2net.com/libftdi</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
@ -8,7 +8,7 @@
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@+git.%h</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@+git.%h</param>
<param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-pattern">v(.*)</param>
</service> </service>
<service name="set_version" mode="localonly"/> <service name="set_version" mode="manual"/>
<service name="tar" mode="buildtime"/> <service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime"> <service name="recompress" mode="buildtime">
<param name="file">*.tar</param> <param name="file">*.tar</param>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://developer.intra2net.com/libftdi</param>
<param name="changesrevision">de9f01ece34d2fe6e842e0250a38f4b16eda2429</param></service></servicedata>

BIN
libftdi1-1.5.12+git.0684c1b.obscpio (Stored with Git LFS)

Binary file not shown.

BIN
libftdi1-1.5.42+git.de9f01e.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon May 13 13:19:55 UTC 2024 - trenn@suse.de
- Update to version 1.5.42+git.de9f01e:
* CMake: bump the minimal required version to 3.5
* python: move from distutils to sysconfig
* CMake: use ${PC_LIBUSB_LIBRARIES} instead of a library name
* CMake: fix multiarch support
* CMake: make the project compatible with building as a subproject
* ftdipp/CMakeLists.txt: remove VIM modline settings
* CMake: rework subdirectory handling
* CMake: rework findlibusb module
* CMake: report CMake version
* CMake: use dedicated recipe for documentation generation
D 0001-Fix-race-during-build-of-python-bindings.patch
Patch got integrated mainline
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 16 10:02:33 UTC 2023 - Fabian Vogt <fvogt@suse.com> Thu Mar 16 10:02:33 UTC 2023 - Fabian Vogt <fvogt@suse.com>

View File

@ -1,5 +1,4 @@
name: libftdi1 name: libftdi1
version: 1.5.12+git.0684c1b version: 1.5.42+git.de9f01e
mtime: 1620147075 mtime: 1703171675
commit: 0684c1b1be9ccb893829c20a8505c91e101bbf43 commit: de9f01ece34d2fe6e842e0250a38f4b16eda2429

View File

@ -1,7 +1,7 @@
# #
# spec file for package libftdi1 # spec file for package libftdi1
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,15 +19,13 @@
%define sover -2 %define sover -2
%define libname %{name}%{sover} %define libname %{name}%{sover}
Name: libftdi1 Name: libftdi1
Version: 1.5.12+git.0684c1b Version: 1.5.42+git.de9f01e
Release: 0 Release: 0
Summary: Library to program and control the FTDI USB controller Summary: Library to program and control the FTDI USB controller
License: LGPL-2.1-only AND GPL-2.0-only AND GPL-2.0-with-classpath-exception License: LGPL-2.1-only AND GPL-2.0-only AND GPL-2.0-with-classpath-exception
Group: Hardware/Other Group: Hardware/Other
URL: https://www.intra2net.com/en/developer/libftdi URL: https://www.intra2net.com/en/developer/libftdi
Source: libftdi1-%{version}.tar.xz Source: libftdi1-%{version}.tar.xz
# PATCH-FIX-UPSTREAM: http://developer.intra2net.com/mailarchive/html/libftdi/2023/msg00005.html
Patch1: 0001-Fix-race-during-build-of-python-bindings.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++