summaryrefslogtreecommitdiff
path: root/extra/libdrm
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-01-10 23:15:00 +0000
committerroot <root@rshg054.dnsready.net>2012-01-10 23:15:00 +0000
commitb8012183bbaae70ce4a714c618a967e85df9f521 (patch)
tree1df6f612c4f75faa9f54467e0a856bcdde0b6a1a /extra/libdrm
parentfdcaf644692e151ddc596b148465ce4a77e6b670 (diff)
Tue Jan 10 23:14:59 UTC 2012
Diffstat (limited to 'extra/libdrm')
-rw-r--r--extra/libdrm/PKGBUILD16
-rw-r--r--extra/libdrm/no-pthread-stubs.patch12
2 files changed, 14 insertions, 14 deletions
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 94c51c177..866be38b3 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145190 2011-12-19 12:35:11Z andyrtr $
+# $Id: PKGBUILD 146314 2012-01-09 15:57:26Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.29
+pkgver=2.4.30
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
@@ -14,18 +14,18 @@ url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
no-pthread-stubs.patch
COPYING
- git_fixes.diff)
-md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
- 'c722c8406507b7e3a8da7a3030d1d9cf'
- 'ba65e71c481b94ef0fb6c23c7f21ffa1'
- 'aebd5336568090b8ec084fabcfb08071')
+# git_fixes.diff
+)
+md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
+ 'fb8a15bf4aff5646c517373e8277f440'
+ 'ba65e71c481b94ef0fb6c23c7f21ffa1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
# git fixes - currently none
- patch -Np1 -i ${srcdir}/git_fixes.diff
+# patch -Np1 -i ${srcdir}/git_fixes.diff
#libtoolize --force
autoreconf --force --install
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 348c2a795..03bb66953 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -14,7 +14,7 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
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,14 +26,13 @@
+@@ -26,7 +26,6 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
@@ -22,14 +22,14 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
$(PCIACCESS_CFLAGS) \
-I$(top_srcdir)/include/drm
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
+@@ -34,7 +33,6 @@
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--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_LIBADD = ../libdrm.la \
+- @PTHREADSTUBS_LIBS@ \
+ @PCIACCESS_LIBS@ \
+ @CLOCK_LIB@
- libdrm_intel_la_SOURCES = \
- 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 @@