diff options
Diffstat (limited to 'source/x/mesa/mesa.SlackBuild')
| -rwxr-xr-x | source/x/mesa/mesa.SlackBuild | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 7bdc273e..ca670188 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=mesa -VERSION=7.9.2 +VERSION=8.0.4 DEMOVERS=8.0.1 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j8} # Be sure this list is up-to-date: -DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast" +DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,11 +59,6 @@ cd $TMP rm -rf Mesa-${VERSION} tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1 -# If MesaLib came from git, we might already have GLUT. -if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then - tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1 -fi - cd Mesa-$VERSION # Make sure ownerships and permissions are sane: @@ -76,21 +71,14 @@ find . \ # Apply patches from git (and maybe elsewhere): # Patches obtained by: -# git checkout origin/7.9 -# git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1.. +# git checkout origin/8.0 +# git format-patch 3d657b14b4cab98a2945904823e78cd8950944f4.. # 8.0.3 release if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then for patch in $CWD/patches/*.patch ; do patch -p1 < $patch || exit 1 ; done fi -# Revert "i915: Enable ARB_fragment_shader by default." -# https://bugzilla.redhat.com/show_bug.cgi?id=643399 -zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1 - -# Allow to build against libdrm-2.4.23: -zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1 - if [ ! -r configure ]; then autoreconf || exit 1 fi @@ -104,17 +92,13 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/mesa-$VERSION \ --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \ --with-dri-drivers="$DRI_DRIVERS" \ - --enable-xcb \ - --enable-gallium-nouveau \ + --with-gallium-drivers=nouveau,swrast,r300,r600 \ + --enable-gallium-llvm \ --build=$ARCH-slackware-linux -# --enable-gallium-llvm \ -# --enable-gallium-swrast \ -# --disable-gallium-svga \ -# --disable-gallium-i915 \ -# --disable-gallium-i965 \ -# --disable-gallium-radeon \ -# --disable-gallium-r600 \ +# r300 requires llvm +# Other gallium drivers: +# galahad,i915,identity,llvmpipe,noop,nv50,nvc0,nvfx,rbug,softpipe,svga,trace make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 |