Date: Mon, 21 Oct 2013 17:56:33 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331166 - head/multimedia/mplayer2 Message-ID: <201310211756.r9LHuX81050977@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 21 17:56:33 2013 New Revision: 331166 URL: http://svnweb.freebsd.org/changeset/ports/331166 Log: multimedia/mplayer2: use ffmpeg instead of ffmpeg1 - Use ffmpeg instead of ffmpeg1 Approved by: portmgr (bapt, implicit) Modified: head/multimedia/mplayer2/Makefile Modified: head/multimedia/mplayer2/Makefile ============================================================================== --- head/multimedia/mplayer2/Makefile Mon Oct 21 17:51:00 2013 (r331165) +++ head/multimedia/mplayer2/Makefile Mon Oct 21 17:56:33 2013 (r331166) @@ -2,6 +2,7 @@ PORTNAME= mplayer2 PORTVERSION= ${MPLAYER2_PORT_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= LOCAL/gblach/ @@ -13,10 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ dvdread:${PORTSDIR}/multimedia/libdvdread -BUILD_DEPENDS= ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1 \ +BUILD_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ python3:${PORTSDIR}/lang/python3 \ rst2man:${PORTSDIR}/textproc/py-docutils -RUN_DEPENDS= ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1 +RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg USE_XZ= yes USES= gmake iconv ncurses pkgconfig @@ -25,10 +26,8 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD PTHREAD_LIBS="${PTHREAD_LIBS}" \ TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc=${CC} \ - --extra-cflags='-I${LOCALBASE}/include/ffmpeg1 \ - -I${LOCALBASE}/include/portaudio2' \ - --extra-ldflags='-L${LOCALBASE}/lib/ffmpeg1 -lavresample1 \ - -L${LOCALBASE}/lib/portaudio2' \ + --extra-cflags='-I${LOCALBASE}/include/portaudio2' \ + --extra-ldflags='-lavresample -L${LOCALBASE}/lib/portaudio2' \ --mandir=${PREFIX}/man \ --enable-libavresample \ --disable-alsa \ @@ -287,12 +286,6 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif @${REINPLACE_CMD} \ - -e 's/libavutil/libavutil1/' \ - -e 's/libavcodec/libavcodec1/' \ - -e 's/libavformat/libavformat1/' \ - -e 's/libswscale/libswscale1/' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} \ -e 's|/dev/acd0|${WITH_CDROM_DEVICE}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|-lbz2|/usr/lib/libbz2.so|' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310211756.r9LHuX81050977>