diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2020-11-29 00:09:12 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-11-29 00:09:12 +0100 |
| commit | 0bb5bd126a41aeb8418016ad852d8d9c823ac311 (patch) | |
| tree | 9533a1f537bd1c33a1df465cff6bce52e6360038 /sci-electronics/xoscope | |
| parent | sci-calculators/hcalc: port to EAPI 7 (diff) | |
| download | gentoo-0bb5bd126a41aeb8418016ad852d8d9c823ac311.tar.gz gentoo-0bb5bd126a41aeb8418016ad852d8d9c823ac311.tar.bz2 gentoo-0bb5bd126a41aeb8418016ad852d8d9c823ac311.zip | |
sci-electronics/xoscope: bump to 2.2
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/707154
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sci-electronics/xoscope')
| -rw-r--r-- | sci-electronics/xoscope/Manifest | 1 | ||||
| -rw-r--r-- | sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch | 16 | ||||
| -rw-r--r-- | sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch | 11 | ||||
| -rw-r--r-- | sci-electronics/xoscope/xoscope-2.2.ebuild | 34 |
4 files changed, 62 insertions, 0 deletions
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest index fdab31110f0e..1d4cc20517a0 100644 --- a/sci-electronics/xoscope/Manifest +++ b/sci-electronics/xoscope/Manifest @@ -1,2 +1,3 @@ DIST xoscope-2.0.tgz 334875 BLAKE2B 67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70 DIST xoscope-2.1.tar.gz 302170 BLAKE2B afd706d51fe2b63f5e948d9dafd56a16eb9368717536514f1e734909a758e585893101b0dd381ff3d45da958212f35ea76b44f4689d3242cc731cb7371913d03 SHA512 2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d +DIST xoscope-2.2.tar.gz 307319 BLAKE2B 860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec SHA512 77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd diff --git a/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch new file mode 100644 index 000000000000..124a8fdd767c --- /dev/null +++ b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch @@ -0,0 +1,16 @@ +Description: Fix FTBFS with GCC 10 +Bug-Debian: https://bugs.debian.org/957990 +Forwarded: https://sourceforge.net/p/xoscope/discussion/23485/thread/d6fba12f59/ +Author: Raymundo Cassani <raymundo.cassani@gmail.com> +Last-Update: 2020-05-20 + +--- a/display.c ++++ b/display.c +@@ -35,7 +35,6 @@ + #define DEBUG 0 + + int triggered = 0; /* whether we've triggered or not */ +-void *font; + int math_warning = 0; /* TRUE if math has a problem */ + + struct signal_stats stats; diff --git a/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch new file mode 100644 index 000000000000..a0f54eb26e37 --- /dev/null +++ b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -132,7 +132,7 @@ AC_DEFINE(CHANNELS, 8, [max number of channels]) + + AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on libsx version]) + +-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 help]) ++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help]) + + AC_DEFINE(FILENAME, "oscope.dat", [default file name]) + diff --git a/sci-electronics/xoscope/xoscope-2.2.ebuild b/sci-electronics/xoscope/xoscope-2.2.ebuild new file mode 100644 index 000000000000..a51858f54bde --- /dev/null +++ b/sci-electronics/xoscope/xoscope-2.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info + +DESCRIPTION="Soundcard Oscilloscope for X" +HOMEPAGE="http://xoscope.sourceforge.net" +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + sci-libs/fftw:3.0= + virtual/man + x11-libs/gtkdatabox" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~!SND_PCM_OSS" +ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp" + +PATCHES=( + "${FILESDIR}"/${P}-man_no_-Tutf8.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_prepare() { + default + eautoreconf +} |