summaryrefslogtreecommitdiff
path: root/media-sound/orpheus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-01-04 01:27:12 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-01-04 01:27:12 +0000
commit3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree44068672445b1418489aed82de58df3c470289e7 /media-sound/orpheus
parent0f15659d48c193027158492acb726297501202c5 (diff)
gentoo resync : 04.01.2022
Diffstat (limited to 'media-sound/orpheus')
-rw-r--r--media-sound/orpheus/Manifest3
-rw-r--r--media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch31
-rw-r--r--media-sound/orpheus/orpheus-1.6-r3.ebuild6
3 files changed, 36 insertions, 4 deletions
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 1cfe292964e0..8be3b5a3f843 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -5,6 +5,7 @@ AUX orpheus-1.6-constify.patch 2123 BLAKE2B 9842e55e4b0418f77e7f88f045e55eb95353
AUX orpheus-1.6-cppflags.patch 830 BLAKE2B a5a4d8ca2633fe31bf1b3917e7004578187ef8677a99cecb870e9e181276a2f9a03518989caf2816c52dd07c168cc6d2104b59b9d326786dd0d895a1a4633181 SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f
AUX orpheus-1.6-fix-buildsystem.patch 4346 BLAKE2B 30fd0a668a6903c1b6f285c096caa096efcd187c138a2d304e591f3543d13ff5112949852c1ffc23043a3f2f98fd1c397baeec1555506a70973125a03d86fdca SHA512 fa05fec6ec5280a2a0289c55eaac5ca84286731cff2ceb294e645a0b69415fee785ad203169a455019dbebe89e700314821779c1d81d13dc21d6ccac7109ba63
AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe478ace3d290ce0fdd5446e01ab496e0e57d5ff86e6039397c2e797d086485f8c3f3f8ec85aa1592ef294c2c16 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7
+AUX orpheus-1.6-musl-stdint.patch 769 BLAKE2B aca09903fe3e46f504a83507877701240689b4b0e3b1210655afe9d53c2f93305a48d4da450c4b060cb7a95ab22ac65689ad96baca664c3ae07887f06c76726f SHA512 ad484b277ba2a650eadb6678cbbd47ce67abc30692fe7372baf8c52471375c6da2dd8a290618cbfc995a02d4a18e63028bcdc50269bbc2b24e1b07f0e25ab52f
DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
-EBUILD orpheus-1.6-r3.ebuild 913 BLAKE2B 6f068cca608943190a12e37d6adac09095d333478a8b90ed8d4269f056d35a84852b432b551bd8a31d51ba2352b929128733303be95a26b947147bfe6167db73 SHA512 add3909c566097b196e57335934889565d0a451c9c6513bd79a04798ced53a1dc4177e764568b3f62528fedc1ac840aeeab86f77c08be1d734b8e430a3fd604a
+EBUILD orpheus-1.6-r3.ebuild 943 BLAKE2B 973e849a195ca43c0d96726127e4246735e6f34fe9224acf778cedf9f5bca2fc0256396ce6508594390138c22f28c62991440de7bf5d51ee7d1e76b52c68c637 SHA512 87e9a7633539987632f019d55a99c512aee10324c5d3f3db507b3515aab7f204acee0501fd5060f2cc4a1c3de97e10d92e069350495f6313044e18f2c597ad8b
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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() {