svn commit: r391293 - in head/sysutils/k3b-kde4: . files

[Thomas Zander]

Author: riggs
Date: Sat Jul  4 05:41:48 2015
New Revision: 391293
URL: https://svnweb.freebsd.org/changeset/ports/391293

Log:
  Fix build with ffmpeg 2.7
  
  Approved by:	portmgr (antoine)

Added:
  head/sysutils/k3b-kde4/files/patch-ffmpeg27   (contents, props changed)
Modified:
  head/sysutils/k3b-kde4/Makefile

Modified: head/sysutils/k3b-kde4/Makefile
==============================================================================
--- head/sysutils/k3b-kde4/Makefile	Sat Jul  4 04:10:52 2015	(r391292)
+++ head/sysutils/k3b-kde4/Makefile	Sat Jul  4 05:41:48 2015	(r391293)
@@ -3,7 +3,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.2
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
@@ -94,10 +94,4 @@ TAGLIB_CMAKE_OFF=	-DK3B_ENABLE_TAGLIB:BO
 TRANSCODE_DESC=		Misc: Transcode (DVD ripping)
 TRANSCODE_RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFFMPEG}
-BROKEN=		Does not build with ffmpeg-2.7
-.endif
-
 .include <bsd.port.mk>

Added: head/sysutils/k3b-kde4/files/patch-ffmpeg27
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/k3b-kde4/files/patch-ffmpeg27	Sat Jul  4 05:41:48 2015	(r391293)
@@ -0,0 +1,11 @@
+--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig	2011-01-15 21:47:29.000000000 +0100
++++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2015-07-04 07:21:54.284708677 +0200
+@@ -159,7 +159,7 @@ void K3bFFMpegFile::close()
+     }
+ 
+     if( d->formatContext ) {
+-        ::av_close_input_file( d->formatContext );
++        ::avformat_close_input( &d->formatContext );
+         d->formatContext = 0;
+     }
+ }