diff options
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/Manifest.gz | bin | 57194 -> 57198 bytes | |||
| -rw-r--r-- | media-sound/mpg321/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/mpg321/files/mpg321-0.3.2-clang16.patch | 79 | ||||
| -rw-r--r-- | media-sound/mpg321/mpg321-0.3.2-r1.ebuild (renamed from media-sound/mpg321/mpg321-0.3.2.ebuild) | 7 |
4 files changed, 85 insertions, 4 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex 7c20984ffd98..66da2a0790fb 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest index f64087074246..a6f4df143475 100644 --- a/media-sound/mpg321/Manifest +++ b/media-sound/mpg321/Manifest @@ -1,7 +1,8 @@ AUX mpg321-0.2.12-check-for-lround.patch 670 BLAKE2B e41184968df73dbb3eef1b6149cd569bc40590d5bd1262ede84356ad975498db3533f443aede6afc0c223650cd3e8fd877bceb702c6e645cafef45eb7e273b6d SHA512 391a98bdf102d3016e98005ddc84b6b303e1fd5653ddcaa13cda0b09b84952bee99f3ebbb6ad763a21965c47692a7011e167b7f990cea760ecf88dbaa34de3a2 AUX mpg321-0.3.2-CVE-2019-14247.patch 931 BLAKE2B 5ef376d165a61771241389a9c165be2845dddb0584aad59d1b518ea7e53160d0a3b1f7ec266831220eb1da5082b1c57141ff9f16299a883bd464e1d3395ef560 SHA512 7b14627ae09ed3ccbcb0ecc58ef8f91ef1244fecb1cd3da82f64214fb5237fb4664203f39c92b700abec0e7dd4be78eb863fa3c00313a8a2ebfb0f0c80462108 +AUX mpg321-0.3.2-clang16.patch 2399 BLAKE2B 0380a380f70c99819e60832671f752d930a8cc7bdc1c373a374a289f83071e46f38022cac442a74c85618c6684315ecc65e06293adba886d959936343f66351f SHA512 bed91be07cfe868b12a4c2fbddb4a9f5027226f09ac1f69061f6c62d810e8abb1f20d07ba533630ab0dab0df6798a7f51dcddf9c9e6e62ff16b86813d80b4b52 AUX mpg321-0.3.2-format-security.patch 1154 BLAKE2B be54674f59b5f98118573828b73942fc7f312e02058e358b3c853318021e30cd5062721c568e83317504770c9f44c052289c32007822a7d99a30df7cef20afc3 SHA512 4184e415f7338d35e2169d663ef24d2d4c0acfc7fac9dc40e184538aaf1c6aaaddd3adce6f54755043dc94b0ee90f74fe287abf6c010f677639dd58b814a4fd1 AUX mpg321-0.3.2-gcc10.patch 2218 BLAKE2B b78e85d6ec04b6b76471bfe48df31ebd312d97c938f30b823f364dffcfa9101ac2033c4710173902fb42767d664f1bc89e0401b725084a062a35d89a01d14cbd SHA512 079cec28a4ce9aa54a7952e548d24804c266e397b2109eb7cbc42396b88a7f6e4ba5112219d645972d293e90ba12e5f696d606c803cff9225888cac1ba0cea79 DIST mpg321-0.3.2.tar.gz 151139 BLAKE2B d1b043316aca07e61ab61698f1d9e56fd221c4024e69b5262906b280dcb4f67bd32f3ff72b1758ba26cc0fa7d1c5c4052fc6fc87ae9ceec9d0bf77b1d35a868f SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234 -EBUILD mpg321-0.3.2.ebuild 1257 BLAKE2B 7afa8e38f954d5747608db2b964e6eb36ad0cde163dbb379a90ca930dbb758eee45b76e4e7f2f6ffc7c7866f96d514df2a81f8c8a36fe12373fc231f0fad7863 SHA512 91d9b1f373883f94b3a5687d9603d6370bf431717d7a053e70b2bdfc7c1fd2d978bca1a832f63161912a0e69000adff18386eba003fdb885d063c81ca95dfb55 +EBUILD mpg321-0.3.2-r1.ebuild 1281 BLAKE2B a9b9816f464877b491a5b2ab9b55fe3f89f8d08402ebe69447e6a8cd6d707af7c1760faf68042a0cf553123833db50c1e787370446775c22c0f7c3e3550d14f6 SHA512 6b2fd973c35b1fb1a30f765689fcfb4a40930faa614f8255bbf9e02d05dbf12b4ad18b57104c2e4ce0fd67e2ecfebfb757e69a85e36001b99d3c62dae4a4bcfa MISC metadata.xml 330 BLAKE2B f57c1d7dadb3726cf5d00290e9ca2227a146b8e7ccb2d5e050291b962f554d698b1e5558c89e69a371ac325498ce339e15a25b2b7c9f203f5951d741a16a8c3b SHA512 8c41e28760e5e2fd68e107260503b3f34fe77646cb752df017e63d0e8479dc19ea214312d90576ab95850e1983a39fedbdea76f23e5d0e17fb49bca6c3328ca4 diff --git a/media-sound/mpg321/files/mpg321-0.3.2-clang16.patch b/media-sound/mpg321/files/mpg321-0.3.2-clang16.patch new file mode 100644 index 000000000000..a2d49edf0e89 --- /dev/null +++ b/media-sound/mpg321/files/mpg321-0.3.2-clang16.patch @@ -0,0 +1,79 @@ +https://bugs.gentoo.org/860876 +https://bugs.gentoo.org/874312 +--- a/fft.c ++++ b/fft.c +@@ -148,5 +148,5 @@ + printf("%i is reversed to %i and maps to %i %i\n", i, bitReverse[i], bitReverse[i] * 2, (bitReverse[i] * 2) + 1); + #endif +- sound_sample* ptr = &(input[bitReverse[i] * 2]); ++ const sound_sample* ptr = &(input[bitReverse[i] * 2]); + *realptr++ = (ptr[0] + ptr[1]) / 2; + *imagptr++ = 0; +--- a/mpg321.c ++++ b/mpg321.c +@@ -100,5 +100,5 @@ + pid_t output_pid; + /* Not used for the moment. It only works for CBR http/ftp retrieved files */ +-extern http_file_length; ++extern int http_file_length; + #ifdef HAVE_ALSA + /* ALSA Volume Range */ +--- a/mpg321.h ++++ b/mpg321.h +@@ -177,4 +177,5 @@ + + /* network functions */ ++void do_basicauth(); + int tcp_open(char * address, int port); + int udp_open(char * address, int port); +@@ -189,4 +190,5 @@ + enum mad_flow output(void *data, struct mad_header const *header, struct mad_pcm *pcm); + int calc_length(char *file, buffer*buf ); ++int calc_http_length(buffer *buf); + + static enum mad_flow handle_error(void *data, struct mad_stream *stream, struct mad_frame *frame); +@@ -199,6 +201,8 @@ + void check_ao_default_play_device(); + void check_default_play_device(); ++int check_default_play_device_buffer(); + int playdevice_is_live(); + void open_ao_playdevice(struct mad_header const *header); ++ao_device *open_ao_playdevice_buffer(struct mad_header const *header); + + /* remote control (-R) functions */ +@@ -230,4 +234,10 @@ + RETSIGTYPE handle_sigchld(int sig); + ++#ifdef HAVE_ALSA ++int init_alsa_volume_control(char *name); ++long mpg321_alsa_get_volume(); ++void mpg321_alsa_set_volume(long value); ++#endif ++ + /* FFT data structures */ + #define FFT_BUFFER_SIZE_LOG 9 +@@ -243,5 +253,5 @@ + + typedef short int sound_sample; +-//void fft_perform(const sound_sample *input, double *output, fft_state *state); ++void fft_perform(const sound_sample *input, double *output, fft_state *state); + + fft_state *fft_init(void); +--- a/options.c ++++ b/options.c +@@ -45,5 +45,5 @@ + extern int auth_enable; + extern int auth_enable_var; +-extern remote_restart; ++extern int remote_restart; + /*Basic Authentication Arguments*/ + char *basic_auth = NULL; +--- a/volume.c ++++ b/volume.c +@@ -29,5 +29,5 @@ + int init_alsa_volume_control(char *name) + { +- char *elemnam; ++ const char *elemnam; + snd_mixer_open(&mixer,0); + snd_mixer_attach(mixer,name); diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2-r1.ebuild index 119b2b4c559d..689440e6caa4 100644 --- a/media-sound/mpg321/mpg321-0.3.2.ebuild +++ b/media-sound/mpg321/mpg321-0.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="alsa ipv6" +IUSE="alsa" RDEPEND="app-eselect/eselect-mpg123 >=media-libs/libao-1:= @@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}/${P}-format-security.patch" "${FILESDIR}/${P}-CVE-2019-14247.patch" "${FILESDIR}/${P}-gcc10.patch" + "${FILESDIR}/${P}-clang16.patch" ) src_prepare() { @@ -38,7 +39,7 @@ src_prepare() { src_configure() { econf \ --disable-mpg123-symlink \ - $(use_enable ipv6) \ + --enable-ipv6 \ $(use_enable alsa) } |