git: 5e9152521990 - main - multimedia/makemkv: Add CONFLICTS_BUILD=v4l_compat

[Matthias Andree]

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5e9152521990928a497c4c619c08f01c8a760813

commit 5e9152521990928a497c4c619c08f01c8a760813
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-08-30 16:45:44 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-08-30 16:48:59 +0000

    multimedia/makemkv: Add CONFLICTS_BUILD=v4l_compat
    
    Approved by:    Felix Palmen (maintainer, via IRC)
    Related to...
    PR:             257946
---
 multimedia/makemkv/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile
index 4a2055a72f92..9df41c52f8d8 100644
--- a/multimedia/makemkv/Makefile
+++ b/multimedia/makemkv/Makefile
@@ -47,6 +47,8 @@ BUILD_DEPENDS=	nasm>0:devel/nasm \
 
 WRKSRC=		${WRKDIR}/makemkv-oss-${PORTVERSION}
 
+CONFLICTS_BUILD=	v4l_compat
+
 SUB_FILES=	update-makemkv-drives
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 PLIST_SUB=	LINUXBASE=${LINUXBASE}