gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

media-sound/orpheus: update EAPI 6 -> 7, fix build on musl

Browse Source 
Closes: https://bugs.gentoo.org/715698
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-12-29 07:00:58 +00:00
parent f87161dba8
commit 6d41e4cd7d
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch Normal file
View File

@@ -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()) {

6
media-sound/orpheus/orpheus-1.6-r3.ebuild
View File

@@ -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() {