[arch-commits] Commit in libftdi/repos/community-staging-x86_64 (4 files)
Felix Yan
felixonmars at gemini.archlinux.org
Thu Dec 2 18:46:02 UTC 2021
Date: Thursday, December 2, 2021 @ 18:46:02
Author: felixonmars
Revision: 1062256
archrelease: copy trunk to community-staging-x86_64
Added:
libftdi/repos/community-staging-x86_64/PKGBUILD
(from rev 1062253, libftdi/trunk/PKGBUILD)
libftdi/repos/community-staging-x86_64/fix_includes_path.patch
(from rev 1062253, libftdi/trunk/fix_includes_path.patch)
Deleted:
libftdi/repos/community-staging-x86_64/PKGBUILD
libftdi/repos/community-staging-x86_64/fix_includes_path.patch
-------------------------+
PKGBUILD | 106 +++++++++++++++++++++++-----------------------
fix_includes_path.patch | 82 +++++++++++++++++------------------
2 files changed, 94 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-02 18:46:01 UTC (rev 1062255)
+++ PKGBUILD 2021-12-02 18:46:02 UTC (rev 1062256)
@@ -1,53 +0,0 @@
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-
-pkgname=libftdi
-pkgver=1.5
-pkgrel=3
-pkgdesc="A library to talk to FTDI chips, optional python bindings."
-arch=('x86_64')
-url="https://www.intra2net.com/en/developer/libftdi/download.php"
-license=('GPL2' 'LGPL2.1')
-depends=('libusb' 'confuse')
-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}
- fix_includes_path.patch)
-sha1sums=('0b4dc9763342d094d2b5e74ced7d10d574b4758d'
- 'SKIP'
- '5c45106586d28ef86ca2ac64b67fadae18c52331')
-validpgpkeys=('3CEA9B8868BC3852618EB5B4707F91A424F006F5') # Intra2net open source
-
-prepare() {
- 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() {
- cd "$srcdir/${pkgname}1-$pkgver"
- mkdir -p build
- cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON \
- -DCMAKE_BUILD_TYPE=Release -DEXAMPLES=OFF -DFTDI_EEPROM=ON \
- -DFTDIPP=ON -DPYTHON_BINDINGS=ON -DLINK_PYTHON_LIBRARY=ON
- make
-}
-
-# needs yet unknown dependencies
-#check() {
-# cd "$srcdir/${pkgname}1-$pkgver/build"
-# make check
-#}
-
-package() {
- cd "${pkgname}1-$pkgver/build"
-
- make DESTDIR="$pkgdir" install
- install -Dm644 "../packages/99-libftdi.rules" "$pkgdir/usr/lib/udev/rules.d/69-libftdi.rules"
- # FS#45053
- install -d "$pkgdir/usr/share/libftdi/examples"
- cp -r ../examples/* "$pkgdir/usr/share/libftdi/examples"
-}
Copied: libftdi/repos/community-staging-x86_64/PKGBUILD (from rev 1062253, libftdi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-02 18:46:02 UTC (rev 1062256)
@@ -0,0 +1,53 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+
+pkgname=libftdi
+pkgver=1.5
+pkgrel=4
+pkgdesc="A library to talk to FTDI chips, optional python bindings."
+arch=('x86_64')
+url="https://www.intra2net.com/en/developer/libftdi/download.php"
+license=('GPL2' 'LGPL2.1')
+depends=('libusb' 'confuse')
+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}
+ fix_includes_path.patch)
+sha1sums=('0b4dc9763342d094d2b5e74ced7d10d574b4758d'
+ 'SKIP'
+ '5c45106586d28ef86ca2ac64b67fadae18c52331')
+validpgpkeys=('3CEA9B8868BC3852618EB5B4707F91A424F006F5') # Intra2net open source
+
+prepare() {
+ 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() {
+ cd "$srcdir/${pkgname}1-$pkgver"
+ mkdir -p build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON \
+ -DCMAKE_BUILD_TYPE=Release -DEXAMPLES=OFF -DFTDI_EEPROM=ON \
+ -DFTDIPP=ON -DPYTHON_BINDINGS=ON -DLINK_PYTHON_LIBRARY=ON
+ make
+}
+
+# needs yet unknown dependencies
+#check() {
+# cd "$srcdir/${pkgname}1-$pkgver/build"
+# make check
+#}
+
+package() {
+ cd "${pkgname}1-$pkgver/build"
+
+ make DESTDIR="$pkgdir" install
+ install -Dm644 "../packages/99-libftdi.rules" "$pkgdir/usr/lib/udev/rules.d/69-libftdi.rules"
+ # FS#45053
+ install -d "$pkgdir/usr/share/libftdi/examples"
+ cp -r ../examples/* "$pkgdir/usr/share/libftdi/examples"
+}
Deleted: fix_includes_path.patch
===================================================================
--- fix_includes_path.patch 2021-12-02 18:46:01 UTC (rev 1062255)
+++ fix_includes_path.patch 2021-12-02 18:46:02 UTC (rev 1062256)
@@ -1,41 +0,0 @@
-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 )
Copied: libftdi/repos/community-staging-x86_64/fix_includes_path.patch (from rev 1062253, libftdi/trunk/fix_includes_path.patch)
===================================================================
--- fix_includes_path.patch (rev 0)
+++ fix_includes_path.patch 2021-12-02 18:46:02 UTC (rev 1062256)
@@ -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 )
More information about the arch-commits
mailing list