Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=414c686fd05cc318da09b0c9c6f7c31660244bbd
commit 414c686fd05cc318da09b0c9c6f7c31660244bbd Author: DeX77 <[email protected]> Date: Tue Nov 1 14:46:45 2016 +0100 mesa-12.0.3-7-x86_64 * various fixes diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 2ee4c8f..39b0a03 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -17,8 +17,8 @@ : ${USE_GLES1="y"} : ${USE_GLES2="y"} : ${USE_GLX="y"} -: ${USE_OPENCL="y"} -: ${USE_OSMESA="n"} +: ${USE_OPENCL="n"} +: ${USE_OSMESA="y"} : ${USE_VDPAU="y"} : ${USE_VAAPI="y"} : ${USE_TEXTURE_FLOAT="y"} @@ -34,7 +34,7 @@ fi pkgname=mesa pkgver=12.0.3 -pkgrel=6 +pkgrel=7 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; up2date="lynx --dump 'ftp://ftp.freedesktop.org/pub/mesa/' | grep "pub/mesa/[0-9\.]" | tail -n1 | sed 's|.*/\([0-9\.]\)|\1|'" @@ -74,23 +74,11 @@ subgroups=('x11' 'x11') subarchs=("${archs[*]}" "${archs[*]}") subbackup=('' '') -subpkgs+=('lib32-mesa') -subdescs+=('Mesa is a 3D graphics library (32-bit)') -subprovides+=('') -subreplaces+=('') -subconflicts+=('') -subdepends+=('') -subrodepends+=("") -subgroups+=('lib32-extra') -subarchs+=("${archs[*]}") -subbackup+=('') - - subpkgs+=('lib32-libgl' 'lib32-mesa-libgl-headers') subdescs+=('Mesa DRI OpenGL files (32-Bit).' 'Mesa OpenGL headers files (32-Bit).') subprovides+=('lib32-mesa-libgl' 'lib32-libgl-headers') subreplaces+=('' '') -subconflicts+=('catalyst nvidia' 'nvidia') +subconflicts+=('lib32-nvidia' 'lib32-nvidia') subdepends+=('lib32-expat>=2.1.0-6 lib32-libxdamage>=1.1.4-3 lib32-libxxf86vm>=1.1.4-3 lib32-libdrm>=2.4.71 lib32-libxshmfence>=1.2-3 lib32-libgcrypt' '') subrodepends+=("lib32-mesa-libgl-headers>=$pkgver-$pkgrel lib32-libglapi lib32-libglx>=$xserverver lib32-mesa-dri-drivers>=$pkgver-$pkgrel" 'lib32-khr-headers') subgroups+=('lib32-extra' 'lib32-extra') @@ -119,17 +107,6 @@ subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -subpkgs+=('mesa-pipe-drivers') -subdescs+=('Mesa gallium pipe drivers.') -subprovides+=('') -subreplaces+=('') -subconflicts+=('') -subdepends+=("libdrm>=2.4.70 llvm-libs>=3.8.1-4 elfutils>=0.167-2 nettle>=3.2-2 libffi>=3.2.1-2") -subrodepends+=('') -subgroups+=('x11') -subarchs+=("${archs[*]}") -subbackup+=('etc/drirc') - subpkgs=("${subpkgs[@]}" 'libgbm') subdescs=("${subdescs[@]}" 'Mesa gbm library.') subprovides=("${subprovides[@]}" '') @@ -254,21 +231,39 @@ if Fuse OPENCL; then subgroups+=('x11') subarchs+=("${archs[*]}") subbackup+=('') - makedepends+=('clang>=3.8.1-4 libclc>=0.0.1.gb858eb3-1') - -# TODO: fix libclc for cross32 -# subpkgs+=('lib32-libcl') -# subdescs+=('Mesa OpenCL library. (32-bit)') -# subprovides+=('mesa-libcl') -# subreplaces+=('') -# subconflicts+=('') -# subdepends+=('lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-nettle>=3.3-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') -# subrodepends+=('') -# subgroups+=('lib32-extra') -# subarchs+=("${archs[*]}") -# subbackup+=('') -# makedepends+=('lib32-clang>=3.8.1-4 lib32-libclc>=0.0.1.gb858eb3-1') + subpkgs+=('lib32-libcl') + subdescs+=('Mesa OpenCL library. (32-bit)') + subprovides+=('mesa-libcl') + subreplaces+=('') + subconflicts+=('') + subdepends+=('lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-nettle>=3.3-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subrodepends+=('') + subgroups+=('lib32-extra') + subarchs+=("${archs[*]}") + subbackup+=('') + + subpkgs+=('mesa-pipe-drivers') + subdescs+=('Mesa gallium pipe drivers.') + subprovides+=('') + subreplaces+=('') + subconflicts+=('') + subdepends+=("libdrm>=2.4.70 llvm-libs>=3.8.1-4 elfutils>=0.167-2 nettle>=3.2-2 libffi>=3.2.1-2") + subrodepends+=('') + subgroups+=('x11') + subarchs+=("${archs[*]}") + subbackup+=('etc/drirc') + + subpkgs+=('lib32-mesa-pipe-drivers') + subdescs+=('Mesa gallium pipe drivers. (32-bit)') + subprovides+=('') + subreplaces+=('') + subconflicts+=('') + subdepends+=("lib32-libdrm>=2.4.70 lib32-llvm-libs>=3.8.1-4 lib32-elfutils>=0.167-2 lib32-nettle>=3.2-2 lib32-libffi>=3.2.1-2") + subrodepends+=('') + subgroups+=('lib32-extra') + subarchs+=("${archs[*]}") + subbackup+=('') fi if Fuse XA; then @@ -320,7 +315,31 @@ if Fuse VDPAU; then subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - rodepends+=('lib32-mesa-vdpau-drivers') + +fi + +if Fuse OSMESA; then + subpkgs=("${subpkgs[@]}" 'libosmesa') + subdescs=("${subdescs[@]}" 'Mesa Off-screen Rendering') + subprovides=("${subprovides[@]}" '') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'x11') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') + + subpkgs=("${subpkgs[@]}" 'lib32-libosmesa') + subdescs=("${subdescs[@]}" 'Mesa Off-screen Rendering (32-bit)') + subprovides=("${subprovides[@]}" '') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends+=('lib32-nettle>=3.2-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-2 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'x11') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') fi @@ -564,7 +583,7 @@ if Fuse GALLIUM; then GALLIUM_DRIVERS+=",swrast" Fconfopts+=" --with-gallium-drivers=$GALLIUM_DRIVERS" Fconfopts+=" --enable-gallium-llvm" - if Fuse OSMESA; then + if ! Fuse OSMESA; then Fconfopts+=" --enable-gallium-osmesa" fi else @@ -605,7 +624,7 @@ build() { Fsplit lib32-libgl usr/lib32/libGL.\* Fsplit lib32-libgl usr/lib32/pkgconfig/gl.pc - Fsplit lib32-mesa-libgl-headers usr/i686-frugalware-linux/include/GL/{gl.h,glext.h,glx.h,glxext.h} + Fsplit lib32-mesa-libgl-headers usr/i686-frugalware-linux/include/GL/{gl.h,glext.h,glx.h,glxext.h,glx_mangle.h,mesa_glinterop.h,wglext.h,glcorearb.h,gl_mangle.h} Fsplit lib32-mesa-libgl-headers usr/i686-frugalware-linux/include/GL/internal # Must be before mesa-dri-drivers @@ -620,7 +639,6 @@ build() { Fsplit lib32-khr-headers usr/i686-frugalware-linux/include/KHR/ - if Fuse EGL; then Fsplit lib32-libegl usr/i686-frugalware-linux/include/EGL/ Fsplit lib32-libegl usr/lib32/libEGL.* @@ -633,16 +651,24 @@ build() { Fsplit lib32-libgles usr/lib32/pkgconfig/gles*.pc fi -# if Fuse OPENCL; then -# Fsplit lib32-libcl usr/lib32/libMesaOpenCL* -# Fsplit lib32-mesa-pipe-drivers usr/lib32/gallium-pipe/ -# fi + if Fuse OPENCL; then + Fsplit lib32-libcl usr/lib32/libMesaOpenCL* + Fsplit lib32-mesa-pipe-drivers usr/lib32/gallium-pipe/ + fi if Fuse VULKAN; then Fsplit lib32-mesa-vulkan usr/i686-frugalware-linux/include/vulkan Fsplit lib32-mesa-vulkan usr/lib32/libvulkan* fi + if Fuse OSMESA; then + Fsplit lib32-libosmesa usr/i686-frugalware-linux/include/GL/osmesa.h + Fsplit lib32-libosmesa usr/lib32/libOSMesa.* + Fsplit lib32-libosmesa usr/lib32/pkgconfig/osmesa.pc + else + Frm usr/i686-frugalware-linux/include/GL/osmesa.h + fi + if Fuse VDPAU; then Fsplit lib32-mesa-vdpau-drivers usr/lib32/vdpau/ fi @@ -667,8 +693,7 @@ build() { Fsplit lib32-libwayland-egl usr/lib32/libwayland-egl.* Fsplit lib32-libwayland-egl usr/lib32/pkgconfig/wayland-egl.pc fi - - Fsplit lib32-mesa /\* + Fcross32_delete_empty # 64-Bit build export LLVM_CONFIG="/usr/bin/llvm-config" @@ -676,10 +701,6 @@ build() { Fbuild - # required by xf86-video-nsc, for example - Fmkdir /usr/include/xorg - Ffilerel src/mesa/x86/assyntax.h /usr/include/xorg - Fmkdir /usr/share/doc/$pkgname-$pkgver cp -r docs/{README.*,*.html} \ $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie @@ -693,7 +714,7 @@ build() { Fsplit libgl usr/lib/libGL.* Fsplit libgl usr/lib/pkgconfig/gl.pc - Fsplit mesa-libgl-headers usr/include/GL/{gl.h,glext.h,glx.h,glxext.h} + Fsplit mesa-libgl-headers usr/include/GL/{gl.h,glext.h,glx.h,glxext.h,glx_mangle.h,mesa_glinterop.h,wglext.h,glcorearb.h,gl_mangle.h} Fsplit mesa-libgl-headers usr/include/GL/internal # Must be before mesa-dri-drivers @@ -722,9 +743,9 @@ build() { fi if Fuse OPENCL; then + Fsplit mesa-pipe-drivers usr/lib/gallium-pipe/ Fsplit libcl usr/lib/libMesaOpenCL* Fsplit libcl etc/OpenCL - Fsplit mesa-pipe-drivers usr/lib/gallium-pipe/ fi if Fuse XA; then @@ -765,6 +786,9 @@ build() { Fsplit mesa-vulkan usr/lib/libvulkan* Fsplit mesa-vulkan usr/share/vulkan/ fi + + # empty dirs + Frm usr/{lib,include,i686-frugalware-linux,lib32}/ } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
