diff options
Diffstat (limited to 'multilib')
-rw-r--r-- | multilib/lib32-libdrm/PKGBUILD | 15 | ||||
-rw-r--r-- | multilib/lib32-libdrm/no-pthread-stubs.patch | 12 | ||||
-rw-r--r-- | multilib/lib32-openssl/PKGBUILD | 10 |
3 files changed, 18 insertions, 19 deletions
diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD index 93f3763a3..60333e3f7 100644 --- a/multilib/lib32-libdrm/PKGBUILD +++ b/multilib/lib32-libdrm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60845 2011-12-19 13:05:47Z lcarlier $ +# $Id: PKGBUILD 61866 2012-01-09 17:59:00Z 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/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch index 348c2a795..6ad4a48ee 100644 --- a/multilib/lib32-libdrm/no-pthread-stubs.patch +++ b/multilib/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 @@ diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD index 17fb9e475..5b2ea447e 100644 --- a/multilib/lib32-openssl/PKGBUILD +++ b/multilib/lib32-openssl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 56738 2011-10-11 15:33:53Z svenstaro $ +# $Id: PKGBUILD 61855 2012-01-09 09:55:54Z bluewind $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> _pkgbasename=openssl pkgname=lib32-$_pkgbasename -_ver=1.0.0d +_ver=1.0.0f # use a pacman compatible version scheme -pkgver=1.0.0.e -pkgrel=2 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' arch=('x86_64') url='https://www.openssl.org' @@ -17,7 +17,7 @@ options=('!makeflags') source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e' +md5sums=('e358705fb4a8827b5e9224a73f442025' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') |