From nobody Wed Mar 15 12:47:22 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pc9CG6S4Bz3yTsk; Wed, 15 Mar 2023 12:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pc9CG6176z4JXV; Wed, 15 Mar 2023 12:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678884442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q5XYpqaPNDF2tG6RebzegIOOZGgKEpVN7nrqkYlW5RA=; b=ypr2wRuDu1iKdLofWdVqV6spI0Qx00Gh11QOLb7NzsS4u+UVUvHDhlxbVpOjVZPhHGsCJo XNQHs08n3LLOtAkyBwmbzBKokEdKqvIz+PR+/Q6sPcJYkv894Ugu2F17ELXJnJMeZllAlP Ij0B5ZSh7ztbpdfQ73WLrdz2TJCGvRMkjjznU+V49zwKiVOP0o+o2YZBPge95h0GAV2TS+ hevZ3lZrT+afsCVWZpRnmyqqgWSEqMCFiEgLpYXDkqmMh88fv1i/rC0bPNSCGbrM9U9kU7 VSc8UoKAtRGc9aIJ+NWVh6ey0mWbOAGsU4EUlrOgncjchTPt7Rqn7KXYzNEuFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678884442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q5XYpqaPNDF2tG6RebzegIOOZGgKEpVN7nrqkYlW5RA=; b=yeas3XFl10EiemY+p/5kRF4ht74v87T5ZwUFUBzFZRcvFWLA9GPIerWGpuHXP/jd6+jvn7 XNn/7ZLkajOzMXKGv3vPC1uxxuU17izLdpeAGYlmgbz4Njs8owgX9c1E4lhC7nFNuPJAfw S8LZGPhjT3ADwANYPqpUgmd/PiTnsXK1h8SymbivrqCYn48aaUw3POHo5Yp6YYyHJQ6e7s c4EFl+0RMMTMfY7PR4AphdCQwq9n/epCcYtGSLkaCrV95UfMTfq5WbEKrfXBXrDUktjq47 xMVPgMpDcHtCAwf+9anWdruu8xyYCavySwQSKyUghG9JJl5j7dPB6Q7qHHk/aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678884442; a=rsa-sha256; cv=none; b=bpipjMdvWgRD1VqseSwGwpN2ApY+95GhXZDIVo1XoMPm2zv8KOLlWK7Bh6cW6eAi3/Y/SI C5DLb/dvgNnM6hX7nwNnus+949NPo5lpl3AeRsHUsusg6CMJfEFkDwRg7/qCyXtJFBmjgF WXI7gh5upTU1h6cdSohx9jCrvVBU0mbWu69i8G7PjCTZZ9iMZKbvMUVb8SXN49FSjmVE/U EWu+OCzwLz+OeU+DYYbGwjUVzq31IZl9mahO7dZQuKFETso3VSc7cNSjpGIHst8Zcxp/S4 X9/MpNegErcJu05QACk5RCLpjeHWJUh1bUssDaG4bc94WFOYtmC66/C/YdaNCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pc9CG4zBwz1H0x; Wed, 15 Mar 2023 12:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32FClMpq064007; Wed, 15 Mar 2023 12:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32FClMWl064006; Wed, 15 Mar 2023 12:47:22 GMT (envelope-from git) Date: Wed, 15 Mar 2023 12:47:22 GMT Message-Id: <202303151247.32FClMWl064006@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 546e957ac842 - main - multimedia/ffms2: unbreak with ffmpeg 5.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 546e957ac8428c8adc2e46faf371d41a247b170c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=546e957ac8428c8adc2e46faf371d41a247b170c commit 546e957ac8428c8adc2e46faf371d41a247b170c Author: Jan Beich AuthorDate: 2023-03-15 12:45:39 +0000 Commit: Jan Beich CommitDate: 2023-03-15 12:46:49 +0000 multimedia/ffms2: unbreak with ffmpeg 5.0 src/core/videosource.cpp:174:18: error: cannot initialize a variable of type 'AVCodec *' with an rvalue of type 'const AVCodec *' AVCodec *Codec = avcodec_find_decoder(FormatContext->streams[VideoTrack]->codecpar->codec_id); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/core/audiosource.cpp:466:14: error: cannot initialize a variable of type 'AVCodec *' with an rvalue of type 'const AVCodec *' AVCodec *Codec = avcodec_find_decoder(FormatContext->streams[TrackNumber]->codecpar->codec_id); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/core/indexing.cpp:387:14: error: cannot initialize a variable of type 'AVCodec *' with an rvalue of type 'const AVCodec *' AVCodec *codec = avcodec_find_decoder(FormatContext->streams[Track]->codecpar->codec_id); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/core/indexing.cpp:405:22: error: cannot initialize a variable of type 'AVCodec *' with an rvalue of type 'const AVCodec *' AVCodec *VideoCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/core/indexing.cpp:436:22: error: cannot initialize a variable of type 'AVCodec *' with an rvalue of type 'const AVCodec *' AVCodec *AudioCodec = avcodec_find_decoder(FormatContext->streams[i]->codecpar->codec_id); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 270226 Obtained from: upstream --- multimedia/ffms2/Makefile | 6 ++++++ multimedia/ffms2/distinfo | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/multimedia/ffms2/Makefile b/multimedia/ffms2/Makefile index 8ba20899d3fe..443d60c48941 100644 --- a/multimedia/ffms2/Makefile +++ b/multimedia/ffms2/Makefile @@ -1,7 +1,13 @@ PORTNAME= ffms2 DISTVERSION= 2.40 +PORTREVISION= 1 CATEGORIES= multimedia +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 96cbf38ea938.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 +PATCHFILES+= 586d87de3f89.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 +PATCHFILES+= 45673149e9a2.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 + MAINTAINER= jbeich@FreeBSD.org COMMENT= FFmpeg-based source library and VapourSynth plugin WWW= https://github.com/FFMS/ffms2 diff --git a/multimedia/ffms2/distinfo b/multimedia/ffms2/distinfo index 190cbb020cbf..a8d034f5d271 100644 --- a/multimedia/ffms2/distinfo +++ b/multimedia/ffms2/distinfo @@ -1,3 +1,9 @@ TIMESTAMP = 1598095686 SHA256 (FFMS-ffms2-2.40_GH0.tar.gz) = 82e95662946f3d6e1b529eadbd72bed196adfbc41368b2d50493efce6e716320 SIZE (FFMS-ffms2-2.40_GH0.tar.gz) = 140356 +SHA256 (96cbf38ea938.patch) = dd063e21c6e7887614ab5fb1009cf9b353066829771d4426dfe779d74dfac758 +SIZE (96cbf38ea938.patch) = 13422 +SHA256 (586d87de3f89.patch) = d5ec6ee44bf8f0a2bd943c1c61bace33b7b80559137b71fe5c4af5e7dd9ac7f8 +SIZE (586d87de3f89.patch) = 931 +SHA256 (45673149e9a2.patch) = ecef89ce1bb4158181c96eecdbc2c37e49a880a88e72a271b54ce98832dcf049 +SIZE (45673149e9a2.patch) = 3693