svn commit: r331138 - in head/net/opal: . files

[Koop Mast]

Author: kwm
Date: Mon Oct 21 13:31:51 2013
New Revision: 331138
URL: http://svnweb.freebsd.org/changeset/ports/331138

Log:
  Switch to ffmpeg 0.x [1]. This should resolve building failures with ffmpeg 2.x.
  
  Submitted by:	wg@ [1]

Deleted:
  head/net/opal/files/patch-ffmpeg
Modified:
  head/net/opal/Makefile

Modified: head/net/opal/Makefile
==============================================================================
--- head/net/opal/Makefile	Mon Oct 21 13:15:46 2013	(r331137)
+++ head/net/opal/Makefile	Mon Oct 21 13:31:51 2013	(r331138)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opal
 PORTVERSION=	3.10.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
@@ -158,8 +158,13 @@ PLIST_SUB+=	X264="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
 CONFIGURE_ARGS+=	--enable-libavcodec
+CONFIGURE_ENV+=		LIBAVCODEC_LIBS="-lavcodec0" \
+			LIBAVCODEC_CFLAGS="-I${LOCALBASE}/include/ffmpeg0" \
+			LIBAVUTIL_LIBS="-lavutil0" \
+			LIBAVUTIL_CFLAGS="-I${LOCALBASE}/include/ffmpeg0"
+CFLAGS+=		-I${LOCALBASE}/include/ffmpeg0
 PLIST_SUB+=	FFMPEG=""
 WITH_VIDEO=	yes
 .else
@@ -287,12 +292,6 @@ CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-gsmamr \
 			--disable-ruby
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/CODEC_ID/AV_CODEC_ID/g' \
-		-e 's/CodecID/AVCodecID/g' \
-		${WRKSRC}/plugins/video/H.263-1998/h263-1998.* \
-		${WRKSRC}/plugins/video/common/dyna.*
-
 post-install:
 	${LN} -sf libopal.so.${PORTVERSION} ${PREFIX}/lib/libopal.so.${PVERSION_MAJOR}
 	${LN} -sf libopal.so.${PORTVERSION} ${PREFIX}/lib/libopal.so.${PVERSION_MINOR}