Date: Saturday, June 22, 2013 @ 13:11:11 Author: lcarlier Revision: 93023
archrelease: copy trunk to multilib-x86_64 Deleted: lib32-mesa/repos/multilib-x86_64/PKGBUILD lib32-mesa/repos/multilib-x86_64/git-fixes.patch -----------------+ PKGBUILD | 137 ------------------------------------------------------ git-fixes.patch | 52 -------------------- 2 files changed, 189 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-06-22 11:11:03 UTC (rev 93022) +++ PKGBUILD 2013-06-22 11:11:11 UTC (rev 93023) @@ -1,137 +0,0 @@ -# $Id$ -# Contributor: Jan de Groot <j...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> - -pkgbase=lib32-mesa -pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl') -pkgver=9.1.3 -pkgrel=2 -arch=('x86_64') -makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'lib32-libxxf86vm' 'lib32-libxdamage' - 'gcc-multilib' 'lib32-llvm-amdgpu-snapshot' 'lib32-systemd') -url="http://mesa3d.sourceforge.net" -license=('custom') -options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - CVE-2013-1993.patch) -md5sums=('952ccd03547ed72333b64e1746cf8ada' - 'dc8dad7c9bc6a92bd9c33b27b9da825e') - -prepare() { - cd ${srcdir}/?esa-* - - # fix CVE-2013-1993 merged upstream - patch -Np1 -i ${srcdir}/CVE-2013-1993.patch -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - export LLVM_CONFIG=/usr/bin/llvm-config32 - - cd ${srcdir}/?esa-* - - # our automake is far too new for their build system :) - autoreconf -vfi - - ./configure --enable-32-bit \ - --libdir=/usr/lib32 \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-llvm-shared-libs \ - --enable-gallium-llvm \ - --enable-egl \ - --enable-gallium-egl \ - --with-egl-platforms=x11,drm \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-texture-float - make - - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install -} - -package_lib32-ati-dri() { - pkgdesc="Mesa drivers for AMD/ATI Radeon (32-bit)" - depends=("lib32-mesa-libgl=${pkgver}" 'ati-dri') - conflicts=('xf86-video-ati<6.9.0-6') - - install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/ - - install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib32/gallium-pipe/ - - install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" - ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri" -} - -package_lib32-intel-dri() { - pkgdesc="Mesa DRI drivers for Intel (32-bit)" - depends=("lib32-mesa-libgl=${pkgver}" 'intel-dri') - - install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/ - - install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" - ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri" -} - -package_lib32-nouveau-dri() { - pkgdesc="Mesa drivers for Nouveau (32-bit)" - depends=("lib32-mesa-libgl=${pkgver}" 'nouveau-dri') - - install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib32/xorg/modules/dri/ - - install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib32/gallium-pipe/ - - install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" - ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri" -} - -package_lib32-mesa() { - pkgdesc="an open-source implementation of the OpenGL specification (32-bit)" - depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-systemd' 'lib32-llvm-amdgpu-lib-snapshot' 'mesa') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl') - conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl') - replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl') - - mv -v ${srcdir}/fakeinstall/* ${pkgdir} - mv ${pkgdir}/usr/lib32/libGL.so.1.2.0 ${pkgdir}/usr/lib32/mesa-libGL.so.1.2.0 - rm ${pkgdir}/usr/lib32/libGL.so{,.1} - rm -r ${pkgdir}/etc - rm -r ${pkgdir}/usr/include - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" -} - -package_lib32-mesa-libgl() { - pkgdesc="Mesa 3-D graphics library (32-bit)" - depends=("lib32-mesa=${pkgver}") - provides=("lib32-libgl=${pkgver}") - replaces=('lib32-libgl') - - install -m755 -d ${pkgdir}/usr/lib32 - - ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so - ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1 - ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0 - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" -} Deleted: git-fixes.patch =================================================================== --- git-fixes.patch 2013-06-22 11:11:03 UTC (rev 93022) +++ git-fixes.patch 2013-06-22 11:11:11 UTC (rev 93023) @@ -1,52 +0,0 @@ -From 17f1cb1d99e66227d1e05925ef937643f5c1089a Mon Sep 17 00:00:00 2001 -From: Jan de Groot <j...@jgc.homeip.net> -Date: Thu, 07 Mar 2013 18:48:13 +0000 -Subject: dri/nouveau: fix crash in nouveau_flush - -https://bugs.freedesktop.org/show_bug.cgi?id=61947 - -Note: this is a candidate for the stable branches ---- -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c -index f56b3b2..6c119d5 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c -@@ -69,7 +69,8 @@ nouveau_flush(struct gl_context *ctx) - __DRIdri2LoaderExtension *dri2 = screen->dri2.loader; - __DRIdrawable *drawable = nctx->dri_context->driDrawablePriv; - -- dri2->flushFrontBuffer(drawable, drawable->loaderPrivate); -+ if (drawable && drawable->loaderPrivate) -+ dri2->flushFrontBuffer(drawable, drawable->loaderPrivate); - } - } - --- -cgit v0.9.0.2-2-gbebe -From e062a4187d8ea518a39c913ae7562cf1d8ac3205 Mon Sep 17 00:00:00 2001 -From: Tapani Pälli <tapani.pa...@intel.com> -Date: Mon, 28 Jan 2013 06:53:56 +0000 -Subject: intel: Fix regression in intel_create_image_from_name stride handling - -Strangely, the DRIimage interface we have passes the pitch in pixels -instead of bytes, which anholt missed in the change to using bytes for -region pitch. - -Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> -Reviewed-by: Eric Anholt <e...@anholt.net> ---- -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index defcd73..d223a0b 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -377,7 +377,7 @@ intel_create_image_from_name(__DRIscreen *screen, - cpp = _mesa_get_format_bytes(image->format); - image->region = intel_region_alloc_for_handle(intelScreen, - cpp, width, height, -- pitch, name, "image"); -+ pitch * cpp, name, "image"); - if (image->region == NULL) { - free(image); - return NULL; --- -cgit v0.9.0.2-2-gbebe