diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
| commit | 2906c522e750f7e013d7af606f01ad849a7d3876 (patch) | |
| tree | d62491c93d6534817db7f9b7d07adf64b9670b48 /extra/mesa | |
| parent | 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff) | |
| parent | bd614ac21d2754d778a796cd5e92d1568ec8baec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mesa/PKGBUILD
extra/nmap/PKGBUILD
extra/openmpi/PKGBUILD
extra/rasqal/PKGBUILD
extra/sqlite/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-hooks-udev
testing/udev/initcpio-install-udev
Diffstat (limited to 'extra/mesa')
| -rw-r--r-- | extra/mesa/PKGBUILD | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index cd68b1608..ccb56dd53 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154038 2012-03-21 20:31:55Z andyrtr $ +# $Id: PKGBUILD 159247 2012-05-19 08:19:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel') -[[ "$CARCH" != "mips64el" ]] && pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') +pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') +[[ "$CARCH" != "mips64el" ]] && pkgname+=( 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') #_git=true _gitdate=20111031 @@ -14,7 +14,7 @@ if [ "${_git}" = "true" ]; then pkgver=7.10.99.git20110709 #pkgver=7.11 else - pkgver=8.0.2 + pkgver=8.0.3 fi pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -35,9 +35,6 @@ if [ "${_git}" = "true" ]; then ) fi source+=(mesa-loongson.patch) -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'a368104e5700707048dc3e8691a9a7a1' - '598c24dccfcdcc99c07d883f7c09f36a') build() { cd ${srcdir}/?esa-* @@ -53,7 +50,8 @@ if [ "${_git}" = "true" ]; then autoreconf -vfi ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-egl --enable-shared-glapi\ + --enable-shared-glapi \ + --enable-gbm \ --enable-glx-tls \ --enable-glx \ --enable-osmesa \ @@ -64,13 +62,15 @@ if [ "${_git}" = "true" ]; then --enable-xa \ $extraconf + #--enable-gbm \ # --enable-gallium-svga \ else autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-egl --enable-shared-glapi\ + --enable-shared-glapi \ + --enable-gbm \ --enable-glx-tls \ --enable-glx \ --enable-osmesa \ @@ -132,6 +132,20 @@ package_libglapi() { install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" } +package_libgbm() { + depends=('glibc') + pkgdesc="Mesa gbm library" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib" + bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" +} + package_libgles() { depends=('libglapi' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" @@ -200,11 +214,12 @@ package_mesa() { rm -f "${pkgdir}/usr/lib/libGL.so"* rm -f "${pkgdir}/usr/lib/libglapi.so"* + rm -f "${pkgdir}/usr/lib/libgbm.so"* rm -f "${pkgdir}/usr/lib/libGLESv"* rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" rm -f "${pkgdir}/usr/lib/libOSMesa"* - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc} + rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} rm -rf "${pkgdir}/usr/lib/xorg" rm -f "${pkgdir}/usr/include/GL/glew.h" rm -f "${pkgdir}/usr/include/GL/glxew.h" |