Index: head/multimedia/mencoder/Makefile =================================================================== --- head/multimedia/mencoder/Makefile (revision 430412) +++ head/multimedia/mencoder/Makefile (revision 430413) @@ -1,105 +1,106 @@ # Created by: Thomas E. Zander # $FreeBSD$ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org COMMENT= Convenient video file and movie encoder .include "${.CURDIR}/../mplayer/Makefile.common" -OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ +OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ MAD NAS OPENAL OPENJPEG OPUS PULSEAUDIO \ RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \ X264 XVID -OPTIONS_DEFAULT=DVDNAV FONTCONFIG GIF GNUTLS X264 XVID +OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS 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 RESTRICTED= Port has restricted dependencies 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+= alias iconv pkgconfig 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/w32codec_dl.pl \ TOOLS/wma2ogg.pl .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 LIB_DEPENDS+= libmp3lame.so:audio/lame ALL_TARGET= mencoder .include "${.CURDIR}/../mplayer/Makefile.options" BROKEN_aarch64= Fails to compile: error: invalid operand for instruction 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}${MAN1PREFIX}/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 Index: head/multimedia/mplayer/Makefile =================================================================== --- head/multimedia/mplayer/Makefile (revision 430412) +++ head/multimedia/mplayer/Makefile (revision 430413) @@ -1,155 +1,156 @@ # Created by: Thomas E. Zander with help from Vladimir Kushnir # $FreeBSD$ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org COMMENT= High performance media player supporting many formats .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common" -OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \ +OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO RTC RTMP \ SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC -OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \ +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 -DVDNAV_DESC?= DVD navigation features support +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 RTC_DESC?= Add support for kernel real time clock 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 .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-libdirac-lavc \ --disable-mencoder \ --disable-mpg123 \ --disable-musepack \ --disable-theora .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} PLIST_SUB+= GMPLAYER="" DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false .if ${PORT_OPTIONS:MSKINS} RUN_DEPENDS+= mplayer-skins>=0:multimedia/mplayer-skins .endif USE_GNOME+= gtk20 CONFIGURE_ARGS+= --enable-gui .else PLIST_SUB+= GMPLAYER="@comment " .endif #GUI && X11 .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xext xproto xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} USE_XORG+= xv .else CONFIGURE_ARGS+=--disable-xv .endif .if ${PORT_OPTIONS:MX11DGA} USE_XORG+= xxf86dga .else CONFIGURE_ARGS+=--disable-dga1 --disable-dga2 .endif .if ${PORT_OPTIONS:MOPENGL} USE_GL+= gl .else CONFIGURE_ARGS+=--disable-gl .endif .if ${PORT_OPTIONS:MXINERAMA} USE_XORG+= xinerama xineramaproto .else CONFIGURE_ARGS+=--disable-xinerama .endif .if ${PORT_OPTIONS:MX11VM} USE_XORG+= xxf86vm .else CONFIGURE_ARGS+=--disable-vm .endif .if ${PORT_OPTIONS:MXVMC} USE_XORG+= xvmc CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW .endif .else #X11 CONFIGURE_ARGS+=--disable-x11 .endif .include .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" BROKEN_armv6= Fails to compile: Error: garbage following instruction -- vmov s16,SCALE BROKEN_aarch64= Fails to compile: error: invalid operand for instruction 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-patch-RTC-on: @${REINPLACE_CMD} -e 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' ${WRKSRC}/mplayer.c 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 Index: head/multimedia/mplayer/Makefile.common =================================================================== --- head/multimedia/mplayer/Makefile.common (revision 430412) +++ head/multimedia/mplayer/Makefile.common (revision 430413) @@ -1,78 +1,78 @@ # Contains the build infrastructural definitions for both # mplayer and mencoder....the variables that we need to set # before we include bsd.port.pre.mk # # $FreeBSD$ MPLAYER_PORT_VERSION= 1.3.0 MPLAYER_SNAPSHOT_DATE= 2016-12-28 -PORTREVISION?= 1 +PORTREVISION?= 2 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 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-libdirac-lavc \ --disable-libilbc \ --disable-libnut \ --disable-libvorbis \ --disable-live \ --disable-joystick \ --disable-mad \ --disable-libmpeg2 \ --disable-nemesi \ --disable-real \ - --enable-ass-internal \ --yasm='' WANT_GNOME= yes 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} @${FIND} -E ${WRKSRC} -type f \ -iregex ".*(configure|.sh|Makefile)" -print0 | \ ${XARGS} -x -0 -n 10 \ ${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}|' @${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' Index: head/multimedia/mplayer/Makefile.optvars =================================================================== --- head/multimedia/mplayer/Makefile.optvars (revision 430412) +++ head/multimedia/mplayer/Makefile.optvars (revision 430413) @@ -1,134 +1,137 @@ # $FreeBSD$ # # Handling of variables using helpers # Include before bsd.port.(pre|options).mk # OPTIONs AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_OFF= --disable-aa AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr AMR_NB_CONFIGURE_OFF= --disable-libopencore_amrnb AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr AMR_WB_CONFIGURE_OFF= --disable-libopencore_amrwb +ASS_LIB_DEPENDS= libass.so:multimedia/libass +ASS_CONFIGURE_OFF= --disable-ass + BLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray BLURAY_CONFIGURE_OFF= --disable-bluray CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_OFF= --disable-caca CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_OFF= --disable-libcdio DV_LIB_DEPENDS= libdv.so:multimedia/libdv DV_CONFIGURE_OFF= --disable-libdv DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav DVDNAV_CONFIGURE_OFF= --disable-dvdnav ENCA_LIB_DEPENDS= libenca.so:converters/enca ENCA_CONFIGURE_OFF= --disable-enca FAAC_LIB_DEPENDS= libfaac.so:audio/faac FAAC_CONFIGURE_OFF= --disable-faac FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_OFF= --disable-fontconfig FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_OFF= --disable-fribidi GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_OFF= --disable-gif GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --disable-gnutls GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_OFF= --disable-libgsm IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_OFF= --disable-inet6 JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_OFF= --disable-jack LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa LADSPA_CONFIGURE_OFF= --disable-ladspa LIBMNG_LIB_DEPENDS= libmng.so:graphics/libmng LIBMNG_CONFIGURE_OFF= --disable-mng LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_OFF= --disable-lirc LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 LZO_CONFIGURE_OFF= --disable-liblzo NAS_LIB_DEPENDS= libaudio.so:audio/nas NAS_CONFIGURE_OFF= --disable-nas OPENAL_USES= openal:soft OPENAL_CONFIGURE_OFF= --disable-openal OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_OFF= --disable-libopus PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF= --disable-pulse RTC_BUILD_DEPENDS= ${LOCALBASE}/modules/rtc.ko:emulators/rtc RTC_RUN_DEPENDS= ${LOCALBASE}/modules/rtc.ko:emulators/rtc RTC_CONFIGURE_ENABLE= rtc RTCPU_CONFIGURE_ON= --enable-runtime-cpudetection RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_CONFIGURE_OFF= --disable-librtmp SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SCHROEDINGER_CONFIGURE_OFF= --disable-libschroedinger-lavc SDL_USE= SDL=sdl SDL_LIB_DEPENDS= libaa.so:graphics/aalib SDL_CONFIGURE_OFF= --disable-sdl SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_OFF= --disable-sndio SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient SMB_CONFIGURE_OFF= --disable-smb SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_OFF= --disable-speex SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib SVGALIB_CONFIGURE_OFF= --disable-svga THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_OFF= --disable-theora TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_OFF= --disable-twolame V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_OFF= --disable-tv-v4l1 --disable-tv-v4l2 V4L_CONFIGURE_ON= --enable-tv-v4l1 --enable-tv-v4l2 --extra-libs="-lv4l1 -lv4l2" VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_OFF= --disable-vdpau VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_OFF= --disable-libvpx-lavc X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_OFF= --disable-x264 XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_OFF= --disable-xvid