From nobody Thu Apr 27 12:04:28 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 4Q6ZCw6zQdz474Ng; Thu, 27 Apr 2023 12:04:28 +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 4Q6ZCw5lMLz3mqn; Thu, 27 Apr 2023 12:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597068; 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=L6GERMy2mbVGE2eqFCtx3HK1uI0zRkGTsn0yNViwJ/A=; b=L89WppMjWCzS8XeSO/O+yxYEpRmtOaxnauwYABqBDmxuW6zPy1jmAujTeJiD0vWAwT6hec fwMYOpOljGjOTX3Xc4C8f0U3w9/jqrBC0IQ6q5TmyA7U53KRGf0uiDB9OZFFUZBVSaPSKv spUKEjthepkjIUFEUJoF/OqhUfn0x504T4Y6/qvrTFJCb5c+UF0fk0JeXYDHKgHn9JPoI0 XdutBIlVKU353274v/9bSOT1iNJqtfv4aShaa8mcFLrPV8yi+WL9EDp6aaLTSnq2VIxj7c TvP7EKTE4sDuOgQ/nKVuaRBbG6hw3Pp6+vfxzymBTqGv3niunJFYE2reyNbzDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597068; 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=L6GERMy2mbVGE2eqFCtx3HK1uI0zRkGTsn0yNViwJ/A=; b=a5A1QWnDi/LMohazZ8NGKr4eUJ6eI/mxn36n/G6LVwoBaEWG0OSi2dwhP1srRCo9QiLIRV x5uVP2Xmlu02CsY5RRh1/ePGrvyzEB+N+FsGRk2T4lE9lz3tgLFpyc7b15VOXzfRpa3uly 41hdAwl1TxEdbkZkar5xVGeC6/MnEdh3gz+ibQ7Jxupo8zkJznWAgaBkaxqQXdJF6+qqQl 4tCbP0V92BGUmT0jJQ/sLAJ2gx7lE1+8DCl+01/PxiYdCPUf4ZRFHfdT8zs0XUQpAAA/Hs PUf2E+LsDw0/YYFIYWh66KKCU+og65XGR6MnrW/vo614lBzZcyj1n6zYvMLx8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597068; a=rsa-sha256; cv=none; b=DSCbYQ4AXySoCk59d8ugdhHTkre3IOUTxTYGgAe8H5qKjVLKndt4hEN7BTwqW9vnYQ0+8w QWL96+qsn/pzcKElEFUIPHqKZInGs59mzLVWFvfguvj1DLZ31vHcljiON2ElTNIjULc0As wckoNQb7I7ZRlKEvfby0MTAzAFDEhr2Z5gMh95HjTHP222PUUMvqyGmZ+HBbTbBxGXs08m 3rk/h9kVxX0+L/meyP9y9WwK9QdE9slgsfvPXXHrNN0Pv5C8p/Th733RckOM6Hw8jD8CUD wLZicRu9jU1XVdxX0UDtmu17QnbV+J/rdlYSStGkCkW3b6UOwc3+u5qxwpSiSA== 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 4Q6ZCw33xHzGVL; Thu, 27 Apr 2023 12:04:28 +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 33RC4Stg046697; Thu, 27 Apr 2023 12:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4Scv046696; Thu, 27 Apr 2023 12:04:28 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:28 GMT Message-Id: <202304271204.33RC4Scv046696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: c662dfdaf44d - main - multimedia/nymphcast: Fix build with FFmpeg 6 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c662dfdaf44d0aca62cb82d7b90783c92bc3329f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c662dfdaf44d0aca62cb82d7b90783c92bc3329f commit c662dfdaf44d0aca62cb82d7b90783c92bc3329f Author: Daniel Engberg AuthorDate: 2023-04-27 11:13:48 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:46 +0000 multimedia/nymphcast: Fix build with FFmpeg 6 Partially import patch from Alpine Linux to fix build Source: https://git.alpinelinux.org/aports/tree/community/nymphcast/ffmpeg6.patch PR: 270973 Approved by: portmgr (blanket, build fix) --- multimedia/nymphcast/files/patch-ffmpeg6-compat | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/multimedia/nymphcast/files/patch-ffmpeg6-compat b/multimedia/nymphcast/files/patch-ffmpeg6-compat new file mode 100644 index 000000000000..12374ec9d966 --- /dev/null +++ b/multimedia/nymphcast/files/patch-ffmpeg6-compat @@ -0,0 +1,27 @@ +Obtained from https://git.alpinelinux.org/aports/tree/community/nymphcast/ffmpeg6.patch +diff --git a/src/server/ffplay/cmdutils.c.bak b/src/server/ffplay/cmdutils.c.bak +index 0e8561a..ab0b166 100644 +--- ffplay/cmdutils.c.bak ++++ ffplay/cmdutils.c.bak +@@ -719,7 +719,7 @@ static void init_parse_context(OptionParseContext *octx, + memset(octx, 0, sizeof(*octx)); + + octx->nb_groups = nb_groups; +- octx->groups = av_mallocz_array(octx->nb_groups, sizeof(*octx->groups)); ++ octx->groups = av_calloc(octx->nb_groups, sizeof(*octx->groups)); + if (!octx->groups) + exit_program(1); + +diff --git a/src/server/ffplay/stream_handler.cpp b/src/server/ffplay/stream_handler.cpp +index f6db69a..27d9fcd 100644 +--- ffplay/stream_handler.cpp ++++ ffplay/stream_handler.cpp +@@ -137,7 +137,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *cod + int i; + AVDictionary **opts; + if (!s->nb_streams) { return NULL; } +- opts = (AVDictionary**) av_mallocz_array(s->nb_streams, sizeof(*opts)); ++ opts = (AVDictionary**) av_calloc(s->nb_streams, sizeof(*opts)); + if (!opts) { + av_log(NULL, AV_LOG_ERROR, "Could not alloc memory for stream options.\n"); + return NULL;