[arch-commits] Commit in libdrm/trunk (PKGBUILD no-pthread-stubs.patch)

[andyrtr at archlinux.org]

    Date: Saturday, January 7, 2012 @ 17:20:27
  Author: andyrtr
Revision: 146278

upgpkg: libdrm 2.4.30-1

upstream update 2.4.30

Modified:
  libdrm/trunk/PKGBUILD
  libdrm/trunk/no-pthread-stubs.patch

------------------------+
 PKGBUILD               |   14 +++++++-------
 no-pthread-stubs.patch |   12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-07 21:39:13 UTC (rev 146277)
+++ PKGBUILD	2012-01-07 22:20:27 UTC (rev 146278)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at 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 @@
 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

Modified: no-pthread-stubs.patch
===================================================================
--- no-pthread-stubs.patch	2012-01-07 21:39:13 UTC (rev 146277)
+++ no-pthread-stubs.patch	2012-01-07 22:20:27 UTC (rev 146278)
@@ -14,7 +14,7 @@
  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 @@
  	$(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 @@