From ef53b9cc20e459a37f3b7c40a2a44e4411941685 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 24 Aug 2014 09:51:41 +0200 Subject: [PATCH] MesaLib: resolve conflict with catalyst/nvidia (libGL.so); close #516 Move libGL.so to the libGL pkg, this way any other pkg providing the `libGL` virtual package won't conflict with the real `libGL` mesa pkg. --- srcpkgs/MesaLib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 0cb8b08f2a..57df55be1f 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=10.2.6 -revision=1 +revision=2 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm @@ -104,7 +104,7 @@ libGL_package() { short_desc="Free implementation of the OpenGL API - GLX runtime" replaces="libGL-git>=0" pkg_install() { - vmove "usr/lib/libGL.so.*" + vmove "usr/lib/libGL.so*" vmove usr/lib/xorg/modules/extensions } }