summaryrefslogtreecommitdiffstats
path: root/abs/core/libdrm
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-08-06 05:21:27 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-08-06 05:21:27 (GMT)
commit7a18aa65cbe27c5213df0f2642e381bc0a2d5e03 (patch)
tree6b8206f2ee5f9bdd0950c276bbad5685c203dbb4 /abs/core/libdrm
parentfd8ebb392cd04e7c59ae0dd696d93f0ef509b89c (diff)
parent5b37c394102e30e4751fd925dae8c299bc4432df (diff)
downloadlinhes_pkgbuild-7a18aa65cbe27c5213df0f2642e381bc0a2d5e03.zip
linhes_pkgbuild-7a18aa65cbe27c5213df0f2642e381bc0a2d5e03.tar.gz
linhes_pkgbuild-7a18aa65cbe27c5213df0f2642e381bc0a2d5e03.tar.bz2
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/libdrm')
-rw-r--r--abs/core/libdrm/PKGBUILD10
-rw-r--r--abs/core/libdrm/no-pthread-stubs.patch21
2 files changed, 16 insertions, 15 deletions
diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD
index b93c2dd..aa350d5 100644
--- a/abs/core/libdrm/PKGBUILD
+++ b/abs/core/libdrm/PKGBUILD
@@ -2,20 +2,20 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.25
+pkgver=2.4.26
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
license=('custom')
-depends=('glibc')
+depends=('glibc' 'libpciaccess')
options=('!libtool')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
no-pthread-stubs.patch
COPYING)
-sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194'
- 'af2d9871565ea4cf524873f897691a18b2bba944'
- 'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
+md5sums=('062569426773f69b11a47a7712bba770'
+ 'c722c8406507b7e3a8da7a3030d1d9cf'
+ 'ba65e71c481b94ef0fb6c23c7f21ffa1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch
index 6602f87..348c2a7 100644
--- a/abs/core/libdrm/no-pthread-stubs.patch
+++ b/abs/core/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 @@