Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Oct 2013 18:00:38 +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: r331167 - head/multimedia/mpv
Message-ID:  <201310211800.r9LI0cgK054229@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Mon Oct 21 18:00:38 2013
New Revision: 331167
URL: http://svnweb.freebsd.org/changeset/ports/331167

Log:
  multimedia/mpv: use ffmpeg instead of ffmpeg1
  
  - Use ffmpeg instead of ffmpeg1
  
  Approved by:	portmgr (bapt, implicit)

Modified:
  head/multimedia/mpv/Makefile

Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile	Mon Oct 21 17:56:33 2013	(r331166)
+++ head/multimedia/mpv/Makefile	Mon Oct 21 18:00:38 2013	(r331167)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpv
 PORTVERSION=	20130711
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	LOCAL/gblach/
 
@@ -13,9 +14,9 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	ass:${PORTSDIR}/multimedia/libass \
 		dvdread:${PORTSDIR}/multimedia/libdvdread
-BUILD_DEPENDS=	ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1 \
+BUILD_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 		rst2man:${PORTSDIR}/textproc/py-docutils
-RUN_DEPENDS=	ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1
+RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 
 USE_XZ=		yes
 USES=		gmake iconv pkgconfig
@@ -25,10 +26,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--mandir=${PREFIX}/man \
 		--cc=${CC} \
 		--extra-cflags=' \
-		-I${LOCALBASE}/include/ffmpeg1 \
 		-I${LOCALBASE}/include' \
 		--extra-ldflags=' \
-		-L${LOCALBASE}/lib/ffmpeg1 \
 		-L${LOCALBASE}/lib' \
 		--disable-mng \
 		--disable-mpg123 \
@@ -154,16 +153,6 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${REINPLACE_CMD} \
-		-e 's/libavutil/libavutil1/' \
-		-e 's/libavcodec/libavcodec1/' \
-		-e 's/libavdevice/libavdevice1/' \
-		-e 's/libavformat/libavformat1/' \
-		-e 's/libavresample/libavresample1/' \
-		-e 's/libpostproc/libpostproc1/' \
-		-e 's/libswscale/libswscale1/' \
-		-e 's/libswresample/libswresample1/' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} \
 		-e 's|/dev/acd0|/dev/cd0|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310211800.r9LI0cgK054229>