[arch-commits] Commit in lib32-libdrm/repos/multilib-x86_64 (5 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Thu Mar 28 00:23:09 UTC 2013
Date: Thursday, March 28, 2013 @ 01:23:08
Author: lcarlier
Revision: 87143
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libdrm/repos/multilib-x86_64/PKGBUILD
(from rev 87142, lib32-libdrm/trunk/PKGBUILD)
lib32-libdrm/repos/multilib-x86_64/no-pthread-stubs.patch
(from rev 87142, lib32-libdrm/trunk/no-pthread-stubs.patch)
Deleted:
lib32-libdrm/repos/multilib-x86_64/PKGBUILD
lib32-libdrm/repos/multilib-x86_64/buildfix.diff
lib32-libdrm/repos/multilib-x86_64/no-pthread-stubs.patch
------------------------+
PKGBUILD | 98 +++++++++++-----------
buildfix.diff | 11 --
no-pthread-stubs.patch | 208 +++++++++++++++++++++++------------------------
3 files changed, 154 insertions(+), 163 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-28 00:22:51 UTC (rev 87142)
+++ PKGBUILD 2013-03-28 00:23:08 UTC (rev 87143)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.42
-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=('e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1'
- '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
-
- # libtoolize --force
- autoreconf --force --install
- ./configure --prefix=/usr --libdir=/usr/lib32 \
- --enable-udev \
- --enable-omap-experimental-api \
- --enable-vmwgfx-experimental-api
- 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-x86_64/PKGBUILD (from rev 87142, lib32-libdrm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-03-28 00:23:08 UTC (rev 87143)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=libdrm
+pkgname=lib32-$_pkgbasename
+pkgver=2.4.43
+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=('7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975'
+ '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded')
+
+build() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
+
+ # libtoolize --force
+ autoreconf --force --install
+ ./configure --prefix=/usr --libdir=/usr/lib32 \
+ --enable-udev \
+ --enable-omap-experimental-api \
+ # --enable-exynos-experimental-api \
+ # --enable-freedreno-experimental-api
+
+ 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"
+}
+
Deleted: buildfix.diff
===================================================================
--- buildfix.diff 2013-03-28 00:22:51 UTC (rev 87142)
+++ buildfix.diff 2013-03-28 00:23:08 UTC (rev 87143)
@@ -1,11 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 10cc9a4..1776610 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
- tests/vbltest/Makefile
- include/Makefile
- include/drm/Makefile
-- man/Makefile
- libdrm.pc])
- AC_OUTPUT
Deleted: no-pthread-stubs.patch
===================================================================
--- no-pthread-stubs.patch 2013-03-28 00:22:51 UTC (rev 87142)
+++ no-pthread-stubs.patch 2013-03-28 00:23:08 UTC (rev 87143)
@@ -1,104 +0,0 @@
-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
-
Copied: lib32-libdrm/repos/multilib-x86_64/no-pthread-stubs.patch (from rev 87142, lib32-libdrm/trunk/no-pthread-stubs.patch)
===================================================================
--- no-pthread-stubs.patch (rev 0)
+++ no-pthread-stubs.patch 2013-03-28 00:23:08 UTC (rev 87143)
@@ -0,0 +1,104 @@
+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
+
More information about the arch-commits
mailing list