diff options
| -rw-r--r-- | libre-multilib/lib32-mesa/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/mesa/PKGBUILD | 31 |
2 files changed, 36 insertions, 14 deletions
diff --git a/libre-multilib/lib32-mesa/PKGBUILD b/libre-multilib/lib32-mesa/PKGBUILD index 4ec0c9d2d..d8f1da810 100644 --- a/libre-multilib/lib32-mesa/PKGBUILD +++ b/libre-multilib/lib32-mesa/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mesa pkgname=('lib32-opencl-mesa' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl' 'lib32-mesa-libcl-icd' 'lib32-vulkan-radeon' 'lib32-vulkan-intel') pkgver=17.0.2 -pkgrel=2.parabola1 +pkgrel=2.parabola3 arch=('x86_64') makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau' 'lib32-libva' 'lib32-wayland' 'elfutils' 'lib32-libelf' 'lib32-llvm' @@ -135,6 +135,8 @@ package_lib32-opencl-mesa() { depends=('opencl-mesa' 'lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-libclc' 'lib32-clang' 'lib32-lm_sensors') optdepends=('opencl-headers: headers necessary for OpenCL development') provides=('lib32-opencl-driver') + conflicts=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst') + replaces=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst') install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe cp -rv ${srcdir}/fakeinstall/usr/lib32/libMesaOpenCL* ${pkgdir}/usr/lib32/ @@ -196,9 +198,14 @@ package_lib32-mesa() { 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-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri' 'lib32-mesa-dri' 'lib32-opengl-driver') - conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri' 'lib32-mesa-dri') - replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri' 'lib32-mesa-dri') + provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri' + 'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri' 'lib32-opengl-driver') + conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri' + 'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri' + 'lib32-nvidia-utils' 'lib32-nvidia-340xx-utils' 'lib32-nvidia-304xx-utils' 'lib32-catalyst-utils') + replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri' + 'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri' + 'lib32-nvidia-utils' 'lib32-nvidia-340xx-utils' 'lib32-nvidia-304xx-utils' 'lib32-catalyst-utils') install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast @@ -221,7 +228,8 @@ package_lib32-mesa-libgl() { pkgdesc="Mesa 3-D graphics library (32-bit)" depends=('mesa-libgl' 'lib32-libdrm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-wayland') provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-libglvnd') - conflicts=('lib32-libglvnd') + conflicts=('lib32-libglvnd' 'lib32-nvidia-libgl' 'lib32-nvidia-340xx-libgl' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-catalyst-libgl') + replaces=('lib32-libglvnd' 'lib32-nvidia-libgl' 'lib32-nvidia-340xx-libgl' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-catalyst-libgl') install -m755 -d "${pkgdir}/usr/lib32/" cp -rv ${srcdir}/fakeinstall/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/ @@ -238,6 +246,7 @@ package_lib32-mesa-libcl-icd() { optdepends=('lib32-opencl-driver: packaged opencl driver') provides=('lib32-opencl-icd-loader' 'lib32-ocl-icd' 'lib32-libcl') conflicts=('lib32-ocl-icd' 'lib32-libcl') + replaces=('lib32-ocl-icd' 'lib32-libcl') install -m755 -d ${pkgdir}/usr/lib32 cp -rv ${srcdir}/openclinstall/usr/lib32/libOpenCL* ${pkgdir}/usr/lib32/ diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD index 6c5c1a157..7b3c5d0fb 100644 --- a/libre/mesa/PKGBUILD +++ b/libre/mesa/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl' 'mesa-libcl-icd' 'vulkan-radeon') [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel') pkgver=17.0.2 -pkgrel=2.parabola2 +pkgrel=2.parabola3 arch=('i686' 'x86_64' 'armv7h') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' @@ -140,6 +140,8 @@ package_opencl-mesa() { depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors') optdepends=('opencl-headers: headers necessary for OpenCL development') provides=('opencl-driver') + conflicts=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst') + replaces=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst') install -m755 -d ${pkgdir}/etc cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ @@ -213,13 +215,23 @@ package_mesa() { 'mesa-vdpau: for accelerated video playback' 'libva-mesa-driver: for accelerated video playback') if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then - provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver') - conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver') + conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' + 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') + replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' + 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') elif [[ "${CARCH}" = 'armv7h' ]]; then - provides=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver') - conflicts=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - replaces=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + provides=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver') + conflicts=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' + 'nvidia-utils' 'catalyst-utils') + replaces=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' + 'nvidia-utils' 'catalyst-utils') fi install -m755 -d ${pkgdir}/etc @@ -250,7 +262,8 @@ package_mesa-libgl() { pkgdesc="Mesa 3-D graphics library" depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland') provides=('libgl' 'libegl' 'libgles' 'libglvnd') - conflicts=('libglvnd') + conflicts=('libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl') + replaces=('libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl') install -m755 -d "${pkgdir}/usr/lib/" cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/ @@ -267,7 +280,7 @@ package_mesa-libcl-icd() { optdepends=('opencl-driver: packaged opencl driver') provides=('opencl-icd-loader' 'ocl-icd' 'libcl') conflicts=('ocl-icd' 'libcl') - replaces=('ocl-icd') + replaces=('ocl-icd' 'libcl') install -m755 -d ${pkgdir}/usr/lib cp -rv ${srcdir}/openclinstall/usr/lib/libOpenCL* ${pkgdir}/usr/lib/ |