[arch-commits] Commit in libftdi/trunk (PKGBUILD fix_includes_path.patch)

[Anatol Pomozov]

    Date: Friday, March 19, 2021 @ 22:34:27
  Author: anatolik
Revision: 895355

upgpkg: libftdi 1.5-2: Build package with correct path inside the *.pc

Added:
  libftdi/trunk/fix_includes_path.patch
Modified:
  libftdi/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   10 +++++++---
 fix_includes_path.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-19 22:34:14 UTC (rev 895354)
+++ PKGBUILD	2021-03-19 22:34:27 UTC (rev 895355)
@@ -2,7 +2,7 @@
 
 pkgname=libftdi
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to talk to FTDI chips, optional python bindings."
 arch=('x86_64')
 url="https://www.intra2net.com/en/developer/libftdi/download.php"
@@ -11,9 +11,11 @@
 optdepends=('python: library bindings')
 makedepends=('boost' 'cmake' 'python' 'swig')
 # doxygen for docs, confuse for eeprom
-source=(https://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig})
+source=(https://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig}
+        fix_includes_path.patch)
 sha1sums=('0b4dc9763342d094d2b5e74ced7d10d574b4758d'
-          'SKIP')
+          'SKIP'
+          '5c45106586d28ef86ca2ac64b67fadae18c52331')
 validpgpkeys=('3CEA9B8868BC3852618EB5B4707F91A424F006F5')  # Intra2net open source
 
 prepare() {
@@ -20,6 +22,8 @@
   cd "${pkgname}1-$pkgver"
   sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt
   sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" packages/99-libftdi.rules
+
+  patch -p1 < ../fix_includes_path.patch
 }
 
 build() {

Added: fix_includes_path.patch
===================================================================
--- fix_includes_path.patch	                        (rev 0)
+++ fix_includes_path.patch	2021-03-19 22:34:27 UTC (rev 895355)
@@ -0,0 +1,41 @@
+From: Fabrice Fontaine <fontaine.fabrice at gmail.com>
+Date: Fri, 17 Jul 2020 19:25:03 +0000 (+0200)
+Subject: CMakeLists.txt: fix paths when FTDIPP is set
+X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=cdb28383402d248dbc6062f4391b038375c52385;hp=5c2c58e03ea999534e8cb64906c8ae8b15536c30
+
+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 at gmail.com>
+---
+
+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 )