Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd8f88605154fa9ec487619458b8f204bae23687
commit dd8f88605154fa9ec487619458b8f204bae23687 Author: Michel Hermier <[email protected]> Date: Sun Nov 18 14:49:17 2012 +0100 mesa-9.0.1-3-i686 * Fix dependencies in libegl (which link to wayland, code issue). * use += bash extension where possible. diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 428755c..cce4ac8 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -33,7 +33,7 @@ pkgname=mesa origname=Mesa _F_archive_name="MesaLib" pkgver=9.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/"; @@ -132,7 +132,11 @@ if Fuse EGL; then subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') subdepends=("${subdepends[@]}" 'dri2proto glproto libdrm') - subrodepends=("${subrodepends[@]}" 'khr-headers libgbm') + if Fuse WAYLAND_EGL; then # Upstream issue + subrodepends=("${subrodepends[@]}" 'khr-headers libgbm wayland') + else + subrodepends=("${subrodepends[@]}" 'khr-headers libgbm') + fi subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') @@ -171,7 +175,7 @@ if Fuse WAYLAND_EGL; then subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') subdepends=("${subdepends[@]}" 'wayland') - subrodepends=("${subrodepends[@]}" 'libgl') + subrodepends=("${subrodepends[@]}" 'libegl') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') @@ -273,7 +277,7 @@ build() { if Fuse EGL; then EGL_PLATFORMS="drm,x11" if Fuse WAYLAND_EGL; then - EGL_PLATFORMS="$EGL_PLATFORMS,wayland" + EGL_PLATFORMS+=",wayland" fi Fconfopts+=" --with-egl-platforms=$EGL_PLATFORMS" Fconfopts+=" --enable-egl" @@ -283,12 +287,12 @@ build() { if Fuse GALLIUM; then if [ "$CARCH" != arm ]; then - GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915" + GALLIUM_DRIVERS+=",i915" fi - GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau" - GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300,r600" - GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga" - GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast" + GALLIUM_DRIVERS+=",nouveau" + GALLIUM_DRIVERS+=",r300,r600" + GALLIUM_DRIVERS+=",svga" + GALLIUM_DRIVERS+=",swrast" Fconfopts+=" --with-gallium-drivers=$GALLIUM_DRIVERS" Fconfopts+=" --enable-gallium-g3dvl" Fconfopts+=" --enable-gallium-gbm" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
