summaryrefslogtreecommitdiff
path: root/multilib/lib32-libdrm
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-08-03 23:14:34 +0000
committerroot <root@rshg054.dnsready.net>2011-08-03 23:14:34 +0000
commit8c2359e2541f9d1b11443b49d8ea502b3ffea39c (patch)
tree035176ef2ab4dbaabda40150109c203887d83ed7 /multilib/lib32-libdrm
parent991d38faccf4e1fb27f31f236ad58ee840103734 (diff)
Wed Aug 3 23:14:34 UTC 2011
Diffstat (limited to 'multilib/lib32-libdrm')
-rw-r--r--multilib/lib32-libdrm/PKGBUILD10
-rw-r--r--multilib/lib32-libdrm/no-pthread-stubs.patch21
2 files changed, 16 insertions, 15 deletions
diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD
index b5f53389b..af9a69114 100644
--- a/multilib/lib32-libdrm/PKGBUILD
+++ b/multilib/lib32-libdrm/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 45000 2011-04-14 07:44:44Z lcarlier $
+# $Id: PKGBUILD 51388 2011-07-08 06:50:28Z lcarlier $
# Contributor: Jan de Groot <jgc@archlinux.org>
_pkgbasename=libdrm
pkgname=lib32-$_pkgbasename
-pkgver=2.4.25
+pkgver=2.4.26
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services (32-bit)"
arch=(x86_64)
license=('custom')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-libpciaccess' $_pkgbasename)
makedepends=(gcc-multilib)
options=('!libtool')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
no-pthread-stubs.patch)
-sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194'
- 'af2d9871565ea4cf524873f897691a18b2bba944')
+sha1sums=('e7215e804bbd30e42132d3df874122d2f6a9c929'
+ 'ea97a698fa545b8b560c64015cc45efa7fe7417b')
build() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/multilib/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch
index 6602f8785..348c2a795 100644
--- a/multilib/lib32-libdrm/no-pthread-stubs.patch
+++ b/multilib/lib32-libdrm/no-pthread-stubs.patch
@@ -1,34 +1,35 @@
diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
-@@ -32,10 +32,6 @@
- AC_HEADER_STDC
- AC_SYS_LARGEFILE
+@@ -47,10 +47,6 @@
+ LT_INIT([disable-static])
+
-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
-AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS)
-
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev],
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+ AC_SUBST(PCIACCESS_CFLAGS)
+ AC_SUBST(PCIACCESS_LIBS)
--- 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,13 +26,12 @@
+@@ -26,14 +26,13 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
- $(PTHREADSTUBS_CFLAGS) \
+ $(PCIACCESS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
-+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
+-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \
- intel_atomic.h \
+ intel_bufmgr.c \
--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
@@ -26,13 +26,12 @@