svn commit: r468847 - head/multimedia/tvheadend

[Jan Beich]

Author: jbeich
Date: Wed May  2 15:47:51 2018
New Revision: 468847
URL: https://svnweb.freebsd.org/changeset/ports/468847

Log:
  multimedia/tvheadend: unbreak with ffmpeg 4.0
  
  src/muxer/muxer_libav.c:177:17: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
      c->flags |= CODEC_FLAG_GLOBAL_HEADER;
                  ^
  src/plumbing/transcoding.c:22:10: fatal error: 'libavfilter/avfiltergraph.h' file not found
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  src/plumbing/transcoding.c:576:29: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
      octx->flags          |= CODEC_FLAG_GLOBAL_HEADER;
                              ^
  src/plumbing/transcoding.c:621:22: error: use of undeclared identifier 'CODEC_FLAG_BITEXACT'
        octx->flags |= CODEC_FLAG_BITEXACT;
                       ^
  src/plumbing/transcoding.c:632:24: error: use of undeclared identifier 'CODEC_FLAG_QSCALE'
          octx->flags |= CODEC_FLAG_QSCALE;
                         ^
  src/plumbing/transcoding.c:635:24: error: use of undeclared identifier 'CODEC_FLAG_QSCALE'
          octx->flags |= CODEC_FLAG_QSCALE;
                         ^
  src/plumbing/transcoding.c:1291:30: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
        octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
                               ^
  src/plumbing/transcoding.c:1296:33: error: use of undeclared identifier 'CODEC_FLAG_QSCALE'
          octx->flags          |= CODEC_FLAG_QSCALE;
                                  ^
  src/plumbing/transcoding.c:1342:30: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
        octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
                               ^
  src/plumbing/transcoding.c:1373:30: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
        octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
                               ^
  src/plumbing/transcoding.c:2179:29: error: use of undeclared identifier 'CODEC_CAP_EXPERIMENTAL'
      if (((p->capabilities & CODEC_CAP_EXPERIMENTAL) && !experimental) ||
                              ^
  src/plumbing/transcoding.c:2194:33: error: use of undeclared identifier 'CODEC_CAP_EXPERIMENTAL'
               (p->capabilities & CODEC_CAP_EXPERIMENTAL) ?
                                  ^
  
  PR:		227726
  Reported by:	antoine (via exp-run)
  Obtained from:	upstream

Modified:
  head/multimedia/tvheadend/Makefile   (contents, props changed)
  head/multimedia/tvheadend/distinfo   (contents, props changed)

Modified: head/multimedia/tvheadend/Makefile
==============================================================================
--- head/multimedia/tvheadend/Makefile	Wed May  2 15:37:09 2018	(r468846)
+++ head/multimedia/tvheadend/Makefile	Wed May  2 15:47:51 2018	(r468847)
@@ -7,6 +7,9 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	multimedia
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	3cb4f580565b.patch:-p1
+
 MAINTAINER=	decke at FreeBSD.org
 COMMENT=	TV streaming server supporting DVB, IPTV, SAT>IP and more
 
@@ -71,7 +74,6 @@ INOTIFY_CONFIGURE_ENABLE=	inotify
 INOTIFY_LDFLAGS=	-linotify
 
 TRANSCODING_DESC=	Transcoding for mobile and web clients
-TRANSCODING_BROKEN=		fails to build with ffmpeg 4.0
 TRANSCODING_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 TRANSCODING_CONFIGURE_ENABLE=	libav
 

Modified: head/multimedia/tvheadend/distinfo
==============================================================================
--- head/multimedia/tvheadend/distinfo	Wed May  2 15:37:09 2018	(r468846)
+++ head/multimedia/tvheadend/distinfo	Wed May  2 15:47:51 2018	(r468847)
@@ -1,3 +1,5 @@
 TIMESTAMP = 1522131748
 SHA256 (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9
 SIZE (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 21528720
+SHA256 (3cb4f580565b.patch) = b27328ece106d5c66bba3f3a39ce69b66a3182ea686acd57d393d1ae7255b0bb
+SIZE (3cb4f580565b.patch) = 5541