Bump
This commit is contained in:
22
dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
Normal file
22
dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
From ccbd6cf1934056386772debba8583bc9b3721072 Mon Sep 17 00:00:00 2001
|
||||
From: Uffe Jakobsen <uffe@uffe.org>
|
||||
Date: Mon, 22 Oct 2012 12:03:22 +0200
|
||||
Subject: [PATCH] Fix build on FreeBSD (cmake file typo)
|
||||
|
||||
---
|
||||
examples/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
|
||||
index 6793d89..1263c62 100644
|
||||
--- a/examples/CMakeLists.txt
|
||||
+++ b/examples/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ option(EXAMPLES "Build example programs" ON)
|
||||
|
||||
if (EXAMPLES)
|
||||
# Includes
|
||||
- include( ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
38
dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
Normal file
38
dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From e18b700743217e8c505e97762e0f66a4f6a90425 Mon Sep 17 00:00:00 2001
|
||||
From: Maciej Grela <maciej.grela@gmail.com>
|
||||
Date: Wed, 20 Jun 2012 23:08:50 +0200
|
||||
Subject: [PATCH] Fix libftdi.pc file generation when building with
|
||||
-DDOCUMENTATION=OFF
|
||||
|
||||
---
|
||||
CMakeLists.txt | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4c43a48..07f8bb9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2,7 +2,9 @@
|
||||
project(libftdi)
|
||||
set(MAJOR_VERSION 0)
|
||||
set(MINOR_VERSION 20)
|
||||
+set(PACKAGE libftdi)
|
||||
set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
|
||||
+set(VERSION ${VERSION_STRING})
|
||||
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
|
||||
|
||||
# CMake
|
||||
@@ -116,12 +118,11 @@ add_custom_target(dist
|
||||
|
||||
option(DOCUMENTATION "Generate API documentation with Doxygen" ON)
|
||||
|
||||
+
|
||||
find_package(Doxygen)
|
||||
if(DOCUMENTATION AND DOXYGEN_FOUND)
|
||||
|
||||
# Set variables
|
||||
- set(PACKAGE libftdi)
|
||||
- set(VERSION ${VERSION_STRING})
|
||||
set(top_srcdir ${CMAKE_SOURCE_DIR})
|
||||
|
||||
# Find doxy config
|
||||
46
dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch
Normal file
46
dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
https://bugs.gentoo.org/766818
|
||||
|
||||
From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 17 Jul 2020 21:25:03 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set
|
||||
|
||||
Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
|
||||
is enabled as suggested by Aurelien Jarno in
|
||||
http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
|
||||
|
||||
Without this change, the libftdi1.pc config file defines the include
|
||||
path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
|
||||
installed in /usr/local/include/libftdi1
|
||||
|
||||
This is an issue for example for libsigrok which will fail on:
|
||||
|
||||
In file included from src/hardware/asix-sigma/protocol.c:27:
|
||||
src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
|
||||
28 | #include <ftdi.h>
|
||||
| ^~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5aecafc..3b0b87c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -136,7 +136,7 @@ endif ()
|
||||
|
||||
add_subdirectory(src)
|
||||
if ( FTDIPP )
|
||||
- project(libftdipp1 C CXX)
|
||||
+ project(libftdi1 C CXX)
|
||||
add_subdirectory(ftdipp)
|
||||
endif ()
|
||||
if ( PYTHON_BINDINGS )
|
||||
--
|
||||
1.7.1
|
||||
|
||||
35
dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch
Normal file
35
dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
Fixes failure to build tests with USE="-cxx" (default).
|
||||
http://developer.intra2net.com/git/?p=libftdi;a=patch;h=11a50ae5b80b3e03694a19e84513345d0794e563;hp=6dd18122a81e6030dd239391df6ffde8cb8c59c7
|
||||
From 11a50ae5b80b3e03694a19e84513345d0794e563 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Jarosch <thomas.jarosch@intra2net.com>
|
||||
Date: Mon, 24 Aug 2020 19:27:22 +0200
|
||||
Subject: [PATCH 1/1] Fix building unit tests without FTDIPP
|
||||
|
||||
Needed to run the baudrate unit tests.
|
||||
|
||||
Probably another fallout from:
|
||||
|
||||
****************************
|
||||
commit 0209a3633dc877a577af07d883eb5059e22f6a91
|
||||
|
||||
cmake: do not check for g++ when FTDIPP is disabled
|
||||
****************************
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3b0b87c..58f664a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -150,6 +150,7 @@ if ( EXAMPLES )
|
||||
endif ()
|
||||
add_subdirectory(packages)
|
||||
if ( BUILD_TESTS )
|
||||
+ project(libftdi1 C CXX)
|
||||
add_subdirectory(test)
|
||||
endif ()
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
Reference in New Issue
Block a user