Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=8a46df21c9c29e61fd3c6017e845e7bd9e8fa18b
commit 8a46df21c9c29e61fd3c6017e845e7bd9e8fa18b Author: DeX77 <[email protected]> Date: Sun Mar 8 23:41:15 2015 +0100 mesa-10.5.0-1-x86_64 * version bump diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 11f02cd..2d975eb 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -16,39 +16,28 @@ options+=('asneeded') : ${USE_DRI="y"} : ${USE_DRI_OLD="y"} -: ${USE_EGL="y"} : ${USE_GALLIUM="y"} : ${USE_GLES1="y"} : ${USE_GLES2="y"} : ${USE_GLX="y"} -: ${USE_OPENCL="n"} +: ${USE_OPENCL="y"} : ${USE_OSMESA="n"} : ${USE_VDPAU="y"} -: ${USE_VG="y"} +: ${USE_VG="n"} : ${USE_TEXTURE_FLOAT="y"} : ${USE_WAYLAND_EGL="y"} : ${USE_XA="y"} -if Fuse WAYLAND_EGL; then - USE_EGL=y -fi - -if Fuse EGL; then - USE_VG=y -fi - pkgname=mesa -origname=Mesa -_F_archive_name="MesaLib" -pkgver=10.2.4 +pkgver=10.5.0 pkgrel=1 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|'" +url="http://www.mesa3d.org/"; +up2date="Flastverdir ftp://ftp.freedesktop.org/pub/mesa/"; # libgl: provided by libgl, fglrx and nvidia packages depends=() -makedepends=('makedepend') +makedepends=('makedepend' 'mako') # should be mesa-*=$pkgver but apps should not depends on mesa anymore first, unless specific to mesa rodepends=('libgl') archs=('i686' 'x86_64' 'arm') @@ -64,16 +53,16 @@ if Fuse DEVEL; then _F_scm_url="git://anongit.freedesktop.org/mesa/mesa" Finclude scm else - source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2";) - sha1sums=('b1d2b397581e807bc59be5065a8c73c3fda29dd6') + source=("ftp://ftp.freedesktop.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz";) + sha1sums=('55326a6bedd80188338575df7f07a51829626974') fi subpkgs=('libgl' 'mesa-libgl-headers') subdescs=('Mesa DRI OpenGL files.' 'Mesa OpenGL headers files.') -subprovides=('mesa-libgl' 'libgl-headers') -subreplaces=('' '') -subconflicts=('catalyst nvidia' 'nvidia') -subdepends=('expat libxdamage libxxf86vm libdrm libxshmfence libxcb' 'dri2proto dri3proto glproto presentproto') +subprovides=('mesa-libgl libegl' 'libgl-headers') +subreplaces=('libegl' '' ) +subconflicts=('libegl catalyst nvidia' 'nvidia') +subdepends=('expat libxdamage libxxf86vm libdrm>=2.4.59 libxshmfence libxcb' 'dri2proto dri3proto glproto presentproto') subrodepends=("mesa-libgl-headers>=$pkgver-$pkgrel libglapi libglx>=$xserverver mesa-dri-drivers>=$pkgver-$pkgrel" '') subgroups=('x11' 'x11') subarchs=("${archs[*]}" "${archs[*]}") @@ -84,7 +73,7 @@ subdescs=("${subdescs[@]}" 'Mesa OpenGL DRI drivers.') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" "libdrm llvm>=3.4.2-2 elfutils") +subdepends=("${subdepends[@]}" "libdrm>=2.4.59 llvm>=3.6.0 elfutils") subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -95,7 +84,7 @@ subdescs+=('Mesa libdrm drivers.') subprovides+=('') subreplaces+=('') subconflicts+=('') -subdepends+=("libdrm llvm>=3.4.2-2 elfutils") +subdepends+=("libdrm>=2.4.59 llvm>=3.6.0 elfutils") subrodepends+=('') subgroups+=('x11') subarchs+=("${archs[*]}") @@ -128,7 +117,7 @@ subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries.') subprovides=("${subprovides[@]}" 'mesa-libgles') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" 'libdrm') +subdepends=("${subdepends[@]}" 'libdrm>=2.4.59') subrodepends=("${subrodepends[@]}" 'libglapi khr-headers') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -145,27 +134,22 @@ subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -if Fuse EGL; then - subpkgs+=('libegl') - subdescs+=('Mesa OpenEGL library.') - subprovides+=('mesa-libegl') - subreplaces+=('') - subconflicts+=('') - subdepends+=('dri2proto dri3proto glproto presentproto libdrm elfutils') - if Fuse WAYLAND_EGL; then # Upstream issue - subrodepends+=('khr-headers libgbm libvg wayland') - else - subrodepends+=('khr-headers libgbm libvg') - fi - subgroups+=('x11') - subarchs+=("${archs[*]}") - subbackup+=('') -fi +subpkgs=("${subpkgs[@]}" 'libva-mesa-driver') +subdescs=("${subdescs[@]}" 'VA-API implementation for gallium') +subprovides=("${subprovides[@]}" '') +subreplaces=("${subreplaces[@]}" '') +subconflicts=("${subconflicts[@]}" '') +subdepends=("${subdepends[@]}" 'libva') +subrodepends=("${subrodepends[@]}" '') +subgroups=("${subgroups[@]}" 'x11') +subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') if Fuse OPENCL; then subpkgs+=('libcl') - subdescs+=('Mesa OpenEGL library.') + subdescs+=('Mesa OpenCL library.') subprovides+=('mesa-libcl') + makedepends+=('clang') subreplaces+=('') subconflicts+=('') subdepends+=('libclc') @@ -181,7 +165,7 @@ if Fuse VDPAU; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends=("${subdepends[@]}" 'libvdpau libdrm llvm>=3.4.2-2 elfutils') + subdepends=("${subdepends[@]}" 'libvdpau libdrm>=2.4.59 llvm>=3.6.0 elfutils') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -225,7 +209,7 @@ build() { Funpack_scm fi - Fcd $origname-$pkgver + Fcd Fpatchall Fautoreconf @@ -290,8 +274,6 @@ build() { if Fuse VG; then Fconfopts+=" --enable-openvg" - else - Fconfopts+=" --disable-openvg" fi if Fuse XA; then @@ -311,16 +293,12 @@ build() { Fconfopts+=" --with-dri-drivers=no" 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" + EGL_PLATFORMS="drm,x11" + if Fuse WAYLAND_EGL; then + EGL_PLATFORMS+=",wayland" fi + Fconfopts+=" --with-egl-platforms=$EGL_PLATFORMS" + Fconfopts+=" --enable-egl" if Fuse GALLIUM; then if [ "$CARCH" != arm ]; then @@ -331,12 +309,7 @@ build() { GALLIUM_DRIVERS+=",svga" GALLIUM_DRIVERS+=",swrast" Fconfopts+=" --with-gallium-drivers=$GALLIUM_DRIVERS" - Fconfopts+=" --enable-gallium-g3dvl" - Fconfopts+=" --enable-gallium-gbm" Fconfopts+=" --enable-gallium-llvm" - if Fuse EGL; then - Fconfopts+=" --enable-gallium-egl" - fi if Fuse OSMESA; then Fconfopts+=" --enable-gallium-osmesa" fi @@ -365,9 +338,11 @@ build() { Fsplit libglapi usr/lib/libglapi.* Fsplit libgbm usr/include/gbm.h - Fsplit libgbm usr/lib/gbm/ - Fsplit libgbm usr/lib/libgbm.* - Fsplit libgbm usr/lib/pkgconfig/gbm.pc + Fsplit libgbm usr/lib/libgbm.la + Fsplit libgbm usr/lib/libgbm.so.1.0.0 + Fsplit libgbm usr/lib/libgbm.so + Fsplit libgbm usr/lib/libgbm.so.1 + Fsplit libgbm usr/lib/pkgconfig/gbm.pc Fsplit libgl usr/lib/libGL.* Fsplit libgl usr/lib/pkgconfig/gl.pc @@ -375,6 +350,8 @@ build() { Fsplit mesa-libgl-headers usr/include/GL/{gl.h,glext.h,glx.h,glxext.h} Fsplit mesa-libgl-headers usr/include/GL/internal + Fsplit libva-mesa-driver usr/lib/dri/gallium_drv_video.so + Fsplit mesa-dri-drivers etc/drirc Fsplit mesa-dri-drivers usr/lib/dri/ Fsplit mesa-dri-drivers usr/lib/pkgconfig/dri.pc @@ -383,16 +360,10 @@ build() { 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.* - Fsplit libegl usr/lib/egl/ - Fsplit libegl usr/lib/pkgconfig/egl.pc - fi - if Fuse GLES1 || Fuse GLES2; then Fsplit libgles usr/include/GLES*/ Fsplit libgles usr/lib/libGLES* @@ -400,9 +371,8 @@ build() { fi if Fuse OPENCL; then - Fsplit libcl usr/include/CL*/ - Fsplit libcl usr/lib/libCL* - Fsplit libcl usr/lib/pkgconfig/cl.pc + Fsplit libcl/etc/OpenCL + Fsplit libcl usr/lib/libMesaOpenCL* fi if Fuse OSMESA; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
