From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 21 13:31:52 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2BFC2545;
 Mon, 21 Oct 2013 13:31:52 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1907B2867;
 Mon, 21 Oct 2013 13:31:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LDVpMB008347;
 Mon, 21 Oct 2013 13:31:51 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LDVpkr008346;
 Mon, 21 Oct 2013 13:31:51 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201310211331.r9LDVpkr008346@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Mon, 21 Oct 2013 13:31:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331138 - in head/net/opal: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Oct 2013 13:31:52 -0000

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}