From owner-svn-ports-all@freebsd.org Wed May 2 17:41:02 2018 Return-Path: Delivered-To: svn-ports-all@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 27A14FAFD01; Wed, 2 May 2018 17:41:02 +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 CC57E7391D; Wed, 2 May 2018 17:41:01 +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 AE98214274; Wed, 2 May 2018 17:41:01 +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 w42Hf16L078982; Wed, 2 May 2018 17:41:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42Hf17n078980; Wed, 2 May 2018 17:41:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805021741.w42Hf17n078980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 May 2018 17:41:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468858 - in head/net-p2p/retroshare: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/net-p2p/retroshare: . files X-SVN-Commit-Revision: 468858 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2018 17:41:02 -0000 Author: jbeich Date: Wed May 2 17:41:01 2018 New Revision: 468858 URL: https://svnweb.freebsd.org/changeset/ports/468858 Log: net-p2p/retroshare: unbreak with ffmpeg 4.0 gui/VideoProcessor.cpp:456:40: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED) ^ gui/VideoProcessor.cpp:457:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' encoding_context->flags |= CODEC_FLAG_TRUNCATED; ^ gui/VideoProcessor.cpp:458:32: error: use of undeclared identifier 'CODEC_FLAG_PSNR' encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio ^ gui/VideoProcessor.cpp:459:32: error: use of undeclared identifier 'CODEC_CAP_PARAM_CHANGE' encoding_context->flags |= CODEC_CAP_PARAM_CHANGE; ^ gui/VideoProcessor.cpp:552:39: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED) ^ gui/VideoProcessor.cpp:553:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames ^ gui/VideoProcessor.cpp:555:33: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS' decoding_context->flags2 |= CODEC_FLAG2_CHUNKS; ^ PR: 227726 Reported by: antoine (via exp-run) Added: head/net-p2p/retroshare/files/patch-ffmpeg4 (contents, props changed) Modified: head/net-p2p/retroshare/Makefile (contents, props changed) Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Wed May 2 17:20:56 2018 (r468857) +++ head/net-p2p/retroshare/Makefile Wed May 2 17:41:01 2018 (r468858) @@ -13,8 +13,6 @@ COMMENT= Private and secure decentralised communicatio LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BROKEN= fails to build with ffmpeg 4.0 - LIB_DEPENDS= libsqlcipher.so:databases/sqlcipher \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ Added: head/net-p2p/retroshare/files/patch-ffmpeg4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-ffmpeg4 Wed May 2 17:41:01 2018 (r468858) @@ -0,0 +1,53 @@ +gui/VideoProcessor.cpp:456:40: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' + if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED) + ^ +gui/VideoProcessor.cpp:457:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' + encoding_context->flags |= CODEC_FLAG_TRUNCATED; + ^ +gui/VideoProcessor.cpp:458:32: error: use of undeclared identifier 'CODEC_FLAG_PSNR' + encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio + ^ +gui/VideoProcessor.cpp:459:32: error: use of undeclared identifier 'CODEC_CAP_PARAM_CHANGE' + encoding_context->flags |= CODEC_CAP_PARAM_CHANGE; + ^ +gui/VideoProcessor.cpp:552:39: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' + if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED) + ^ +gui/VideoProcessor.cpp:553:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' + decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames + ^ +gui/VideoProcessor.cpp:555:33: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS' + decoding_context->flags2 |= CODEC_FLAG2_CHUNKS; + ^ + +--- plugins/VOIP/gui/VideoProcessor.cpp.orig 2017-08-03 19:29:52 UTC ++++ plugins/VOIP/gui/VideoProcessor.cpp +@@ -453,10 +453,10 @@ FFmpegVideo::FFmpegVideo() + encoding_context->rc_max_rate = 0; + encoding_context->rc_buffer_size = 0; + #endif +- if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED) +- encoding_context->flags |= CODEC_FLAG_TRUNCATED; +- encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio +- encoding_context->flags |= CODEC_CAP_PARAM_CHANGE; ++ if (encoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ encoding_context->flags |= AV_CODEC_FLAG_TRUNCATED; ++ encoding_context->flags |= AV_CODEC_FLAG_PSNR;//Peak signal-to-noise ratio ++ encoding_context->flags |= AV_CODEC_CAP_PARAM_CHANGE; + encoding_context->i_quant_factor = 0.769f; + encoding_context->b_quant_factor = 1.4f; + encoding_context->time_base.num = 1; +@@ -549,10 +549,10 @@ FFmpegVideo::FFmpegVideo() + decoding_context->pix_fmt = AV_PIX_FMT_YUV420P; + #endif + +- if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED) +- decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames ++ if(decoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ decoding_context->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames + //we can receive truncated frames +- decoding_context->flags2 |= CODEC_FLAG2_CHUNKS; ++ decoding_context->flags2 |= AV_CODEC_FLAG2_CHUNKS; + + AVDictionary* dictionary = NULL; + if(avcodec_open2(decoding_context, decoding_codec, &dictionary) < 0)