commit: 6d41e4cd7dcfcd7825098b194e68119362022353 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 29 07:00:58 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 29 07:10:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d41e4cd
media-sound/orpheus: update EAPI 6 -> 7, fix build on musl Closes: https://bugs.gentoo.org/715698 Signed-off-by: Sam James <sam <AT> gentoo.org> .../orpheus/files/orpheus-1.6-musl-stdint.patch | 31 ++++++++++++++++++++++ media-sound/orpheus/orpheus-1.6-r3.ebuild | 6 ++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch new file mode 100644 index 000000000000..9665d342b6f2 --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/715698 +--- a/src/mp3track.cc ++++ b/src/mp3track.cc +@@ -33,6 +33,7 @@ + #include <sys/stat.h> + #include <signal.h> + #include <unistd.h> ++#include <stdint.h> + #include <stdio.h> + #include <netinet/in.h> + +@@ -55,8 +56,8 @@ static int cpid = -1, trackcount = 0; + static FILE *fpread, *fpwrite; + static char cbuf[65535]; + +-static u_int32_t extract_bitfield(unsigned char *h, int start, int end) { +- u_int32_t hdr; ++static uint32_t extract_bitfield(unsigned char *h, int start, int end) { ++ uint32_t hdr; + memcpy(&hdr, h, 4); + hdr = ntohl(hdr); + hdr = hdr << start; +@@ -237,7 +238,7 @@ void mp3track::readtag() { + 11025, 12000, 8000, 0 + }; + +- u_int32_t aux; ++ uint32_t aux; + int i, filelen; + + if(f.is_open()) { diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild index cd2786b8a7b5..2c29e8793369 100644 --- a/media-sound/orpheus/orpheus-1.6-r3.ebuild +++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,7 +12,6 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" RDEPEND="sys-libs/ncurses:0= media-libs/libvorbis @@ -28,6 +27,7 @@ PATCHES=( "${FILESDIR}"/${P}-bufsize.patch "${FILESDIR}"/${P}-gcc47.patch "${FILESDIR}"/${P}-constify.patch + "${FILESDIR}"/${P}-musl-stdint.patch ) src_prepare() {
