Date: Saturday, October 6, 2012 @ 15:22:28 Author: andyrtr Revision: 168197
upgpkg: mesa 8.99.git_20121006-1 update snapshot Modified: mesa/trunk/PKGBUILD Deleted: mesa/trunk/pthread_fix.diff ------------------+ PKGBUILD | 13 ++++--------- pthread_fix.diff | 23 ----------------------- 2 files changed, 4 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-10-06 19:00:28 UTC (rev 168196) +++ PKGBUILD 2012-10-06 19:22:28 UTC (rev 168197) @@ -6,7 +6,7 @@ pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') _git=true -_gitdate=20121005 +_gitdate=20121006 #_git=false if [ "${_git}" = "true" ]; then @@ -21,27 +21,22 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(LICENSE - pthread_fix.diff) +source=(LICENSE) if [ "${_git}" = "true" ]; then # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz") + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-7851d398def2df3f6836a500d67123eed50f3943.tar.gz") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '03956ac54a44467678120f485b626633' - '52760839a596df5058fcbb63a2bb10da') + '87039abd49bc7ada45f98cf752b9f45b') build() { cd ${srcdir}/?esa-* - # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b - patch -Np1 -i ${srcdir}/pthread_fix.diff - COMMONOPTS="--prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ Deleted: pthread_fix.diff =================================================================== --- pthread_fix.diff 2012-10-06 19:00:28 UTC (rev 168196) +++ pthread_fix.diff 2012-10-06 19:22:28 UTC (rev 168197) @@ -1,23 +0,0 @@ -From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001 -From: Matt Turner <matts...@gmail.com> -Date: Thu, 27 Sep 2012 22:49:52 +0000 -Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty - ---- -diff --git a/configure.ac b/configure.ac -index 770df2f..dc2720d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[], - - dnl Check for pthreads - AX_PTHREAD -+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS -+dnl to -pthread, which causes problems if we need -lpthread to appear in -+dnl pkgconfig files. -+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" - - dnl SELinux awareness. - AC_ARG_ENABLE([selinux], --- -cgit v0.9.0.2-2-gbebe