From 22c488495ff95c8b4bf60bdb163b403331b78cb1 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 28 Oct 2018 00:52:17 +0000 Subject: [PATCH] misc/raspberrypi-userland: adjust GL conflict after r440699 pkg-static: mesa-libs-18.2.3_1 conflicts with raspberrypi-userland-20161026 (installs files into the same place). Problematic file: /usr/local/include/EGL/egl.h --- misc/raspberrypi-userland/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile index 94327464bff3..ca2c67c3ab0e 100644 --- a/misc/raspberrypi-userland/Makefile +++ b/misc/raspberrypi-userland/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= armv6 armv7 -CONFLICTS_INSTALL= libglesv2 libEGL +CONFLICTS_INSTALL= mesa-libs USES= cmake:outsource pkgconfig shebangfix