diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo index 3de3df0e1f6b..d8ca11aa54c6 100644 --- a/multimedia/mencoder/distinfo +++ b/multimedia/mencoder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664013395 -SHA256 (mplayer-1.5.0.20220924.tar.xz) = ab4642ac9d3ca037e4ccab5d73b61a398bdbef041bbe509448602793f5bfd66a -SIZE (mplayer-1.5.0.20220924.tar.xz) = 5196248 +TIMESTAMP = 1679560282 +SHA256 (mplayer-1.5.0.20230321.tar.xz) = f82e433a3c5d31b6a5154e605aab2df6a875d60e484a5bddb0a9d06ea9b87346 +SIZE (mplayer-1.5.0.20230321.tar.xz) = 5198052 diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index c15f578ca228..d739a76c0a38 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,99 +1,98 @@ 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 RTMP \ SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC 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 VDPAU OPTIONS_DEFAULT_amd64= RTCPU VDPAU 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 CONFLICTS= mplayer2-2.* 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 .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}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz) ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png .endif .include diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index eb6924c6986a..ec9ce778dea5 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -1,75 +1,75 @@ # Contains the build infrastructural definitions for both # mplayer and mencoder....the variables that we need to set # before we include bsd.port.pre.mk MPLAYER_PORT_VERSION= 1.5.0 -MPLAYER_SNAPSHOT_DATE= 2022-09-24 +MPLAYER_SNAPSHOT_DATE= 2023-03-21 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg \ libfreetype.so:print/freetype2 BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_i386= as:devel/binutils USES= compiler:c11 gmake iconv ncurses tar:xz NOPRECIOUSMAKEVARS= yes # ARCH HAS_CONFIGURE= yes CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc="${CC}" \ --host-cc="${CC}" \ --as="${AS}" \ --mandir="${PREFIX}/man" \ --extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \ --extra-libs="-L${PREFIX}/lib" \ --disable-alsa \ --disable-ass-internal \ --disable-bitmap-font \ --disable-crystalhd \ --disable-esd \ --disable-faad \ --disable-ffmpeg_a \ --disable-ggi \ --disable-ggiwmh \ --disable-liba52 \ --disable-libbs2b \ --disable-libilbc \ --disable-libnut \ --disable-libvorbis \ --disable-live \ --disable-joystick \ --disable-mad \ --disable-libmpeg2 \ --disable-nemesi \ --disable-real \ --yasm='' common-post-patch: @${REINPLACE_CMD} \ -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \ s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|-lbz2|/usr/lib/libbz2.so|' \ -e 's|-lncurses|/usr/lib/libncurses.so|' \ -e 's|-liconv|${ICONV_LIB}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -E \ -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ ${CONFIGURE_WRKSRC}/Makefile @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g' @${RM} ${WRKSRC}/binary.ver diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index f05d47650c4a..fff6d30d8952 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664013047 -SHA256 (mplayer-1.5.0.20220924.tar.xz) = ab4642ac9d3ca037e4ccab5d73b61a398bdbef041bbe509448602793f5bfd66a -SIZE (mplayer-1.5.0.20220924.tar.xz) = 5196248 +TIMESTAMP = 1679487334 +SHA256 (mplayer-1.5.0.20230321.tar.xz) = f82e433a3c5d31b6a5154e605aab2df6a875d60e484a5bddb0a9d06ea9b87346 +SIZE (mplayer-1.5.0.20230321.tar.xz) = 5198052 diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c b/multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c deleted file mode 100644 index e0bd7ef69167..000000000000 --- a/multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libmpcodecs/ve_lavc.c.orig 2022-08-30 20:40:03 UTC -+++ libmpcodecs/ve_lavc.c -@@ -441,7 +441,7 @@ static int config(struct vf_instance *vf, - mp_msg(MSGT_MENCODER,MSGL_ERR,"error parsing vrc_q\n"); - return 0; - } -- lavc_venc_context->rc_override= -+ lavc_venc_context->rc_override=(struct RcOverride *) - av_reallocp_array(lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override)); - lavc_venc_context->rc_override[i].start_frame= start; - lavc_venc_context->rc_override[i].end_frame = end;