From aa353fab03d11646b3cfda4ef2b4ad7585646cfd Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 19 Jan 2020 13:14:14 +0100 Subject: [PATCH] temp/mesa-git: list relevant subpackages as depends for -dri- package (!896) At the moment, every device that wants to make use of mesa-git needs to depend on all relevant mesa-git subpackages. We can simplify this by adding these directly as depends for the -dri- package that most devices will be depending on. That way, the fact that you need to depend on all relevant subpackages is mostly hidden away as "implementation detail" in the mesa-git package, and no special care is required when using mesa-git. --- temp/mesa-git/APKBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/temp/mesa-git/APKBUILD b/temp/mesa-git/APKBUILD index 1c484c621..aa3cbf0c4 100644 --- a/temp/mesa-git/APKBUILD +++ b/temp/mesa-git/APKBUILD @@ -3,10 +3,6 @@ # # Any new drivers should be upstreamed to Alpine Linux once they appear in a # new Mesa stable release -# -# Any device that wants to use this should explicitely depend on the entirety -# of this aport, so mesa-git including _all_ of the subpackages, to not cause -# conflicts pkgname=mesa-git pkgver=0_git20200116 pkgrel=1 @@ -271,7 +267,9 @@ _mv_vulkan() { _dri() { local n=${subpkgname##*-dri-} pkgdesc="Mesa $n DRI drivers (Git)" - depends="$pkgname" + + # List all relevant subpackages to avoid conflicts with main mesa package. + depends="$pkgname $pkgname-gl $pkgname-glapi $pkgname-gles $pkgname-egl $pkgname-gbm" provides="mesa-dri-$n" replaces="mesa-dri-$n"