Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/avarice/, dev-embedded/avarice/files/
Date: Wed, 16 Sep 2020 13:52:54
Message-Id: 1600264337.c8f2fe3cf9deb634c3651cd67c42d0cdd55d6513.soap@gentoo
1 commit: c8f2fe3cf9deb634c3651cd67c42d0cdd55d6513
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 13:52:17 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 13:52:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f2fe3c
7
8 dev-embedded/avarice: Version bump to 2.14
9
10 Bug: https://bugs.gentoo.org/597138
11 Bug: https://bugs.gentoo.org/729708
12 Bug: https://bugs.gentoo.org/742170
13 Package-Manager: Portage-3.0.7, Repoman-3.0.1
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 dev-embedded/avarice/Manifest | 1 +
17 dev-embedded/avarice/avarice-2.14.ebuild | 19 +++++++++++
18 .../files/avarice-2.14-broken-__unused-macro.patch | 39 ++++++++++++++++++++++
19 3 files changed, 59 insertions(+)
20
21 diff --git a/dev-embedded/avarice/Manifest b/dev-embedded/avarice/Manifest
22 index 93a5d1bf4f6..b0d36a4110f 100644
23 --- a/dev-embedded/avarice/Manifest
24 +++ b/dev-embedded/avarice/Manifest
25 @@ -1 +1,2 @@
26 DIST avarice-2.13.tar.bz2 196063 BLAKE2B 4380478684d360708310b46cf46b3eca359dc4145a33f6330d5cb18e13c57c18229eeee6fe72b8740baf585d19c4efb21b685afb0317c830d89bb550d245192d SHA512 fa67e46061e32ec9db10bed961484ee050b219e92c2e9900ad35861b3c45161cc6ea6f2a9e63b0303242ef9992193cd963ac5871583db434409c10995b420b5f
27 +DIST avarice-2.14.tar.bz2 253668 BLAKE2B 673c95d8f7f296ffdd5c225e82bd8ef348f0c222201acb826798451fa195ec9c2fd8e8d1ecd3f847f9e0ac069ee2f6a4358f660ff45343817b14d804e79a8c90 SHA512 e0b23bd02bfa7d4dc05027f0f59ec7da868d8d0c0cd4f66595f6aaa5c335fa4eb64fc47399e51c0ed5112803ee99a3f041812bf4072dc096cc933cd17f9348a0
28
29 diff --git a/dev-embedded/avarice/avarice-2.14.ebuild b/dev-embedded/avarice/avarice-2.14.ebuild
30 new file mode 100644
31 index 00000000000..99ecdf5b2e2
32 --- /dev/null
33 +++ b/dev-embedded/avarice/avarice-2.14.ebuild
34 @@ -0,0 +1,19 @@
35 +# Copyright 1999-2020 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator"
41 +HOMEPAGE="http://avarice.sourceforge.net/"
42 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
43 +
44 +LICENSE="GPL-2"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~x86"
47 +
48 +PATCHES=( "${FILESDIR}"/${P}-broken-__unused-macro.patch )
49 +
50 +src_install() {
51 + default
52 + dodoc doc/*.txt
53 +}
54
55 diff --git a/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch b/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch
56 new file mode 100644
57 index 00000000000..9c3ba3da2f4
58 --- /dev/null
59 +++ b/dev-embedded/avarice/files/avarice-2.14-broken-__unused-macro.patch
60 @@ -0,0 +1,39 @@
61 +--- a/src/jtag2usb.cc
62 ++++ b/src/jtag2usb.cc
63 +@@ -739,7 +739,7 @@
64 +
65 + #ifdef HAVE_LIBUSB_2_0
66 + /* USB thread */
67 +-static void *usb_thread(void * data __unused)
68 ++static void *usb_thread(void * data)
69 + {
70 + struct pollfd fds[2];
71 +
72 +--- a/src/jtag3io.cc
73 ++++ b/src/jtag3io.cc
74 +@@ -350,12 +350,12 @@
75 + throw jtag_exception("doSimpleJtagCommand(): too many failures");
76 + }
77 +
78 +-void jtag3::changeBitRate(int newBitRate __unused)
79 ++void jtag3::changeBitRate(int newBitRate)
80 + {
81 + throw;
82 + }
83 +
84 +-bool jtag3::synchroniseAt(int bitrate __unused)
85 ++bool jtag3::synchroniseAt(int bitrate)
86 + {
87 + throw;
88 + }
89 +--- a/src/jtag3prog.cc
90 ++++ b/src/jtag3prog.cc
91 +@@ -106,7 +106,7 @@
92 + }
93 +
94 +
95 +-void jtag3::downloadToTarget(const char* filename __unused, bool program __unused, bool verify __unused)
96 ++void jtag3::downloadToTarget(const char* filename, bool program, bool verify)
97 + {
98 + statusOut("\nDownload not done.\n");
99 + throw jtag_exception("Target programming not implemented for JTAGICE3");