svn commit: r469016 - in head/multimedia/ccextractor: . files

[Jan Beich]

Author: jbeich
Date: Fri May  4 11:40:14 2018
New Revision: 469016
URL: https://svnweb.freebsd.org/changeset/ports/469016

Log:
  multimedia/ccextractor: unbreak with ffmpeg 4.0
  
  src/lib_ccx/ffmpeg_intgr.c:5:10: fatal error: 'libavfilter/avfiltergraph.h' file not found
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  PR:		227726
  Reported by:	antoine (via exp-run)

Modified:
  head/multimedia/ccextractor/Makefile   (contents, props changed)
  head/multimedia/ccextractor/files/patch-src_lib__ccx_ffmpeg__intgr.c   (contents, props changed)

Modified: head/multimedia/ccextractor/Makefile
==============================================================================
--- head/multimedia/ccextractor/Makefile	Fri May  4 11:39:58 2018	(r469015)
+++ head/multimedia/ccextractor/Makefile	Fri May  4 11:40:14 2018	(r469016)
@@ -43,7 +43,6 @@ CMAKE_ARGS+=	-DWITH_SHARING:BOOL=OFF # enable when net
 OPTIONS_DEFINE=		FFMPEG
 OPTIONS_DEFAULT=	FFMPEG
 
-FFMPEG_BROKEN=		fails to build with ffmpeg 4.0
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 

Modified: head/multimedia/ccextractor/files/patch-src_lib__ccx_ffmpeg__intgr.c
==============================================================================
--- head/multimedia/ccextractor/files/patch-src_lib__ccx_ffmpeg__intgr.c	Fri May  4 11:39:58 2018	(r469015)
+++ head/multimedia/ccextractor/files/patch-src_lib__ccx_ffmpeg__intgr.c	Fri May  4 11:40:14 2018	(r469016)
@@ -1,9 +1,10 @@
 --- src/lib_ccx/ffmpeg_intgr.c.orig	2017-01-23 20:33:53 UTC
 +++ src/lib_ccx/ffmpeg_intgr.c
-@@ -3,7 +3,7 @@
+@@ -2,8 +2,7 @@
+ 
  #ifdef ENABLE_FFMPEG
  #include <libavformat/avformat.h>
- #include <libavfilter/avfiltergraph.h>
+-#include <libavfilter/avfiltergraph.h>
 -#include <libavfilter/avcodec.h>
 +#include <libavcodec/avcodec.h>
  #include <libavfilter/buffersink.h>