From owner-svn-ports-head@freebsd.org Tue Apr 24 13:56:29 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 CA886FA557D; Tue, 24 Apr 2018 13:56:29 +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 78D64699C1; Tue, 24 Apr 2018 13:56:29 +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 73C9813FD4; Tue, 24 Apr 2018 13:56:29 +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 w3ODuTUr031205; Tue, 24 Apr 2018 13:56:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3ODuTSV031204; Tue, 24 Apr 2018 13:56:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804241356.w3ODuTSV031204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 24 Apr 2018 13:56:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468203 - head/graphics/gegl/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/gegl/files X-SVN-Commit-Revision: 468203 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: Tue, 24 Apr 2018 13:56:30 -0000 Author: jbeich Date: Tue Apr 24 13:56:29 2018 New Revision: 468203 URL: https://svnweb.freebsd.org/changeset/ports/468203 Log: graphics/gegl: unbreak with ffmpeg 4.0 ./ff-load.c:312:36: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' if (p->codec->capabilities & CODEC_CAP_TRUNCATED) ^ ./ff-load.c:313:26: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' p->enc->flags |= CODEC_FLAG_TRUNCATED; PR: 227726 Modified: head/graphics/gegl/files/patch-operations_external_ff-load.c (contents, props changed) Modified: head/graphics/gegl/files/patch-operations_external_ff-load.c ============================================================================== --- head/graphics/gegl/files/patch-operations_external_ff-load.c Tue Apr 24 13:56:13 2018 (r468202) +++ head/graphics/gegl/files/patch-operations_external_ff-load.c Tue Apr 24 13:56:29 2018 (r468203) @@ -1,5 +1,6 @@ https://git.gnome.org/browse/gegl/commit/?id=97067622352e https://git.gnome.org/browse/gegl/commit/?id=6d50c42e2c9a +https://git.gnome.org/browse/gegl/commit/?id=67f14cbbc5d1 --- operations/external/ff-load.c.orig 2012-04-01 11:17:57 UTC +++ operations/external/ff-load.c @@ -39,9 +40,14 @@ https://git.gnome.org/browse/gegl/commit/?id=6d50c42e2 if (err < 0) { g_warning ("ff-load: error finding stream info for %s", o->path); -@@ -312,7 +312,7 @@ prepare (GeglOperation *operation) - if (p->codec->capabilities & CODEC_CAP_TRUNCATED) - p->enc->flags |= CODEC_FLAG_TRUNCATED; +@@ -309,10 +309,10 @@ prepare (GeglOperation *operation) + g_warning ("codec not found"); + } + +- if (p->codec->capabilities & CODEC_CAP_TRUNCATED) +- p->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ p->enc->flags |= AV_CODEC_FLAG_TRUNCATED; - if (avcodec_open (p->enc, p->codec) < 0) + if (avcodec_open2 (p->enc, p->codec, NULL) < 0)