Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=6d70b7cbf4520ddcfbc37b4c6280bbfe4927f374
commit 6d70b7cbf4520ddcfbc37b4c6280bbfe4927f374 Author: DeX77 <[email protected]> Date: Mon Oct 31 19:17:20 2016 +0100 mesa-12.0.3-5-x86_64 + add cross32 diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index ce5084e..f96855a 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -33,20 +33,21 @@ if Fuse WAYLAND_EGL; then fi pkgname=mesa -_F_archive_name="MesaLib" pkgver=12.0.3 -pkgrel=4 +pkgrel=5 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|'" # libgl: provided by libgl, fglrx and nvidia packages depends=() -makedepends=('makedepend>=1.0.5-3' 'mako>=1.0.4-2' 'x11-protos>=0.1-3' 'systemd>=231-6') +makedepends=('makedepend>=1.0.5-3' 'mako>=1.0.4-2' 'x11-protos>=0.1-3' 'systemd>=231-6' 'llvm' 'lib32-llvm') # should be mesa-*=$pkgver but apps should not depends on mesa anymore first, unless specific to mesa rodepends=('libgl') -archs=('i686' 'x86_64') +archs=('x86_64') groups=('x11' 'xorg-core' 'xorg-libs') +_F_cross32_delete=("usr/share") +Finclude cross32 xserverver=1.18.4-4 @@ -67,31 +68,63 @@ subdescs=('Mesa DRI OpenGL files.' 'Mesa OpenGL headers files.') subprovides=('mesa-libgl' 'libgl-headers') subreplaces=('' '') subconflicts=('catalyst nvidia' 'nvidia') -subdepends=('expat>=2.1.0-6 libxdamage>=1.1.4-3 libxxf86vm>=1.1.4-3 libdrm>=2.4.71 libxshmfence>=1.2-3' '') +subdepends=('expat>=2.1.0-6 libxdamage>=1.1.4-3 libxxf86vm>=1.1.4-3 libdrm>=2.4.71 libxshmfence>=1.2-3 libgcrypt' '') subrodepends=("mesa-libgl-headers>=$pkgver-$pkgrel libglapi libglx>=$xserverver mesa-dri-drivers>=$pkgver-$pkgrel" 'khr-headers') 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') +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') +subarchs+=("${archs[*]}" "${archs[*]}") +subbackup+=('' '') + subpkgs=("${subpkgs[@]}" 'mesa-dri-drivers') subdescs=("${subdescs[@]}" 'Mesa OpenGL DRI drivers.') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') subdepends=("${subdepends[@]}" "nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.71 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[@]}" 'etc/drirc') +subpkgs=("${subpkgs[@]}" 'lib32-mesa-dri-drivers') +subdescs=("${subdescs[@]}" 'Mesa OpenGL DRI drivers. (32-Bit)') +subprovides=("${subprovides[@]}" '') +subreplaces=("${subreplaces[@]}" '') +subconflicts=("${subconflicts[@]}" '') +subdepends=("${subdepends[@]}" "lib32-nettle>=3.2-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-elfutils>=0.167-2 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2") +subrodepends=("${subrodepends[@]}" '') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" 'etc/drirc') + 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[*]}") @@ -108,6 +141,17 @@ subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') +subpkgs=("${subpkgs[@]}" 'lib32-libgbm') +subdescs=("${subdescs[@]}" 'Mesa gbm library. (32-Bit)') +subprovides=("${subprovides[@]}" '') +subreplaces=("${subreplaces[@]}" '') +subconflicts=("${subconflicts[@]}" '') +subdepends=("${subdepends[@]}" 'lib32-libdrm>=2.4.71 lib32-wayland>=1.11.0-3') +subrodepends+=('lib32-mesa-pipe-drivers lib32-libglapi') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') + subpkgs=("${subpkgs[@]}" 'libglapi') subdescs=("${subdescs[@]}" 'Mesa OpenGL API library.') subprovides=("${subprovides[@]}" '') @@ -119,6 +163,17 @@ subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') +subpkgs=("${subpkgs[@]}" 'lib32-libglapi') +subdescs=("${subdescs[@]}" 'Mesa OpenGL API library. (32-Bit)') +subprovides=("${subprovides[@]}" '') +subreplaces=("${subreplaces[@]}" '') +subconflicts=("${subconflicts[@]}" '') +subdepends=("${subdepends[@]}" 'glibc>=2.24-4') +subrodepends=("${subrodepends[@]}" '') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') + subpkgs=("${subpkgs[@]}" 'libgles') subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries.') subprovides=("${subprovides[@]}" 'mesa-libgles') @@ -130,6 +185,17 @@ subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') +subpkgs=("${subpkgs[@]}" 'lib32-libgles') +subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries. (32-bit)') +subprovides=("${subprovides[@]}" 'lib32-mesa-libgles') +subreplaces=("${subreplaces[@]}" '') +subconflicts=("${subconflicts[@]}" '') +subdepends=("${subdepends[@]}" 'glibc>=2.24-4') +subrodepends=("${subrodepends[@]}" 'lib32-libglapi lib32-khr-headers') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') + subpkgs=("${subpkgs[@]}" 'khr-headers') subdescs=("${subdescs[@]}" 'Khronos generic header.') subprovides=("${subprovides[@]}" '') @@ -141,6 +207,18 @@ subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') +subpkgs=("${subpkgs[@]}" 'lib32-khr-headers') +subdescs=("${subdescs[@]}" 'Khronos generic header. (32-bit)') +subprovides=("${subprovides[@]}" '') +subreplaces=("${subreplaces[@]}" '') +subconflicts=("${subconflicts[@]}" '') +subdepends=("${subdepends[@]}" '') +subrodepends=("${subrodepends[@]}" '') +subgroups=("${subgroups[@]}" 'lib32-extra') +subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') + + if Fuse EGL; then subpkgs+=('libegl') subdescs+=('Mesa OpenEGL library.') @@ -152,6 +230,17 @@ if Fuse EGL; then subgroups+=('x11') subarchs+=("${archs[*]}") subbackup+=('') + + subpkgs+=('lib32-libegl') + subdescs+=('Mesa OpenEGL library. (32-bit)') + subprovides+=('mesa-libegl') + subreplaces+=('') + subconflicts+=('') + subdepends+=('lib32-libx11>=1.6.4 lib32-libxshmfence>=1.2-3 lib32-wayland>=1.11.0-3 lib32-libdrm>=2.4.70-2') + subrodepends+=('lib32-khr-headers lib32-libgbm') + subgroups+=('lib32-extra') + subarchs+=("${archs[*]}") + subbackup+=('') fi if Fuse OPENCL; then @@ -166,6 +255,20 @@ if Fuse OPENCL; then 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.2-2 lib32-elfutils>=0.167-2 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') + fi if Fuse XA; then @@ -179,6 +282,17 @@ if Fuse XA; then subgroups+=('x11') subarchs+=("${archs[*]}") subbackup+=('') + + subpkgs+=('lib32-libxatracker') + subdescs+=('Mesa xatracker library (32-bit)') + subprovides+=('') + subreplaces+=('') + subconflicts+=('') + subdepends+=('lib32-nettle>=3.2-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2 lib32-zlib>=1.2.8-8') + subrodepends+=('') + subgroups+=('lib32-extra') + subarchs+=("${archs[*]}") + subbackup+=('') fi if Fuse VDPAU; then @@ -194,6 +308,20 @@ if Fuse VDPAU; then subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') rodepends+=('mesa-vdpau-drivers') + + subpkgs=("${subpkgs[@]}" 'lib32-mesa-vdpau-drivers') + subdescs=("${subdescs[@]}" 'Mesa VDPAU drivers. (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') + makedepends+=('lib32-libvdpau>=1.1.1-2') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') + rodepends+=('lib32-mesa-vdpau-drivers') + fi if Fuse VAAPI; then @@ -209,6 +337,19 @@ if Fuse VAAPI; then subbackup=("${subbackup[@]}" '') rodepends+=('libva-mesa-driver') makedepends+=('libva>=1.7.1') + + subpkgs=("${subpkgs[@]}" 'lib32-libva-mesa-driver') + subdescs=("${subdescs[@]}" 'VAAPI mesa driver (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[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') + makedepends+=('libva>=1.7.1') + fi if Fuse WAYLAND_EGL; then @@ -222,6 +363,18 @@ if Fuse WAYLAND_EGL; then subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') + + subpkgs=("${subpkgs[@]}" 'lib32-libwayland-egl') + subdescs=("${subdescs[@]}" 'Mesa Wayland EGL library. (32-bit)') + subprovides=("${subprovides[@]}" 'mesa-libwayland-egl') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends=("${subdepends[@]}" '') + subrodepends=("${subrodepends[@]}" 'lib32-libegl') + subgroups=("${subgroups[@]}" ' lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') + fi if Fuse NINE; then @@ -235,6 +388,17 @@ if Fuse NINE; then subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') + + subpkgs=("${subpkgs[@]}" 'lib32-mesa-nine') + subdescs=("${subdescs[@]}" 'Mesa Support for DirectX 9 (32-bit)') + subprovides=("${subprovides[@]}" '') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends+=('lib32-nettle>=3.2-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70 lib32-elfutils>=0.167-2 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') fi if Fuse OMX; then @@ -248,6 +412,17 @@ if Fuse OMX; then subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') + + subpkgs=("${subpkgs[@]}" 'lib32-mesa-opemax') + subdescs=("${subdescs[@]}" 'Mesa Support for OpenMAX (32-bit)') + subprovides=("${subprovides[@]}" '') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends+=('lib32-nettle>=3.2-2 lib32-libomxil-bellagio>=0.9.3-3 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-2 llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') fi if Fuse VULKAN; then @@ -261,160 +436,246 @@ if Fuse VULKAN; then subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') + + subpkgs=("${subpkgs[@]}" 'lib32-mesa-vulkan') + subdescs=("${subdescs[@]}" 'Mesa Support for Vulkan (32-bit)') + subprovides=("${subprovides[@]}" '') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends+=('') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') fi if Fuse DETECTDEPENDS; then makedepends=("${makedepends[@]}" "$pkgname=$pkgver" "${subpkgs[@]}") fi -build() { -# unset MAKEFLAGS +Fconfopts=" --with-sha1=libgcrypt \ + -enable-gbm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi" - if Fuse DEVEL; then - Funpack_scm - fi +F32conopts=" --with-dri-driverdir=/usr/lib32/dri \ + --libdir=/usr/lib32 \ + --includedir=/usr/i686-frugalware-linux/include" - Fcd $pkgname-$pkgver - Fpatchall - ## try to not reconf , only when patching *.ac,*.in,*.am files - #Fautoreconf +if Fuse DEBUG; then + Fconfopts+=" --enable-debug" +else + Fconfopts+=" --disable-debug" +fi - ## Hack for llvm built with cmake.. autoreconf breaks stuff :/ - Fsed "LLVM_SO_NAME=.*" "LLVM_SO_NAME=LLVM" configure +if Fuse DRI; then + Fconfopts+=" --enable-dri" + Fconfopts+=" --enable-dri3" +else + Fconfopts+=" --disable-dri" + Fconfopts+=" --disable-dri3" +fi +if Fuse GLES1; then + Fconfopts+=" --enable-gles1" +else + Fconfopts+=" --disable-gles1" +fi - if Fuse DEBUG; then - Fconfopts+=" --enable-debug" - else - Fconfopts+=" --disable-debug" - fi +if Fuse GLES2; then + Fconfopts+=" --enable-gles2" +else + Fconfopts+=" --disable-gles2" +fi - if Fuse DRI; then - Fconfopts+=" --enable-dri" - Fconfopts+=" --enable-dri3" - Fconfopts+=" --with-dri-driverdir=/usr/lib/dri" - else - Fconfopts+=" --disable-dri" - Fconfopts+=" --disable-dri3" - fi +if Fuse GLX; then + Fconfopts+=" --enable-glx --enable-glx-tls" +else + Fconfopts+=" --disable-glx" +fi - if Fuse GLES1; then - Fconfopts+=" --enable-gles1" - else - Fconfopts+=" --disable-gles1" - fi +if Fuse OPENCL; then + Fconfopts+=" --enable-opencl" + Fconfopts+=" --enable-opencl-icd" +else + Fconfopts+=" --disable-opencl" + Fconfopts+=" --disable-opencl-icd" +fi - if Fuse GLES2; then - Fconfopts+=" --enable-gles2" - else - Fconfopts+=" --disable-gles2" - fi +if Fuse OSMESA; then + Fconfopts+=" --enable-osmesa" +else + Fconfopts+=" --disable-osmesa" +fi - if Fuse GLX; then - Fconfopts+=" --enable-glx --enable-glx-tls" +if Fuse TEXTURE_FLOAT; then + Fconfopts+=" --enable-texture-float" +else + Fconfopts+=" --disable-texture-float" +fi + +if Fuse VAAPI; then + Fconfopts+=" --enable-va" +else + Fconfopts+=" --disable-va" +fi + +if Fuse VDPAU; then + Fconfopts+=" --enable-vdpau" +else + Fconfopts+=" --disable-vdpau" +fi + +if Fuse XA; then + Fconfopts+=" --enable-xa" +else + Fconfopts+=" --disable-xa" +fi + +if Fuse DRI_OLD; then + # Disable intel on ARM until a better solution is found. + if [ "$CARCH" == arm ]; then + Fconfopts+=" --with-dri-drivers=nouveau,r200,radeon,swrast" else - Fconfopts+=" --disable-glx" + Fconfopts+=" --with-dri-drivers=yes" fi +else + Fconfopts+=" --with-dri-drivers=no" +fi - if Fuse OPENCL; then - Fconfopts+=" --enable-opencl" - Fconfopts+=" --enable-opencl-icd" - else - Fconfopts+=" --disable-opencl" - Fconfopts+=" --disable-opencl-icd" +if Fuse EGL; then + EGL_PLATFORMS="drm,x11" + if Fuse WAYLAND_EGL; then + EGL_PLATFORMS+=",wayland" fi + Fconfopts+=" --with-egl-platforms=$EGL_PLATFORMS" + Fconfopts+=" --enable-egl" +else + Fconfopts+=" --disable-egl" +fi +if Fuse GALLIUM; then + if [ "$CARCH" != arm ]; then + GALLIUM_DRIVERS+=",i915" + fi + GALLIUM_DRIVERS+=",nouveau" + GALLIUM_DRIVERS+=",r300,r600,radeonsi" + GALLIUM_DRIVERS+=",svga" + GALLIUM_DRIVERS+=",swrast" + Fconfopts+=" --with-gallium-drivers=$GALLIUM_DRIVERS" + Fconfopts+=" --enable-gallium-llvm" if Fuse OSMESA; then - Fconfopts+=" --enable-osmesa" - else - Fconfopts+=" --disable-osmesa" + Fconfopts+=" --enable-gallium-osmesa" fi +else + Fconfopts+=" --disable-gallium" +fi - if Fuse TEXTURE_FLOAT; then - Fconfopts+=" --enable-texture-float" - else - Fconfopts+=" --disable-texture-float" - fi +if Fuse NINE; then + Fconfopts+=" --enable-nine" +fi - if Fuse VAAPI; then - Fconfopts+=" --enable-va" - else - Fconfopts+=" --disable-va" - fi +if Fuse OMX; then + Fconfopts+=" --enable-omx" +fi - if Fuse VDPAU; then - Fconfopts+=" --enable-vdpau" - else - Fconfopts+=" --disable-vdpau" - fi +if Fuse VULKAN; then + Fconfopts+=" --with-vulkan-drivers=intel" +fi - if Fuse XA; then - Fconfopts+=" --enable-xa" - else - Fconfopts+=" --disable-xa" - fi +build() { - if Fuse DRI_OLD; then - # Disable intel on ARM until a better solution is found. - if [ "$CARCH" == arm ]; then - Fconfopts+=" --with-dri-drivers=nouveau,r200,radeon,swrast" - else - Fconfopts+=" --with-dri-drivers=yes" - fi - else - Fconfopts+=" --with-dri-drivers=no" + if Fuse DEVEL; then + Funpack_scm fi - if Fuse EGL; then - EGL_PLATFORMS="drm,x11" - if Fuse WAYLAND_EGL; then - EGL_PLATFORMS+=",wayland" - fi - Fconfopts+=" --with-egl-platforms=$EGL_PLATFORMS" - Fconfopts+=" --enable-egl" - else - Fconfopts+=" --disable-egl" - fi + ## Hack for llvm built with cmake.. autoreconf breaks stuff :/ + Fsed "LLVM_SO_NAME=.*" "LLVM_SO_NAME=LLVM" configure - if Fuse GALLIUM; then - if [ "$CARCH" != arm ]; then - GALLIUM_DRIVERS+=",i915" - fi - GALLIUM_DRIVERS+=",nouveau" - GALLIUM_DRIVERS+=",r300,r600,radeonsi" - GALLIUM_DRIVERS+=",svga" - GALLIUM_DRIVERS+=",swrast" - Fconfopts+=" --with-gallium-drivers=$GALLIUM_DRIVERS" - Fconfopts+=" --enable-gallium-llvm" - if Fuse OSMESA; then - Fconfopts+=" --enable-gallium-osmesa" - fi - else - Fconfopts+=" --disable-gallium" - fi + # 32-Bit build + export LLVM_CONFIG="/usr/bin/llvm-config32" + Fcross32_common_build + + Fsplit lib32-libglapi usr/lib32/libglapi.\* - if Fuse NINE; then - Fconfopts+=" --enable-nine" - fi + Fsplit lib32-libgbm usr/i686-frugalware-linux/include/gbm.h + Fsplit lib32-libgbm usr/lib32/libgbm.\* + Fsplit lib32-libgbm usr/lib32/pkgconfig/gbm.pc - if Fuse OMX; then - Fconfopts+=" --enable-omx" - fi + Fsplit lib32-libgl usr/lib32/libGL.\* + Fsplit lib32-libgl usr/lib32/pkgconfig/gl.pc - if Fuse VULKAN; then - Fconfopts+=" --with-vulkan-drivers=intel" - fi + 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/internal + + # Must be before mesa-dri-drivers + if Fuse VAAPI; then + Fsplit lib32-libva-mesa-driver usr/lib32/dri/nouveau_drv_video.so + Fsplit lib32-libva-mesa-driver usr/lib32/dri/r600_drv_video.so + Fsplit lib32-libva-mesa-driver usr/lib32/dri/radeonsi_drv_video.so + fi + + Fsplit lib32-mesa-dri-drivers usr/lib32/dri/ + Fsplit lib32-mesa-dri-drivers usr/lib32/pkgconfig/dri.pc + + Fsplit lib32-khr-headers usr/i686-frugalware-linux/include/KHR/ - Fconf \ - --enable-gbm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi - make || Fdie + if Fuse EGL; then + Fsplit lib32-libegl usr/i686-frugalware-linux/include/EGL/ + Fsplit lib32-libegl usr/lib32/libEGL.* + Fsplit lib32-libegl usr/lib32/pkgconfig/egl.pc + fi - Fmkdir /usr + if Fuse GLES1 || Fuse GLES2; then + Fsplit lib32-libgles usr/i686-frugalware-linux/include/GLES*/ + Fsplit lib32-libgles usr/lib32/libGLES* + 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 VULKAN; then + Fsplit lib32-mesa-vulkan usr/i686-frugalware-linux/include/vulkan + Fsplit lib32-mesa-vulkan usr/lib32/libvulkan* + fi + + if Fuse VDPAU; then + Fsplit lib32-mesa-vdpau-drivers usr/lib32/vdpau/ + fi + + if Fuse OMX; then + Fsplit lib32-mesa-opemax usr/lib32/bellagio/ + fi + + if Fuse NINE; then + Fsplit lib32-mesa-nine usr/i686-frugalware-linux/include/d3dadapter/ + Fsplit lib32-mesa-nine usr/lib32/d3d/ + Fsplit lib32-mesa-nine usr/lib32/pkgconfig/d3d.pc + fi + + if Fuse XA; then + Fsplit lib32-libxatracker usr/lib32/libxatracker.* + Fsplit lib32-libxatracker usr/i686-frugalware-linux/include/xa_*.h + Fsplit lib32-libxatracker usr/lib32/pkgconfig/xatracker.pc + fi + + if Fuse WAYLAND_EGL; then + Fsplit lib32-libwayland-egl usr/lib32/libwayland-egl.* + Fsplit lib32-libwayland-egl usr/lib32/pkgconfig/wayland-egl.pc + fi + + Fsplit lib32-mesa /\* + + # 64-Bit build + export LLVM_CONFIG="/usr/bin/llvm-config" + export PKG_CONFIG_PATH="/usr/lib/pkgconfig" + + Fbuild - make DESTDIR=$Fdestdir INSTALL_DIR=$Fdestdir/usr install || Fdie # required by xf86-video-nsc, for example Fmkdir /usr/include/xorg Ffilerel src/mesa/x86/assyntax.h /usr/include/xorg @@ -446,13 +707,8 @@ build() { Fsplit mesa-dri-drivers usr/lib/dri/ Fsplit mesa-dri-drivers usr/lib/pkgconfig/dri.pc - Fsplit mesa-pipe-drivers usr/lib/gallium-pipe/ - Fsplit khr-headers usr/include/KHR/ -# Fsplit xf86-video-gles usr/include/xorg/ -# Fsplit xf86-video-gles usr/lib/xorg/modules/drivers/ - if Fuse EGL; then Fsplit libegl usr/include/EGL/ Fsplit libegl usr/lib/libEGL.* @@ -468,6 +724,7 @@ build() { if Fuse OPENCL; then Fsplit libcl usr/lib/libMesaOpenCL* Fsplit libcl etc/OpenCL + Fsplit mesa-pipe-drivers usr/lib/gallium-pipe/ fi if Fuse XA; then @@ -499,9 +756,9 @@ build() { Fsplit mesa-nine usr/lib/pkgconfig/d3d.pc fi - if Fuse OMX; then - Fsplit mesa-opemax usr/lib/bellagio/ - fi + if Fuse OMX; then + Fsplit mesa-opemax usr/lib/bellagio/ + fi if Fuse VULKAN; then Fsplit mesa-vulkan usr/include/vulkan _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
