diff options
Diffstat (limited to 'sci-electronics/xoscope')
| -rw-r--r-- | sci-electronics/xoscope/Manifest | 6 | ||||
| -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 (renamed from sci-electronics/xoscope/xoscope-2.1.ebuild) | 25 |
4 files changed, 46 insertions, 12 deletions
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest index 1e45386ef99e..e3797211bbf3 100644 --- a/sci-electronics/xoscope/Manifest +++ b/sci-electronics/xoscope/Manifest @@ -3,8 +3,10 @@ AUX xoscope-2.0-implicit_decls.patch 687 BLAKE2B 9dfbb8f802c51d1eb1450673253246d AUX xoscope-2.0-man_no_-Tutf8.patch 369 BLAKE2B 7deae1551cda55e640f65f51ecf0f5e41ddcf7d234c1d8931b868f3e865332e23bf153f4dd662e08d81eb3dcb6db77d8db27ab823b4623932989acbc770524e4 SHA512 fcd9522fb8d45a565983d1da4cfdb9239cf2c5c994069ca2fa934fee9ec23d99b9e877bfdca5b0baf01f9722f7fdff791c99f468d088947961758fbb75bc2a0a AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 BLAKE2B 4e76e0eabbd7125be9a3c28eda71a9aa8f77f0d47bef3aeb00a5256ffffe70f12294ffab4a5365a30fa801bb0f82e05a6ed187c99c2f3c96bc9760426c1f39c7 SHA512 1a64615e99cfd160d28d9e1da04a000fe538b52b770b77db6fcbd907306aa67172c6848edccb6467f2b2e008bd243fc2c12949c91087fc17deb7b9bbc3980b9a AUX xoscope-2.1-man_no_-Tutf8.patch 392 BLAKE2B 9eb444b50aa67e2bf61941ef9a3f6ce02da211e75db48bb9126cbf3da0e3ae93039390ec9217877a021b9d22fff2907b6af9c85842bc261cc4e6d20f3b244f8b SHA512 aa1347e5e396f5735606e61cf90e1aabdffb7d6c1f3ebe6c778a7324d7a3c0b8a31e0b9ec4f380e14db336d82e0790c7d7f7dc197684c140de8822b9e5e4299b +AUX xoscope-2.2-fno-common.patch 489 BLAKE2B 3496854eb8a9437181178e7e78724a8fec2f11bbe2db0404395ccc09563219ce0088a14aef6494a518ed007c7a1892d81212e49020d5804ac20abaeeaa543be1 SHA512 bbc722fd45b999415e912a35ecf0be0ab9f8ec3e0d8a046bf3a094256d85eeb655d4a358b8dd942b9bafbd8175d8e3d0dfc74acb9ae4fd4d74498827ace5f42a +AUX xoscope-2.2-man_no_-Tutf8.patch 421 BLAKE2B b8ba8523d7d6d717de4e4fb1a60061c1f929b095cdb9349b624ad589b39abae48f59cef33aa67486c3550594945b0260b8be494a950c6fad73dd597d1826b99d SHA512 54b39e8565cd464e014d111441edc8d191d85d07d4bd04679df3c771b9e28b3d7b619ae90ee532dcf8ebda6e79b5a3452130fc7157f79619e74cc8b3600d398d 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 EBUILD xoscope-2.0.ebuild 799 BLAKE2B e9ef29f04f320d4114604bd1b82d850d39e8bcc9ae2970ebb8cfea4c7b031c359457b64a824354945d8f8a47176effecf0529c2648dc61495f3e2588472bdb85 SHA512 9242f5d321c33ed88e6e30aab6f8b5b05ea34e2cdcba82e164b16591b7b76e1c147543f6859490221faa0da2ceb46a41e6452869241150c9c7c992e3f95907dc -EBUILD xoscope-2.1.ebuild 647 BLAKE2B d42679bdbd49c187f515fc5f5ea037a75e334044d87e0ec7763893b436d2a074cad422f2c23f394b3568f50a3d0d26dea6806e4dcc529fab30979dd50c375b0a SHA512 d5a829921f24e0ba12e0b590abec347444486b519777ab6f41c4812f56c84cd561414ae11ca6881dfade3877871c9b38bcf0d8d7899bec85f87e4c1a49e8d692 +EBUILD xoscope-2.2.ebuild 711 BLAKE2B 075e333b7745daaef2cc013ff4124c80ef8cc5ee5d5049d7307944fe0385ea4e7a07243577f1fbaa72211417e932f274a57d434b6f4437ae3116cc7d778278b4 SHA512 ce8362af320662d8e5e586bd791f935241630b8486ca115d1e65cf13ac4734524dee2571847fdcfb9bf6a676521783b51c0fb8c5dd04e2e57edace78a16f36c7 MISC metadata.xml 346 BLAKE2B 8403235f2a8a0d9f4d447bd869be01c1d3c631058d17866a8123f4434d67e487da9cbaa26ae398921dd75e3bcea34279eef96a837dae37dc50597a1ed9baef09 SHA512 c274d9938f31775989e53e8a66c470ef2df048a52b7934be3e0f8107784feb19160e9d93d2f970c84ad3b9d19da857be6ccfd6ae547ee71c8920f2f9430a7943 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.1.ebuild b/sci-electronics/xoscope/xoscope-2.2.ebuild index 5b730bc12bc8..a51858f54bde 100644 --- a/sci-electronics/xoscope/xoscope-2.1.ebuild +++ b/sci-electronics/xoscope/xoscope-2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools eutils linux-info +inherit autotools linux-info DESCRIPTION="Soundcard Oscilloscope for X" HOMEPAGE="http://xoscope.sourceforge.net" @@ -12,18 +12,23 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="x11-libs/gtkdatabox - virtual/man" -DEPEND="${RDEPEND} - virtual/pkgconfig" +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" -src_prepare() { - epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch +PATCHES=( + "${FILESDIR}"/${P}-man_no_-Tutf8.patch + "${FILESDIR}"/${P}-fno-common.patch +) +src_prepare() { + default eautoreconf } |