diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
| commit | aa49e201b1464851bcebcd821592a2fceeaddcbc (patch) | |
| tree | 40708e916d04d7929b2bc2a8c17c796fb91dec8e /extra/libdrm | |
| parent | e555324330bef021c747085c7499fd843ed20f47 (diff) | |
| parent | 39e662ccfbe62ae77d458159d192816171a22f43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/agave/PKGBUILD
community/raul/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/gdk-pixbuf2/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-documents/gnome-documents.install
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/metacity/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/telepathy-farstream/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
testing/iproute2/PKGBUILD
testing/openssh/PKGBUILD
Diffstat (limited to 'extra/libdrm')
| -rw-r--r-- | extra/libdrm/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/libdrm/no-pthread-stubs.patch | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index cef678c8a..18a858222 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 149819 2012-02-11 08:51:30Z andyrtr $ +# $Id: PKGBUILD 153938 2012-03-20 20:33:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.31 +pkgver=2.4.32 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') depends=('glibc' 'libpciaccess') -makedepends=('cairo') +makedepends=('cairo' 'valgrind') options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 @@ -16,9 +16,9 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 COPYING # git_fixes.diff ) -md5sums=('b8cf744ec113c6028fe0975b1133b649' - 'fb8a15bf4aff5646c517373e8277f440' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') +sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842' + '825ff5e0c4238b31bdea52f104bfec8949270e25' + 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 03bb66953..5430244f9 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/libdrm/no-pthread-stubs.patch @@ -9,9 +9,9 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) - AC_SUBST(PCIACCESS_CFLAGS) - AC_SUBST(PCIACCESS_LIBS) + pkgconfigdir=${libdir}/pkgconfig + AC_SUBST(pkgconfigdir) + AC_ARG_ENABLE([udev], --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 @@ -26,7 +26,6 @@ |