| 1 |
commit: 6d41e4cd7dcfcd7825098b194e68119362022353 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 29 07:00:58 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 29 07:10:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d41e4cd |
| 7 |
|
| 8 |
media-sound/orpheus: update EAPI 6 -> 7, fix build on musl |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/715698 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../orpheus/files/orpheus-1.6-musl-stdint.patch | 31 ++++++++++++++++++++++ |
| 14 |
media-sound/orpheus/orpheus-1.6-r3.ebuild | 6 ++--- |
| 15 |
2 files changed, 34 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..9665d342b6f2 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch |
| 22 |
@@ -0,0 +1,31 @@ |
| 23 |
+https://bugs.gentoo.org/715698 |
| 24 |
+--- a/src/mp3track.cc |
| 25 |
++++ b/src/mp3track.cc |
| 26 |
+@@ -33,6 +33,7 @@ |
| 27 |
+ #include <sys/stat.h> |
| 28 |
+ #include <signal.h> |
| 29 |
+ #include <unistd.h> |
| 30 |
++#include <stdint.h> |
| 31 |
+ #include <stdio.h> |
| 32 |
+ #include <netinet/in.h> |
| 33 |
+ |
| 34 |
+@@ -55,8 +56,8 @@ static int cpid = -1, trackcount = 0; |
| 35 |
+ static FILE *fpread, *fpwrite; |
| 36 |
+ static char cbuf[65535]; |
| 37 |
+ |
| 38 |
+-static u_int32_t extract_bitfield(unsigned char *h, int start, int end) { |
| 39 |
+- u_int32_t hdr; |
| 40 |
++static uint32_t extract_bitfield(unsigned char *h, int start, int end) { |
| 41 |
++ uint32_t hdr; |
| 42 |
+ memcpy(&hdr, h, 4); |
| 43 |
+ hdr = ntohl(hdr); |
| 44 |
+ hdr = hdr << start; |
| 45 |
+@@ -237,7 +238,7 @@ void mp3track::readtag() { |
| 46 |
+ 11025, 12000, 8000, 0 |
| 47 |
+ }; |
| 48 |
+ |
| 49 |
+- u_int32_t aux; |
| 50 |
++ uint32_t aux; |
| 51 |
+ int i, filelen; |
| 52 |
+ |
| 53 |
+ if(f.is_open()) { |
| 54 |
|
| 55 |
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild |
| 56 |
index cd2786b8a7b5..2c29e8793369 100644 |
| 57 |
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild |
| 58 |
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild |
| 59 |
@@ -1,7 +1,7 @@ |
| 60 |
-# Copyright 1999-2020 Gentoo Authors |
| 61 |
+# Copyright 1999-2021 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
-EAPI=6 |
| 65 |
+EAPI=7 |
| 66 |
|
| 67 |
inherit autotools |
| 68 |
|
| 69 |
@@ -12,7 +12,6 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz" |
| 70 |
LICENSE="GPL-2" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="amd64 ~ppc x86" |
| 73 |
-IUSE="" |
| 74 |
|
| 75 |
RDEPEND="sys-libs/ncurses:0= |
| 76 |
media-libs/libvorbis |
| 77 |
@@ -28,6 +27,7 @@ PATCHES=( |
| 78 |
"${FILESDIR}"/${P}-bufsize.patch |
| 79 |
"${FILESDIR}"/${P}-gcc47.patch |
| 80 |
"${FILESDIR}"/${P}-constify.patch |
| 81 |
+ "${FILESDIR}"/${P}-musl-stdint.patch |
| 82 |
) |
| 83 |
|
| 84 |
src_prepare() { |
Archives