From owner-svn-ports-head@freebsd.org Thu May 3 18:38:07 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEB62FB52BD; Thu, 3 May 2018 18:38:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9F3F885903; Thu, 3 May 2018 18:38:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A45E2398C; Thu, 3 May 2018 18:38:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w43Ic6CR036899; Thu, 3 May 2018 18:38:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w43Ic6mU036897; Thu, 3 May 2018 18:38:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805031838.w43Ic6mU036897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 3 May 2018 18:38:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468955 - in head/multimedia/dvdstyler: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia/dvdstyler: . files X-SVN-Commit-Revision: 468955 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 May 2018 18:38:07 -0000 Author: jbeich Date: Thu May 3 18:38:06 2018 New Revision: 468955 URL: https://svnweb.freebsd.org/changeset/ports/468955 Log: multimedia/dvdstyler: unbreak with ffmpeg 4.0 mediaenc_ffmpeg.cpp:215:18: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ PR: 227726 Reported by: antoine (via exp-run) Added: head/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp (contents, props changed) Modified: head/multimedia/dvdstyler/Makefile (contents, props changed) Modified: head/multimedia/dvdstyler/Makefile ============================================================================== --- head/multimedia/dvdstyler/Makefile Thu May 3 18:29:29 2018 (r468954) +++ head/multimedia/dvdstyler/Makefile Thu May 3 18:38:06 2018 (r468955) @@ -15,8 +15,6 @@ COMMENT= WxWidgets frontend to dvd recoding and author LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with ffmpeg 4.0 - BUILD_DEPENDS= zip:archivers/zip \ wxsvg>=1.2:graphics/wxsvg \ dvdauthor:multimedia/dvdauthor \ Added: head/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp Thu May 3 18:38:06 2018 (r468955) @@ -0,0 +1,25 @@ +mediaenc_ffmpeg.cpp:215:18: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + c->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ + +--- src/mediaenc_ffmpeg.cpp.orig 2015-10-04 13:18:58 UTC ++++ src/mediaenc_ffmpeg.cpp +@@ -48,6 +48,9 @@ extern "C" { + #define av_frame_free avcodec_free_frame + #endif + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 34, 1) ++#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER ++#endif + + wxFfmpegMediaEncoder::wxFfmpegMediaEncoder(int threadCount) { + m_threadCount = threadCount; +@@ -212,7 +215,7 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId) + c->time_base = (AVRational){ 1, c->sample_rate }; + // some formats want stream headers to be separate + if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return true; + }