Fix conflict issues with mesa and lib32-mesa

ChimeraOS · Apr 7, 2023 · 7bbf168 · 7bbf168
1 parent 02c6e96
commit 7bbf168
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkgs/00-mesa-anv-gamescope/PKGBUILD b/pkgs/00-mesa-anv-gamescope/PKGBUILD
@@ -216,8 +216,8 @@ package_mesa-anv-gamescope() {
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'mesa-vdpau: for accelerated video playback'
               'libva-mesa-driver: for accelerated video playback')
-  provides=('mesa-libgl' 'opengl-driver')
-  conflicts=('mesa-libgl')
+  provides=('mesa' 'mesa-libgl' 'opengl-driver')
+  conflicts=('mesa' 'mesa-libgl')
   replaces=('mesa-libgl')
 
   _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf

diff --git a/pkgs/01-lib32-mesa-anv-gamescope/PKGBUILD b/pkgs/01-lib32-mesa-anv-gamescope/PKGBUILD
@@ -218,8 +218,8 @@ package_lib32-mesa-anv-gamescope() {
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'lib32-mesa-vdpau: for accelerated video playback'
               'lib32-libva-mesa-driver: for accelerated video playback')
-  provides=('lib32-mesa-libgl' 'lib32-opengl-driver')
-  conflicts=('lib32-mesa-libgl')
+  provides=('lib32-mesa' 'lib32-mesa-libgl' 'lib32-opengl-driver')
+  conflicts=('lib32-mesa' 'lib32-mesa-libgl')
   replaces=('lib32-mesa-libgl')
 
   rm -rv fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf