From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBA271382C5 for ; Wed, 10 Mar 2021 04:51:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7213E0837; Wed, 10 Mar 2021 04:51:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E119E0837 for ; Wed, 10 Mar 2021 04:51:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBC6E33BE34 for ; Wed, 10 Mar 2021 04:51:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 528D5586 for ; Wed, 10 Mar 2021 04:51:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615351872.a4c858127655bd6543d301f40a24200f2b592b57.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/files/, dev-embedded/libftdi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch dev-embedded/libftdi/libftdi-1.5-r3.ebuild X-VCS-Directories: dev-embedded/libftdi/files/ dev-embedded/libftdi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a4c858127655bd6543d301f40a24200f2b592b57 X-VCS-Branch: master Date: Wed, 10 Mar 2021 04:51:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1a1a0773-0840-40d3-9688-febde6b78d40 X-Archives-Hash: 39407d520742c4f4ba965f33c1317848 commit: a4c858127655bd6543d301f40a24200f2b592b57 Author: Sam James gentoo org> AuthorDate: Wed Mar 10 04:51:12 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 10 04:51:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c85812 dev-embedded/libftdi: add upstream CMake patch Closes: https://bugs.gentoo.org/775116 Signed-off-by: Sam James gentoo.org> .../libftdi/files/libftdi-1.5-cmake-cxx.patch | 46 +++++++++++ dev-embedded/libftdi/libftdi-1.5-r3.ebuild | 96 ++++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch b/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch new file mode 100644 index 00000000000..a04aee1cf1d --- /dev/null +++ b/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/766818 + +From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe + +Signed-off-by: Fabrice Fontaine +--- + 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 + diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild new file mode 100644 index 00000000000..43542c3f4d8 --- /dev/null +++ b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit cmake python-single-r1 + +MY_P="${PN}1-${PV}" +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://developer.intra2net.com/${PN}" +else + SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi + +DESCRIPTION="Userspace access to FTDI USB interface chips" +HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2" +SLOT="1" +IUSE="cxx doc examples python test tools" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig )" +RDEPEND=" + virtual/libusb:1 + cxx? ( dev-libs/boost ) + python? ( ${PYTHON_DEPS} ) + tools? ( + !