Date: Fri, 4 May 2018 11:39:58 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469015 - in head/multimedia/bino: . files Message-ID: <201805041139.w44BdwYP053539@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri May 4 11:39:58 2018 New Revision: 469015 URL: https://svnweb.freebsd.org/changeset/ports/469015 Log: multimedia/bino: unbreak with ffmpeg 4.0 media_object.cpp:908:60: error: use of undeclared identifier 'CODEC_CAP_DR1' if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1))) ^ media_object.cpp:909:37: error: use of undeclared identifier 'CODEC_FLAG_EMU_EDGE' codec_ctx->flags |= CODEC_FLAG_EMU_EDGE; ^ PR: 227726 Reported by: antoine (via exp-run) Added: head/multimedia/bino/files/patch-src_media__object.cpp (contents, props changed) Modified: head/multimedia/bino/Makefile (contents, props changed) Modified: head/multimedia/bino/Makefile ============================================================================== --- head/multimedia/bino/Makefile Fri May 4 10:43:21 2018 (r469014) +++ head/multimedia/bino/Makefile Fri May 4 11:39:58 2018 (r469015) @@ -13,8 +13,6 @@ COMMENT= 3D video player with multi-display support LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with ffmpeg 4.0 - LIB_DEPENDS= libass.so:multimedia/libass \ libavformat.so:multimedia/ffmpeg \ libopenal.so:audio/openal-soft Added: head/multimedia/bino/files/patch-src_media__object.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/bino/files/patch-src_media__object.cpp Fri May 4 11:39:58 2018 (r469015) @@ -0,0 +1,20 @@ +media_object.cpp:908:60: error: use of undeclared identifier 'CODEC_CAP_DR1' + if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1))) + ^ +media_object.cpp:909:37: error: use of undeclared identifier 'CODEC_FLAG_EMU_EDGE' + codec_ctx->flags |= CODEC_FLAG_EMU_EDGE; + ^ + +--- src/media_object.cpp.orig 2016-11-30 19:18:54 UTC ++++ src/media_object.cpp +@@ -905,8 +905,10 @@ void media_object::open(const std::string &url, const + #ifdef FF_API_LOWRES + lowres = codec_ctx->lowres; + #endif ++#ifdef FF_API_EMU_EDGE + if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1))) + codec_ctx->flags |= CODEC_FLAG_EMU_EDGE; ++#endif + } + // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data. + if (codec_ctx->codec_id != AV_CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805041139.w44BdwYP053539>