From nobody Wed Mar 08 00:11:56 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 4PWXmr649vz3wqtw; Wed, 8 Mar 2023 00:11:56 +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 4PWXmr5Z7Sz4Jkt; Wed, 8 Mar 2023 00:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678234316; 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=fluKjOYV8wFPeBAXFC2lMnLX2BktNzYy4iToQdPxamg=; b=NpSePFGTKvdI+RXsQXhoxb+C0Kd88HSUj6nM6YfX0U0kR0SY9dnrKRXpKPqrMWjAuNBPZt hcGjcmylnzwVehtCDy6UlDy6bQkWPt7QhpodsH1jfb/f/t/hz9ZHn1FoT2WevOKCtTSOsd pMFSfkufgggN9LFfp6er5WP7IYjdApDaUR3d/vXN+GvwbemVO7Zrow/6l5XmgQMg5SzH9u fkZCNKAmH8VIpF8tct5MV6m5jKbmXlVLoDHjENEPoNIb8I7aG29r5gdrhVSD+9xIHmV4vm 6xnir5c9roR+SKhiExdStaM1QsNUUXSv8WIl4U8SPuszi9TvvziZgOleKtTsBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678234316; 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=fluKjOYV8wFPeBAXFC2lMnLX2BktNzYy4iToQdPxamg=; b=qAbb8Gd1F71eRe6CxbMQrz0OKxWjVM+ZviLnOTkD6hSNj8kmiZGELN73RUZB+A2nV1GlNN lAtwkRS9+R9T/uoUBwxFetGjyH/MAvPIlMxqb/DtqTMler7CUeBTeW4DTPLHaAwhAyDP6R 22vFo2WQ1VTMEWpVfVEseUb09D+4hm4J8UxYJWhZ+lgNSvmXncJjW/54fkBLt7QzN4RkFN gBSQhRl4/Bz88oSdlS8tudUvSGmH/geVkSIte5R4kXb226MjLGYbOZUo6fnDnEBgHxsIqV /9rSF7c1J8P96S3iyie5j4He5Mgex2LPMHI/HlNkh1R72md0m7vSl1y4SysV/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678234316; a=rsa-sha256; cv=none; b=ylZweSPd6zyHp5ebozb1Cy5Njic21Ko/5bqHR+ua1aOfo4HJtIIvwr7M07g7uPA9l81mIg qA5OnHOAAkKcW9O21J/0zF0g7bHjwwf3yBbyscw15K5GiLYZ59BhLMDYSUByQiCAPbt51m EBAnWnz9s7cWy7j0ViImSIsuEswIC8PFydHPRZbqyoGWjrkI5dq7VVsRWreMRlfHwZx7i4 n4iY7/kc+ApDTHzV7mr0yR80ejvntD34r0rn2ORQI+2UtOB6iAeAHQmAKFemmnbaUrpunX rvRyiitRQmMpvRg2wuqVdN1/Zx/40GPemdncCqJKVprkTiCclNgPrxmGQUtVOg== 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 4PWXmr4cVSz14ZR; Wed, 8 Mar 2023 00:11:56 +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 3280BuOP046082; Wed, 8 Mar 2023 00:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3280Busx046081; Wed, 8 Mar 2023 00:11:56 GMT (envelope-from git) Date: Wed, 8 Mar 2023 00:11:56 GMT Message-Id: <202303080011.3280Busx046081@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: 4a0ff775305d - main - multimedia/ffmpeg: speed up DRM (kmsgrab), OPENCL, VAAPI, VULKAN 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: 4a0ff775305d09bc059b1dc0b95c333b29bf1197 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a0ff775305d09bc059b1dc0b95c333b29bf1197 commit 4a0ff775305d09bc059b1dc0b95c333b29bf1197 Author: Jan Beich AuthorDate: 2023-03-07 23:44:50 +0000 Commit: Jan Beich CommitDate: 2023-03-08 00:10:41 +0000 multimedia/ffmpeg: speed up DRM (kmsgrab), OPENCL, VAAPI, VULKAN https://github.com/ffmpeg/ffmpeg/commit/993d8d94296e --- multimedia/ffmpeg/Makefile | 2 +- .../ffmpeg/files/patch-libavutil_hwcontext__drm.c | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index ddb89d4904b3..00a9897694df 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ PORTNAME= ffmpeg PORTVERSION= 4.4.3 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/files/patch-libavutil_hwcontext__drm.c b/multimedia/ffmpeg/files/patch-libavutil_hwcontext__drm.c new file mode 100644 index 000000000000..f5e186300975 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavutil_hwcontext__drm.c @@ -0,0 +1,24 @@ +drm-kmod doesn't expose uAPI yet, so bundle like Mesa + +--- libavutil/hwcontext_drm.c.orig 2022-07-22 17:58:39 UTC ++++ libavutil/hwcontext_drm.c +@@ -28,6 +28,19 @@ + #if HAVE_LINUX_DMA_BUF_H + #include + #include ++#else // BSDs ++#undef HAVE_LINUX_DMA_BUF_H ++#define HAVE_LINUX_DMA_BUF_H 1 ++#include ++struct dma_buf_sync { ++ uint64_t flags; ++}; ++#define DMA_BUF_BASE 'b' ++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) ++#define DMA_BUF_SYNC_READ (1 << 0) ++#define DMA_BUF_SYNC_WRITE (2 << 0) ++#define DMA_BUF_SYNC_START (0 << 2) ++#define DMA_BUF_SYNC_END (1 << 2) + #endif + + #include