From nobody Sun May 07 12:30: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 4QDkKB70Dfz4B7Fs; Sun, 7 May 2023 12:30: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 4QDkKB6WQGz3DMw; Sun, 7 May 2023 12:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683462622; 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=mZGtbR1wHy2PRQ757F8hd/V03/wrI0oRqtR121szogg=; b=Ylf8MSaHzpVh/xt+ucXpQ4c6aoM/1duUa63fwrMHkvmTyvhj5l3GteqeqfeZBZK14HkRQq h6/1NcmuEzTlqYPr6g3D41+h+9VmdqaC4b3my3FxBQ1E/n35o0mlupOV9EmfZRnfuu6UUi nfqULuUPjhBfH320x+ssVdJtDh7AYstOC2DPrCk6szxqGUEjsvzeJ7Lth+U9tRnhIc63zS BB7r6qf4zzBZQao0TbRTdx1+dJd5onnBhISHyb7S+e3EgsfdkI9oY5GD/zGKCRSS1Zs/01 n/2U+K4q3phgxf5bcwlnhmmWTZEBuzfSHr6RvxunnqRnVEZ077ytr2L9W7IhTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683462622; 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=mZGtbR1wHy2PRQ757F8hd/V03/wrI0oRqtR121szogg=; b=SOGSwI/EU9oAy2ofDBMop2XJwMebCgZXjrnPr5/t/kvY/8Q30WXjLvumzNeHvBwDgGBxru VhQmd5irLj8IIUV+4bvAba5wDSs0XkuIMqcUv6IOr00QUMfycPN+83V1XoqUMAW/QruoJA 7owSkBEyMmqNSR/LZiYK9bPoQu04u2IRoXl3CHl/tMFiRlJgdFy6yBFXYbGUn43bQ8zdUd AgFwKKCq1I9ynrI6nnp/3ZyaMDu6ucg0KfDuo23UUu8PQXQzeZn5JO9h4Ts0jKRZVEi90v IwlHJwvPnyV2uIC52djPn8av0h4zy49LMCQc3acGrqbM6VKVRFpBBJKAQYRo0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683462622; a=rsa-sha256; cv=none; b=ly02M+VEhjWW1y7kL3CiEU+nD+7U74b3W03zamyZk/gM8eyN3srax1i5bVAKvH1MEsB8xV yHfDKKiX1QabmhzLMpP3c+AGcRZX9G0+lgKeEmy08HxGV9KqZROS/RRGMErskKYhRWoqJI llHjew5c/HygQ5UWDXgUUqidtBLTiwbCRskq6JB77m36pGnx+UmiBASC7etiPPMVrvmBhX w8ACrwGM9yAn3wv7kw/hU3ti5sE7y5adcPVsGAQxSnrtKaZtr93R6HmSo6LAH5QiF8bD4Z 2joVp6kOqM1Cri+oRmCytTId8qydGNJHfqPzcmbUP0hhoKdfcCuC59zYrnDa3Q== 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 4QDkKB5d7DzJJ8; Sun, 7 May 2023 12:30: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 347CUMkM070044; Sun, 7 May 2023 12:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347CUM0V070043; Sun, 7 May 2023 12:30:22 GMT (envelope-from git) Date: Sun, 7 May 2023 12:30:22 GMT Message-Id: <202305071230.347CUM0V070043@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: 8bd3d37b9006 - main - graphics/opencv: Fix build with FFMPEG option enabled 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: 8bd3d37b900647ff172b53c443a52892f9b9a516 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bd3d37b900647ff172b53c443a52892f9b9a516 commit 8bd3d37b900647ff172b53c443a52892f9b9a516 Author: Eric Camachat AuthorDate: 2023-05-07 12:28:50 +0000 Commit: Daniel Engberg CommitDate: 2023-05-07 12:28:54 +0000 graphics/opencv: Fix build with FFMPEG option enabled Backport upstream commit 496eed950f6d0e7fd92619d47e3cec8f06e96ace to fix build when FFMPEG option is enabled with FFmpeg 6 PR: 271120 Approved by: portmgr (blanket, build fix) --- graphics/opencv/Makefile | 3 +++ graphics/opencv/distinfo | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 812c2fbd87d6..ae135bcceed4 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -3,6 +3,9 @@ DISTVERSION= 4.6.0 PORTREVISION= 8 CATEGORIES= graphics +PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES= 496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch:-p1 + MAINTAINER= desktop@FreeBSD.org COMMENT= Open Source Computer Vision library WWW= https://www.opencv.org/ diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index ae31c14951eb..35a189ff7ab3 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1661966264 +TIMESTAMP = 1682799940 SHA256 (opencv-opencv-4.6.0_GH0.tar.gz) = 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 SIZE (opencv-opencv-4.6.0_GH0.tar.gz) = 90208971 SHA256 (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 7a16ad6ca511c620c2a4cbef2c7cf1ff5c31bd530ac7b43ee2ea8481683df20a @@ -15,3 +15,5 @@ SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar. SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261 SHA256 (opencv-opencv_3rdparty-a56b6ac6f030c312b2dce17430eef13aed9af274_GH0.tar.gz) = 6d3552455d927dd28cdd6a78470398208ff2167b19b0dd51ab30a241d900cb4c SIZE (opencv-opencv_3rdparty-a56b6ac6f030c312b2dce17430eef13aed9af274_GH0.tar.gz) = 135706483 +SHA256 (496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch) = 28edbd94c443b6aaa3054b4f9b35a4ad9a89dc45f40d408bcf3036950a072a32 +SIZE (496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch) = 671