Date: Tuesday, July 2, 2013 @ 11:23:11 Author: lcarlier Revision: 93355
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-libdrm/repos/multilib-testing-x86_64/ lib32-libdrm/repos/multilib-testing-x86_64/PKGBUILD (from rev 93354, lib32-libdrm/trunk/PKGBUILD) lib32-libdrm/repos/multilib-testing-x86_64/no-pthread-stubs.patch (from rev 93354, lib32-libdrm/trunk/no-pthread-stubs.patch) ------------------------+ PKGBUILD | 51 +++++++++++++++++++ no-pthread-stubs.patch | 121 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) Copied: lib32-libdrm/repos/multilib-testing-x86_64/PKGBUILD (from rev 93354, lib32-libdrm/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2013-07-02 09:23:11 UTC (rev 93355) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Jan de Groot <j...@archlinux.org> + +_pkgbasename=libdrm +pkgname=lib32-$_pkgbasename +pkgver=2.4.46 +pkgrel=1 +pkgdesc="Userspace interface to kernel DRM services (32-bit)" +arch=(x86_64) +license=('custom') +depends=('lib32-libpciaccess' $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool') +url="http://dri.freedesktop.org/" +source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 + no-pthread-stubs.patch) +sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1' + 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab') + +prepare() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" +} + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # libtoolize --force + autoreconf --force --install + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --enable-udev + + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} + Copied: lib32-libdrm/repos/multilib-testing-x86_64/no-pthread-stubs.patch (from rev 93354, lib32-libdrm/trunk/no-pthread-stubs.patch) =================================================================== --- multilib-testing-x86_64/no-pthread-stubs.patch (rev 0) +++ multilib-testing-x86_64/no-pthread-stubs.patch 2013-07-02 09:23:11 UTC (rev 93355) @@ -0,0 +1,121 @@ +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]) + + +-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) +-AC_SUBST(PTHREADSTUBS_CFLAGS) +-AC_SUBST(PTHREADSTUBS_LIBS) +- + 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 +@@ -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@ + +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) \ + -I$(top_srcdir)/radeon \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la + libdrm_radeon_ladir = $(libdir) + libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined +-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_radeon_la_LIBADD = ../libdrm.la + + libdrm_radeon_la_SOURCES = \ + radeon_bo_gem.c \ +--- libdrm-2.4.40/omap/Makefile.am 2012-06-14 23:32:50.000000000 +0200 ++++ libdrm-2.4.40/omap/Makefile.am 2012-11-06 19:24:44.183224706 +0100 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/omap \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_omap_la_LTLIBRARIES = libdrm_omap.la + libdrm_omap_ladir = $(libdir) + libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_omap_la_LIBADD = ../libdrm.la + + libdrm_omap_la_SOURCES = omap_drm.c + +--- libdrm-2.4.40/exynos/Makefile.am 2012-06-14 23:32:50.000000000 +0200 ++++ libdrm-2.4.40/exynos/Makefile.am 2012-11-06 19:26:01.975323106 +0100 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/exynos \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la + libdrm_exynos_ladir = $(libdir) + libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_exynos_la_LIBADD = ../libdrm.la + + libdrm_exynos_la_SOURCES = exynos_drm.c + +--- libdrm-2.4.44/freedreno/Makefile.am 2013-04-19 00:59:07.000000000 +0200 ++++ libdrm-2.4.44/freedreno/Makefile.am.new 2013-04-19 17:19:03.153950143 +0200 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/freedreno \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la + libdrm_freedreno_ladir = $(libdir) + libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_freedreno_la_LIBADD = ../libdrm.la + + libdrm_freedreno_la_SOURCES = \ + freedreno_device.c \