From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- dev-embedded/Manifest.gz | Bin 8886 -> 8882 bytes dev-embedded/libftd2xx/Manifest | 4 + dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild | 42 +++++++ dev-embedded/libftdi/Manifest | 9 +- .../libftdi/files/libftdi-1.5-tests-no-cxx.patch | 35 ++++++ dev-embedded/libftdi/libftdi-0.20-r1.ebuild | 31 +++-- dev-embedded/libftdi/libftdi-1.4-r1.ebuild | 75 ++++++++++++ dev-embedded/libftdi/libftdi-1.4.ebuild | 74 ------------ dev-embedded/libftdi/libftdi-1.5.ebuild | 85 +++++++++++++ dev-embedded/libftdi/libftdi-9999.ebuild | 39 +++--- dev-embedded/openocd/Manifest | 8 +- .../openocd/files/openocd-0.10.0-fno-common.patch | 11 ++ .../openocd/files/openocd-0.10.0-gcc10.patch | 36 ++++++ dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 129 +++++++------------- dev-embedded/openocd/openocd-0.9.0.ebuild | 132 --------------------- dev-embedded/openocd/openocd-9999.ebuild | 123 +++++++------------ dev-embedded/urjtag/Manifest | 4 +- dev-embedded/urjtag/urjtag-2019.12.ebuild | 54 +++++++++ dev-embedded/urjtag/urjtag-9999.ebuild | 30 ++--- 19 files changed, 495 insertions(+), 426 deletions(-) create mode 100644 dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild create mode 100644 dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch create mode 100644 dev-embedded/libftdi/libftdi-1.4-r1.ebuild delete mode 100644 dev-embedded/libftdi/libftdi-1.4.ebuild create mode 100644 dev-embedded/libftdi/libftdi-1.5.ebuild create mode 100644 dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch create mode 100644 dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch delete mode 100644 dev-embedded/openocd/openocd-0.9.0.ebuild create mode 100644 dev-embedded/urjtag/urjtag-2019.12.ebuild (limited to 'dev-embedded') diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz index 82bc95e192ee..6093ad6a6475 100644 Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest index 88a5fedf45d5..2c153f613125 100644 --- a/dev-embedded/libftd2xx/Manifest +++ b/dev-embedded/libftd2xx/Manifest @@ -1,3 +1,7 @@ +DIST libftd2xx-arm-v6-hf-1.4.8.tar.gz 882724 BLAKE2B 4ffe647272467698cfe10a2ef201f8adb4bc991df517945ee8f057a07e55c4804bc4d541b6e2bd523fc4f6375b0a28ae7241fdafaed9eae61739d83d0327540a SHA512 bd07f57f9a75c2195aaf71ed1c229e04256a9c9a59f3d2e8f2111bef8a1c58c05457b5d04d7a8f77f9daf076ce3f0b77e317ff1cedce4e3cd4146422cd5cf634 +DIST libftd2xx-i386-1.4.8.tar.gz 891331 BLAKE2B 742be8418ac598b0c4b6b1e4be99a57c85e70310c2a15936dba3a765b0168eac37a080619ed92816a96f93106f96b812545d1cf212f5d6d32b03e5100870f6a7 SHA512 d66415b9ecdc2b38370c2c6b97e5d14c3891910ceaf5aee2740b2e893891c4f2ebf395960748d55508f4b63edd3d829d9c0020898c1b83b453496d18b4a85528 +DIST libftd2xx-x86_64-1.4.8.tar.gz 898269 BLAKE2B e491b58f66ec64014511469e7eb0a628e799ffa4cc52cb94ca66c082dbc56793e3435a80bde7433ce1bea96eea1a52461606ce78a9b2e447f3f9c5a7faef1f1b SHA512 b738b764bcebb5f93f5a968b266547b8775cbc72df8587bfcf67591ce95557b6a43dce2f5dbd9de451f8c9421ec41c25c8fb9bed37b76aec4cd5bac854d4af06 DIST libftd2xx1.1.12.tar.gz 950540 BLAKE2B 6d55e8ff9b17a6b0220f5f4f3022c3495262b0ac47687ad9f28023c9f7b822f3956f2e42787edbdafe44ceea9b65b5ae687e2acb840f3e5546e5b2ac8a7ccec8 SHA512 afe0a8a7ccc47eb8888346dabdbfb41e182f7dadee7a57a1c4ffce544aebe5cab45c3e64de4ebeebdc0f31961617a79cbcf11dadfebde65ee79ca38e6234995a EBUILD libftd2xx-1.1.12-r1.ebuild 1055 BLAKE2B 89740f43be1692559b24924b0012765fc564b714eb5a0d656cd1f56191d442b5dd3fb61235799d2655d102882bba77e1c969abd5ced2b333b3362e620b3f6dc6 SHA512 81422f5732455b1bac7803707904fbb72297c7756d488af0f0ec20ca807065e8a8565ad02bbcfcdb8c714b2ca5e465b35ac35f4eeaeb90151b156cc406489b49 +EBUILD libftd2xx-1.4.8.ebuild 1207 BLAKE2B f3561a38eb0b0c90699bf15ee7654562bbe1ce6f07a7d29eb954b0e2ea83d7f695e6cc70f92ea48f43853e27506dcfe9749ae016339257a7c8f405b7276c7093 SHA512 7f7a756a678e636884170e05e740c01ad8690e5abab54dc1369ace56f0bf672994b970df86e3b61c612068240936b35aa48a87f756e6dad05809b34423b3f8e6 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild new file mode 100644 index 000000000000..3fd89c0f77cc --- /dev/null +++ b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Library that allows a direct access to a USB device" +HOMEPAGE="http://www.ftdichip.com/Drivers/D2XX.htm" +# NOTE: We could include other arm versions here too. +SRC_URI=" + amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-x86_64-${PV}.gz -> ${PN}-x86_64-${PV}.tar.gz ) + arm? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-arm-v6-hf-${PV}.gz -> ${PN}-arm-v6-hf-${PV}.tar.gz ) + x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-i386-${PV}.gz -> ${PN}-i386-${PV}.tar.gz ) +" +S="${WORKDIR}" + +LICENSE="FTDI LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="examples" + +QA_PREBUILT="*" + +src_install() { + cd release/build || die + + into /opt + dolib.so ${PN}.so.${PV} + dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1} + dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so + insinto /usr/include + doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h + + dodir /etc/env.d + echo "LDPATH=\"/opt/$(get_libdir)\"" > ${ED}/etc/env.d/50libftd2xx || die + + if use examples ; then + docinto sample + dodoc -r "${S}"/release/examples + fi + + dodoc "${S}"/release/ReadMe.txt +} diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest index 6353c994d1d4..ebd972ab07f4 100644 --- a/dev-embedded/libftdi/Manifest +++ b/dev-embedded/libftdi/Manifest @@ -1,8 +1,11 @@ AUX libftdi-0.20-cmake-include.patch 687 BLAKE2B 8817db6e200adcb3d76da91565fe25f694445a46325a6435d6d0545d6741b0d15b199f96aabf01ca664eeb3355008acc6ec309f5fa87f975584935ecd74558f7 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90 AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014549bdae23e35fefb0d2f6cf14c4610d79ebfbbb11e94174b6c1ff260d83713c4c4db395c725bbe836142e0e80092324a3f SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91 +AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc -EBUILD libftdi-0.20-r1.ebuild 1797 BLAKE2B 58906f05319b5f02e6722afc8a5371aa30441d6c38d685660881c31912ec4572d5fb85d2c508f3ce8e30f5b8c542aac67fde1033adecc1a157f71a09659e17fa SHA512 d94361376d0a030691960722c7b233d1b05e545145c7206406eb6c66d3e7a9ab376090803501dfd9ed4a7598582174ce0b94e3434a31d06a52fbfaac1f81a188 -EBUILD libftdi-1.4.ebuild 1723 BLAKE2B d7221e7ac06472589ce788a064893db8ed61f762f70790ed285bbbd48722aa823a6a0703965bf7466e828edb38c8e59e09fdd51d848139d4fff08d6ca8e74a4b SHA512 b9ad59a1c1a747c3617dee25236ea0b4baa6af010361f2450c57eb5edb14bd1db27e0b93a9a98a3ec2c8fbfb2ca239d67b2565af7ab6b3abed75ea632dababb0 -EBUILD libftdi-9999.ebuild 1730 BLAKE2B df9acfe15d4dc9765e461ca6c648f7966c29c0a6e3471fe8a5bf74be112d805c7ca8a07916be54f90a142b79b5975263611db04b42699b0a82174a1740025b30 SHA512 2dbe4e1fa3e62959e07f42fe1181fc2686eb009673401ac71cb7435f5273e980ae2d1c3bdf00bad123485b4a3a1229ce390e5761cb5180e2b5a9767fd794157d +DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f +EBUILD libftdi-0.20-r1.ebuild 1860 BLAKE2B 5de2b3938e0dff3de2f0b716e41a39345efcad64b618183c3f158e4b2948b7c24ec882c6cf0604cdded97d7c85062e3a701bf6623ff2d0fb9ef9be84a0933bd0 SHA512 6c99842f4f98b5d28cbffa4aabfe64d5d814d0500574e29519f4232dc32d2d7d51462b7295ff87c9114a403b881b36386b843fe1526f55512c5116d051d331ea +EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B 7304f2fbcaaa3b66bcaf73b4fa2a58a376b78e6a75f1a280247b1bc360f66369ca65005297bcd5e070edb078105ad15d5657828279a8f001d92468fe9c914545 SHA512 a226e8874e8509f0922733c24f9d2762ec01b0c941f4e68a9635c3be3a24e486e6ea90a588593a1e6a6fc0fab77e564ecd466e5a70539261a26bec07682c7399 +EBUILD libftdi-1.5.ebuild 1834 BLAKE2B 8e933ff0df226eabaa21c6f9c213d1d7c090d7a23db9df9bc8f38804d5ee5e4c149290131afca80fcd25dde2655f1c0c54bf05af46214b1fc29a6794e77bb3a1 SHA512 ba45a1bae1786350447344d063fbe416815e67872d3db13bca9a1df76a86072cded7da636abbe1bc7cca6c4e548acbe55899fc5fbcfe050a9d7e5bf044e6265f +EBUILD libftdi-9999.ebuild 1783 BLAKE2B 374d00e6b0cf6b62de3a392ff50277652457973ea7a0a98abdcb001f750c18f3efa972b86b7bbf6829afcdc508549adc03c9db6bfa412036cf1854652c4f5ec6 SHA512 be956ace45871628a70e964f622fea6484e495c35300a56b4a318aae7d0d2ce24f7d956508f4c061df3cfe5ea47fecb1d7d0286ec8a49d553aa91bee74e2e7d4 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba diff --git a/dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch b/dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch new file mode 100644 index 000000000000..6adba408f7f1 --- /dev/null +++ b/dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch @@ -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 +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 + diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild index 86d328f790e2..f8f5799b48f5 100644 --- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild +++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +PYTHON_COMPAT=( python3_{6,7,8,9} ) +inherit cmake python-single-r1 if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -19,15 +19,16 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/" LICENSE="LGPL-2" SLOT="0" -IUSE="cxx doc examples python" +IUSE="cxx doc examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig )" RDEPEND="virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen )" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-cmake-include.patch @@ -48,7 +49,7 @@ src_prepare() { -e '/SET(LIB_SUFFIX /d' \ CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -59,23 +60,27 @@ src_configure() { -DPYTHON_BINDINGS=$(usex python) -DCMAKE_SKIP_BUILD_RPATH=ON ) - cmake-utils_src_configure + + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install use python && python_optimize dodoc ChangeLog README if use doc ; then # Clean up crap man pages. #356369 - rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* + rm -vf "${BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* || die - doman "${CMAKE_BUILD_DIR}"/doc/man/man3/* - dodoc -r "${CMAKE_BUILD_DIR}"/doc/html + doman "${BUILD_DIR}"/doc/man/man3/* + dodoc -r "${BUILD_DIR}"/doc/html fi + if use examples ; then docinto examples dodoc examples/*.c fi + + use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die } diff --git a/dev-embedded/libftdi/libftdi-1.4-r1.ebuild b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild new file mode 100644 index 000000000000..ff35d3bfef0c --- /dev/null +++ b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake python-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://developer.intra2net.com/${PN}" +else + MY_P="${PN}1-${PV}" + SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" + KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86" + S=${WORKDIR}/${MY_P} +fi + +DESCRIPTION="Userspace access to FTDI USB interface chips" +HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/" + +LICENSE="LGPL-2" +SLOT="1" +IUSE="cxx doc examples python test tools" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + virtual/libusb:1 + cxx? ( dev-libs/boost ) + python? ( ${PYTHON_DEPS} ) + tools? ( + ! +Date: Fri, 17 Apr 2020 13:49:28 +0200 +Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 + +GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd +struct between bitbang drivers due to a missing extern. + +Change-Id: I2b4122f7939cec91a72284006748f99a23548324 +Signed-off-by: Andreas Fritiofson +Reviewed-on: http://openocd.zylin.com/5592 +Tested-by: jenkins +Reviewed-by: Antonio Borneo +Reviewed-by: Jonathan McDowell +--- + src/jtag/drivers/bitbang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h +index edb779c..bbbc693 100644 +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -56,7 +56,7 @@ struct bitbang_interface { + void (*swdio_drive)(bool on); + }; + +-const struct swd_driver bitbang_swd; ++extern const struct swd_driver bitbang_swd; + + extern bool swd_mode; + +-- +1.9.1 + diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 168fc2499564..14fbf084e901 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" + EGIT_REPO_URI=" https://repo.or.cz/openocd.git" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -36,106 +35,68 @@ RDEPEND=" ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" +) src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use jlink; then - myconf+=( - --enable-jlink - ) - else - myconf+=( - --disable-jlink - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb-blaster - --enable-openjtag - --enable-presto - ) - else - myconf+=( - --disable-openjtag - --disable-presto - --disable-usb-blaster - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_install() { default dostrip /usr/bin - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules } pkg_postinst() { diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild deleted file mode 100644 index c7878693cd02..000000000000 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib flag-o-matic toolchain-funcs udev - -# One ebuild to rule them all -if [[ ${PV} == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76 - cmsis-dap? ( dev-libs/hidapi ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch_user - - if [[ ${PV} == "9999" ]] ; then - AT_NO_RECURSIVE=yes eautoreconf - fi -} - -src_configure() { - # Here are some defaults - local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --enable-amtjtagaccel - --enable-ep93xx - --enable-at91rm9200 - --enable-gw16012 - --enable-oocd_trace - --enable-arm-jtag-ew - --enable-sysfsgpio - --enable-bcm2835gpio - ) - - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-jlink - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-jlink - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb_blaster_libftdi - --enable-openjtag_ftdi - --enable-presto_libftdi - ) - else - myconf+=( - --disable-openjtag_ftdi - --disable-presto_libftdi - --disable-usb_blaster_libftdi - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" -} - -src_install() { - default - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules -} - -pkg_postinst() { - elog "To access openocd devices as user you must be in the plugdev group" -} diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 99592e57a118..f7d5c4b834cb 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" + EGIT_REPO_URI=" https://repo.or.cz/openocd.git" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -29,113 +28,71 @@ RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) - jlink? ( >=dev-embedded/libjaylink-0.2 ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use jlink; then - myconf+=( - --enable-jlink - ) - else - myconf+=( - --disable-jlink - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb-blaster - --enable-openjtag - --enable-presto - ) - else - myconf+=( - --disable-openjtag - --disable-presto - --disable-usb-blaster - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_install() { default dostrip /usr/bin - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules } pkg_postinst() { diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest index 96b479b8bbeb..916bfe6d0e28 100644 --- a/dev-embedded/urjtag/Manifest +++ b/dev-embedded/urjtag/Manifest @@ -1,4 +1,6 @@ DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff +DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36 EBUILD urjtag-0.10-r1.ebuild 1068 BLAKE2B 5a9566d2fcf63d1cdd3bbabffaf166a3fc76ce1e4d7a0aad82593502c86687e5cac2a7a0ad73f34e37d9124dcd2fc421e5de8ccff404f614ceeaec6b66df31ea SHA512 0cd41fcccf30f89fb310e5a95e86d9fa69538baf5a53658b09fe023b8631c0f203d5f60e9d06cf663416139978bfbd7a907258b1b728ddda01175fd02418fd37 -EBUILD urjtag-9999.ebuild 1223 BLAKE2B 195ca8b38ce615d5d1763cd64f4a44315d168728c05b40e31a2edef557ec9139b213b474352818ded74a026f6061d0a854326a863056a82caa293bd22decae2e SHA512 3477d343994a314955813aa9a3ce6a8f1ef4d569182d3ef6f1424950b68ce9b1192e0bf97f5a6e6d100bd4eec6215239a8ee73ab99cbcfe4bbded5a78ea0be0f +EBUILD urjtag-2019.12.ebuild 1151 BLAKE2B 1cb35fe5486d0089c73158898afef7945a80c12f3d519bcc0742581fad507b2fe011002841135f361b37b3144e9ad66a24336e7da830908ef106f42ccd9142c2 SHA512 8a09a615645325cc32a1ecf42376133cbbc02d0a9534740b744c25e2c257764299ce060503bd73a566df4d1ebf197fbbb6470b3c56be32017ccdb42e4e5ec043 +EBUILD urjtag-9999.ebuild 1081 BLAKE2B af03442b0e29f3e60b73ab4edbea83f258b916b9abc57e555428d2f9a8f307a151703442bacb2c947e0069d15cc34f1ae0818ddcb1dd9609660cb4ca8dc414c5 SHA512 e8171862ad821fd5157b1653267ebfb41ac2a88e733f1e251cd51700356510526d9d8f33a5200473bcf0114cb8fe805e87820b55ca810eb08882818bf82b2217 MISC metadata.xml 540 BLAKE2B 5cace8526e0edb053bb7b56bed518d237eb0c16c1eb94a6ab136166a09631a9f005a7f60404fb6dcf6cedb8b69e367da028b51738f5a06e7a836cb0d22a2a066 SHA512 cb3523611ffcd7e007e06a630b1299aa610511ef20073c5e8a8efada52ba58ff34fcf2ccc4c04f51676e224b3d2b388a871995499fda480c0d51dc063a0777ce diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2019.12.ebuild new file mode 100644 index 000000000000..2156d991a75d --- /dev/null +++ b/dev-embedded/urjtag/urjtag-2019.12.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git" + inherit git-r3 autotools + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~sparc ~x86" +fi + +DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more" +HOMEPAGE="http://urjtag.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +# TODO: Figure out if anyone wants the Python bindings +IUSE="ftdi ftd2xx readline usb" + +DEPEND="ftdi? ( dev-embedded/libftdi:1= ) + ftd2xx? ( dev-embedded/libftd2xx ) + readline? ( sys-libs/readline:= ) + usb? ( virtual/libusb:1 )" +RDEPEND="${DEPEND} + !dev-embedded/jtag" + +src_prepare() { + default + + if [[ ${PV} == "9999" ]] ; then + mkdir -p m4 || die + eautopoint + eautoreconf + fi +} + +src_configure() { + econf \ + --disable-werror \ + --disable-python \ + --disable-static \ + $(use_with readline) \ + $(use_with ftdi libftdi) \ + $(use_with ftd2xx) \ + $(use_with usb libusb 1.0) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild index 57288a015220..54e0951ff6ce 100644 --- a/dev-embedded/urjtag/urjtag-9999.ebuild +++ b/dev-embedded/urjtag/urjtag-9999.ebuild @@ -1,18 +1,15 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# TODO: figure out htf to make python.eclass work +EAPI=7 -EAPI="5" - -inherit eutils ltprune multilib if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git" inherit git-r3 autotools - S=${WORKDIR}/${P}/${PN} + S="${WORKDIR}/${P}/${PN}" else - SRC_URI="mirror://sourceforge/urjtag/${P}.tar.bz2" - KEYWORDS="amd64 ppc sparc x86" + SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~sparc ~x86" fi DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more" @@ -20,37 +17,36 @@ HOMEPAGE="http://urjtag.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="ftd2xx ftdi readline static-libs usb" +# TODO: Figure out if anyone wants the Python bindings +IUSE="ftdi readline usb" -DEPEND="ftdi? ( dev-embedded/libftdi:= ) - ftd2xx? ( dev-embedded/libftd2xx ) +DEPEND="ftdi? ( dev-embedded/libftdi:1 ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 )" RDEPEND="${DEPEND} !dev-embedded/jtag" src_prepare() { + default + if [[ ${PV} == "9999" ]] ; then - mkdir -p m4 + mkdir -p m4 || die eautopoint eautoreconf fi } src_configure() { - use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)" + use readline || export vl_cv_lib_readline=no econf \ --disable-werror \ --disable-python \ - $(use_with readline) \ $(use_with ftdi libftdi) \ - $(use_with ftd2xx) \ - $(use_enable static-libs static) \ - $(use_with usb libusb 1.0) + $(use_with usb libusb) } src_install() { default - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } -- cgit v1.2.3