diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 427d6ce5f8eb..0199ba34d192 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,107 +1,105 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org COMMENT= Convenient video file and movie encoder WWW= http://www.mplayerhq.hu/ -BROKEN= Fail to build with FFmpeg 9 - .include "${.CURDIR}/../mplayer/Makefile.common" OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DV DVDNAV FAAC FONTCONFIG \ FRIBIDI GIF GNUTLS GSM IPV6 JACK JPEG LADSPA LIBMNG LZO \ MAD NAS NLS OPENAL OPENJPEG OPUS PULSEAUDIO \ SMB SPEEX THEORA TWOLAME V4L VPX \ X264 XVID OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS JPEG X264 XVID OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_amd64= RTCPU OPTIONS_DEFINE_powerpc= RTCPU OPTIONS_DEFAULT_i386= RTCPU OPTIONS_DEFAULT_amd64= RTCPU OPTIONS_DEFAULT_powerpc=RTCPU ASS_DESC?= Subtitles rendering via libass BLURAY_DESC?= BluRay support DVDNAV_DESC?= DVD navigation features support LZO_DESC?= Enable external liblzo library RTCPU_DESC?= Use runtime CPU detection PATCHDIR= ${.CURDIR}/../mplayer/files FILESDIR= ${PATCHDIR} DATADIR= ${PREFIX}/share/mplayer TOOLFILES= aconvert.sh binary_codecs.sh calcbpp.pl \ checktree.sh countquant.pl divx2svcd.sh \ dvd2divxscript.pl edgedetect.fp edgeenh.fp \ emboss.fp mencvcd.sh midentify.sh \ mpconsole.sh mphelp_check.py mplmult.sh \ plotpsnr.pl psnr-video.sh qepdvcd.sh \ subedit.pl subsearch.sh vobshift.py \ w32codec_dl.pl wma2ogg.pl USES+= iconv pkgconfig python shebangfix SHEBANG_FILES= TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl \ TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \ TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \ TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/vobshift.py \ TOOLS/w32codec_dl.pl TOOLS/wma2ogg.pl PYTHON_NO_DEPENDS= yes .include "${.CURDIR}/../mplayer/Makefile.optvars" .include CONFIGURE_ARGS+= --disable-mplayer \ --disable-libdca \ --disable-x11 \ --disable-vdpau \ --disable-rtc \ --disable-arts \ --disable-caca \ --disable-lirc \ --disable-sdl \ --disable-svga \ --disable-aa \ --disable-joystick \ --disable-directfb \ --disable-mpg123 \ --disable-enca \ --disable-musepack \ --disable-sndio \ --disable-librtmp LIB_DEPENDS+= libmp3lame.so:audio/lame ALL_TARGET= mencoder .include "${.CURDIR}/../mplayer/Makefile.options" pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" post-patch: common-post-patch do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${PREFIX}/share/man/man1/mencoder.1 @${MKDIR} ${STAGEDIR}${DATADIR} @${CHMOD} 755 ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/tools @${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools .for tool in ${TOOLFILES} ${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools .endfor .include diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 13f55d895652..7b307b1fc957 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,98 +1,99 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org COMMENT= High performance media player supporting many formats WWW= http://www.mplayerhq.hu/ .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common" OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ JPEG LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO \ SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \ SKINS X11 X11DGA X11VM XINERAMA XVIDEO OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_amd64= RTCPU OPTIONS_DEFINE_powerpc= RTCPU OPTIONS_DEFAULT_i386= RTCPU OPTIONS_DEFAULT_amd64= RTCPU OPTIONS_DEFAULT_powerpc=RTCPU ASS_DESC?= Subtitles rendering via libass BLURAY_DESC?= BluRay support DVDNAV_DESC?= DVD navigation features support ENCA_DESC?= Charset conversion via enca LZO_DESC?= External liblzo support RTCPU_DESC?= Use runtime CPU detection SKINS_DESC?= Install skins for GUI X11DGA_DESC?= X11 DGA video driver support X11VM_DESC?= X11 VidMode support SUB_FILES= pkg-message CONFFILES= example.conf input.conf menu.conf dvb-menu.conf USES+= iconv pkgconfig OPTIONS_SUB= yes .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" .include CONFIGURE_ARGS+= --disable-arts \ --disable-directfb \ --disable-faac \ --disable-libdca \ --disable-toolame \ --disable-twolame \ --disable-x264 \ --disable-xvid \ --disable-mencoder \ --disable-mpg123 \ --disable-musepack \ --disable-theora \ --disable-librtmp .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" @${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}" @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} @${ECHO_MSG} "If you want to use the GUI, you can use the skins from" @${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins" @${ECHO_MSG} "or download them from" @${ECHO_MSG} "http://www.mplayerhq.hu/" .endif post-patch: common-post-patch post-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${CHMOD} 755 ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc @${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc .for conf in ${CONFFILES} ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc .endfor .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} @${LN} -sf mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer @(cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz) ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${CP} ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png .endif .include diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ae__lavc.c b/multimedia/mplayer/files/patch-libmpcodecs_ae__lavc.c new file mode 100644 index 000000000000..d8df8b2f4692 --- /dev/null +++ b/multimedia/mplayer/files/patch-libmpcodecs_ae__lavc.c @@ -0,0 +1,22 @@ +--- libmpcodecs/ae_lavc.c.orig 2024-04-14 12:12:16 UTC ++++ libmpcodecs/ae_lavc.c +@@ -177,10 +177,16 @@ int mpae_init_lavc(audio_encoder_t *encoder) + lavc_actx->codec_id = lavc_acodec->id; + // put sample parameters + lavc_actx->sample_fmt = AV_SAMPLE_FMT_S16; +- if (lavc_acodec->sample_fmts) { ++ const enum AVSampleFormat *sample_fmts; ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 3, 100) // FFmpeg 7.0+ ++ avcodec_get_supported_config(lavc_actx, lavc_acodec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, (const void **)&sample_fmts, NULL); ++#else ++ sample_fmts = lavc_acodec->sample_fmts; ++#endif ++ if (sample_fmts) { + const enum AVSampleFormat *fmts; +- lavc_actx->sample_fmt = lavc_acodec->sample_fmts[0]; // fallback to first format +- for (fmts = lavc_acodec->sample_fmts; *fmts != AV_SAMPLE_FMT_NONE; fmts++) { ++ lavc_actx->sample_fmt = sample_fmts[0]; // fallback to first format ++ for (fmts = sample_fmts; *fmts != AV_SAMPLE_FMT_NONE; fmts++) { + if (samplefmt2affmt(av_get_packed_sample_fmt(*fmts)) == encoder->params.sample_format) { // preferred format found + lavc_actx->sample_fmt = *fmts; + break;