diff options
author | root <root@rshg054.dnsready.net> | 2012-01-08 23:14:45 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-01-08 23:14:45 +0000 |
commit | 46783b68621b6ad45cdd9ed64cfa8cdcfbc6f318 (patch) | |
tree | eb2bd0aa427b4ad1659249fa8b86467dcd68e0dc /multilib-testing | |
parent | 6aeb515f4afd10afb53b21df18d03b0d5f3a200f (diff) |
Sun Jan 8 23:14:45 UTC 2012
Diffstat (limited to 'multilib-testing')
-rw-r--r-- | multilib-testing/lib32-libdrm/PKGBUILD | 15 | ||||
-rw-r--r-- | multilib-testing/lib32-libdrm/no-pthread-stubs.patch | 12 |
2 files changed, 13 insertions, 14 deletions
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD index 3de818449..d5c5c69f7 100644 --- a/multilib-testing/lib32-libdrm/PKGBUILD +++ b/multilib-testing/lib32-libdrm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60770 2011-12-17 17:08:38Z lcarlier $ +# $Id: PKGBUILD 61806 2012-01-07 23:05:50Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> _pkgbasename=libdrm pkgname=lib32-$_pkgbasename -pkgver=2.4.29 +pkgver=2.4.30 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services (32-bit)" arch=(x86_64) @@ -13,11 +13,10 @@ makedepends=(gcc-multilib) options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - no-pthread-stubs.patch - git_fixes.diff) -md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953' - 'c722c8406507b7e3a8da7a3030d1d9cf' - 'aebd5336568090b8ec084fabcfb08071') + no-pthread-stubs.patch) +# git_fixes.diff) +md5sums=('9f57a68b2c0836b55ebcbc241f6ca175' + '0c423f6f886a3a8d6a8834224de95bcf') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" @@ -29,7 +28,7 @@ build() { 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/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch index 348c2a795..6ad4a48ee 100644 --- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch +++ b/multilib-testing/lib32-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 @@ |