lib32-libdrm updated

This commit is contained in:
Mateusz 2012-07-22 13:15:32 +00:00
parent 2c7fedcd47
commit 096aba1773
2 changed files with 45 additions and 41 deletions

View File

@ -5,8 +5,8 @@
_pkgbasename=libdrm
pkgname=lib32-$_pkgbasename
pkgver=2.4.27
pkgrel=2
pkgver=2.4.37
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services (32-bit)"
arch=(x86_64)
license=('custom')
@ -17,8 +17,8 @@ url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
no-pthread-stubs.patch)
sha1sums=('f5b40d30a7f2bfa369ab9b3bd9a0aa844a7f1e16'
'ea97a698fa545b8b560c64015cc45efa7fe7417b')
sha1sums=('fa8463e390eee9b589dc369abc4cbe3e4ef16d16'
'd7b0e03185a4edd322925440286c9e71e6fcef30')
build() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"

View File

@ -1,6 +1,6 @@
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
diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
--- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000
+++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000
@@ -47,10 +47,6 @@
LT_INIT([disable-static])
@ -9,29 +9,50 @@ 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)
--- 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 @@
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
AC_ARG_ENABLE([udev],
diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
--- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000
+++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000
@@ -26,7 +26,6 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
- $(PTHREADSTUBS_CFLAGS) \
$(PCIACCESS_CFLAGS) \
$(VALGRIND_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
@@ -35,7 +34,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
diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
--- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000
+++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000
@@ -2,14 +2,13 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/nouveau \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm \
-DDEBUG
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
libdrm_nouveau_ladir = $(libdir)
libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_nouveau_la_LIBADD = ../libdrm.la
libdrm_nouveau_la_SOURCES = nouveau.c \
pushbuf.c \
diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
--- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000
+++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000
@@ -26,13 +26,12 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
@ -47,20 +68,3 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
libdrm_radeon_la_SOURCES = \
radeon_bo_gem.c \
--- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000
@@ -2,13 +2,12 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/nouveau \
- $(PTHREADSTUBS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
libdrm_nouveau_ladir = $(libdir)
libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+libdrm_nouveau_la_LIBADD = ../libdrm.la
libdrm_nouveau_la_SOURCES = \
nouveau_device.c \