commit: dbb4d8b568ac707d8df35dbdbfb95c1fd6c311cb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 25 13:12:03 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 13:12:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb4d8b5
media-video/mplayer: add 1.5_p20241125 Bug: https://bugs.gentoo.org/922624 Bug: https://bugs.gentoo.org/944928 Closes: https://bugs.gentoo.org/936138 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/mplayer/Manifest | 1 + .../mplayer/files/mplayer-1.5_p20241125-c99.patch | 35 ++++++++++++++++++++++ ...er-9999.ebuild => mplayer-1.5_p20241125.ebuild} | 14 ++++++--- media-video/mplayer/mplayer-9999.ebuild | 14 ++++++--- 4 files changed, 56 insertions(+), 8 deletions(-) diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 7be42fef3422..b6e71fffef4e 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -4,3 +4,4 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e7 DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73 DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89592f62142f361ff0e4107710c80de4351a5807e344869cb55ff5b5856efaedb6cfe242483f8e7f97521b805f84ca23e3818 SHA512 874e76b3edfccb7475349d954ed49860f92a5e99f0374084f5da53af35326365bb064c460fb6527d2fb6d8ae20d9e059ba197f45d4de42bc7a78992b5191a7cb DIST mplayer-1.5_p20231206.tar.xz 15212032 BLAKE2B c4658a0070296a9e24bb8388787a2ef322fefad4f4ea095bbf3f95b20f2e32b0423814ae311e43c9a6ef20afe0970540abd5d6d0ae0ebd59df74a8beb7abe3df SHA512 480502c735fb8d24ea1761a2b3f7daf1872df268f44791c7141f5b444b583beb0e4ecebe94e04129d27aae27656baddfb2da50406a431f1df39c589baac69432 +DIST mplayer-1.5_p20241125.tar.xz 15807772 BLAKE2B ce448b344f6ad9d5cb6216725f02c2560ff9282d46deeb40837fc1bfad02425ead86a9fbe717acd060b7428a2b84b75557b2f662ff95ece104b2302c926fc1db SHA512 7cefb4ba6b64eef42fd6192e7d84d38fd85580d7535f7630cc9e7de060cb0c08c85ffea121f6099410d6882a2265af169fb9424ee9ec81209319250a93ee81c1 diff --git a/media-video/mplayer/files/mplayer-1.5_p20241125-c99.patch b/media-video/mplayer/files/mplayer-1.5_p20241125-c99.patch new file mode 100644 index 000000000000..a9ad8a9db1a1 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.5_p20241125-c99.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/936138 +``` +libmpdemux/muxer_lavf.c:395:90: error: passing argument 6 of 'avio_alloc_context' from incompatible pointer type [-Wincompatible-pointer-types] + 395 | priv->oc->pb = avio_alloc_context(priv->buffer, BIO_BUFFER_SIZE, 1, muxer, NULL, mp_write, mp_seek); + | ^~~~~~~~ + | | + | int (*)(void *, const uint8_t *, int) {aka int (*)(void *, const unsigned char *, int)} +In file included from /usr/include/libavformat/avformat.h:319: +/usr/include/libavformat/avio.h:420:25: note: expected 'int (*)(void *, uint8_t *, int)' {aka 'int (*)(void *, unsigned char *, int)'} but argument is of type 'int (*)(void *, const uint +8_t *, int)' {aka 'int (*)(void *, const unsigned char *, int)'} + 420 | int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``` +--- a/libmpcodecs/ad_spdif.c ++++ b/libmpcodecs/ad_spdif.c +@@ -54,7 +54,7 @@ static int read_packet(void *p, uint8_t *buf, int buf_size) + return 0; + } + +-static int write_packet(void *p, const uint8_t *buf, int buf_size) ++static int write_packet(void *p, unsigned char *buf, int buf_size) + { + int len; + struct spdifContext *ctx = p; +--- a/libmpdemux/muxer_lavf.c ++++ b/libmpdemux/muxer_lavf.c +@@ -77,7 +77,7 @@ const m_option_t lavfopts_conf[] = { + {NULL, NULL, 0, 0, 0, 0, NULL} + }; + +-static int mp_write(void *opaque, const uint8_t *buf, int size) ++static int mp_write(void *opaque, unsigned char *buf, int size) + { + muxer_t *muxer = opaque; + return stream_write_buffer(muxer->stream, buf, size); diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.5_p20241125.ebuild similarity index 99% copy from media-video/mplayer/mplayer-9999.ebuild copy to media-video/mplayer/mplayer-1.5_p20241125.ebuild index 6b3151bed816..f633e0d6189c 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20241125.ebuild @@ -125,10 +125,12 @@ RDEPEND=" png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-libs/libpulse ) - rar? ( || ( + rar? ( + || ( app-arch/unrar app-arch/rar - ) ) + ) + ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) @@ -189,9 +191,14 @@ REQUIRED_USE=" vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) - xv? ( X )" + xv? ( X ) +" RESTRICT="faac? ( bindist )" +PATCHES=( + "${FILESDIR}"/${PN}-1.5_p20241125-c99.patch +) + pkg_setup() { if [[ ${PV} == *9999* ]]; then elog @@ -298,7 +305,6 @@ src_configure() { --disable-libnut --disable-libopus --disable-svga --disable-svgalib_helper - --disable-xvmc $(use_enable network networking) $(use_enable joystick) ) diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 6b3151bed816..f633e0d6189c 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -125,10 +125,12 @@ RDEPEND=" png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-libs/libpulse ) - rar? ( || ( + rar? ( + || ( app-arch/unrar app-arch/rar - ) ) + ) + ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) @@ -189,9 +191,14 @@ REQUIRED_USE=" vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) - xv? ( X )" + xv? ( X ) +" RESTRICT="faac? ( bindist )" +PATCHES=( + "${FILESDIR}"/${PN}-1.5_p20241125-c99.patch +) + pkg_setup() { if [[ ${PV} == *9999* ]]; then elog @@ -298,7 +305,6 @@ src_configure() { --disable-libnut --disable-libopus --disable-svga --disable-svgalib_helper - --disable-xvmc $(use_enable network networking) $(use_enable joystick) )
