[arch-commits] Commit in libdrm/repos (10 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Fri Apr 19 15:23:18 UTC 2013
Date: Friday, April 19, 2013 @ 17:23:18
Author: andyrtr
Revision: 183258
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libdrm/repos/testing-i686/
libdrm/repos/testing-i686/COPYING
(from rev 183257, libdrm/trunk/COPYING)
libdrm/repos/testing-i686/PKGBUILD
(from rev 183257, libdrm/trunk/PKGBUILD)
libdrm/repos/testing-i686/git_fixes.diff
(from rev 183257, libdrm/trunk/git_fixes.diff)
libdrm/repos/testing-i686/no-pthread-stubs.patch
(from rev 183257, libdrm/trunk/no-pthread-stubs.patch)
libdrm/repos/testing-x86_64/
libdrm/repos/testing-x86_64/COPYING
(from rev 183257, libdrm/trunk/COPYING)
libdrm/repos/testing-x86_64/PKGBUILD
(from rev 183257, libdrm/trunk/PKGBUILD)
libdrm/repos/testing-x86_64/git_fixes.diff
(from rev 183257, libdrm/trunk/git_fixes.diff)
libdrm/repos/testing-x86_64/no-pthread-stubs.patch
(from rev 183257, libdrm/trunk/no-pthread-stubs.patch)
---------------------------------------+
testing-i686/COPYING | 48 ++++++++++++
testing-i686/PKGBUILD | 46 ++++++++++++
testing-i686/git_fixes.diff | 49 ++++++++++++
testing-i686/no-pthread-stubs.patch | 121 ++++++++++++++++++++++++++++++++
testing-x86_64/COPYING | 48 ++++++++++++
testing-x86_64/PKGBUILD | 46 ++++++++++++
testing-x86_64/git_fixes.diff | 49 ++++++++++++
testing-x86_64/no-pthread-stubs.patch | 121 ++++++++++++++++++++++++++++++++
8 files changed, 528 insertions(+)
Copied: libdrm/repos/testing-i686/COPYING (from rev 183257, libdrm/trunk/COPYING)
===================================================================
--- testing-i686/COPYING (rev 0)
+++ testing-i686/COPYING 2013-04-19 15:23:18 UTC (rev 183258)
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
Copied: libdrm/repos/testing-i686/PKGBUILD (from rev 183257, libdrm/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-04-19 15:23:18 UTC (rev 183258)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libdrm
+pkgver=2.4.44
+pkgrel=1
+pkgdesc="Userspace interface to kernel DRM services"
+arch=(i686 x86_64)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('cairo' 'valgrind')
+replaces=('libdrm-new' 'libdrm-nouveau')
+options=('!libtool')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
+ no-pthread-stubs.patch
+ COPYING)
+sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2'
+ 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
+ '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../no-pthread-stubs.patch
+
+ #libtoolize --force
+ autoreconf --force --install
+ ./configure --prefix=/usr \
+ --enable-udev \
+ --enable-omap-experimental-api \
+ --enable-exynos-experimental-api \
+ --enable-freedreno-experimental-api
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+ install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+}
Copied: libdrm/repos/testing-i686/git_fixes.diff (from rev 183257, libdrm/trunk/git_fixes.diff)
===================================================================
--- testing-i686/git_fixes.diff (rev 0)
+++ testing-i686/git_fixes.diff 2013-04-19 15:23:18 UTC (rev 183258)
@@ -0,0 +1,49 @@
+From 99105e765c31b598746b849e66e7a9106dcefa24 Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst at canonical.com>
+Date: Wed, 27 Mar 2013 13:06:43 +0000
+Subject: makefiles: Add missing headers.
+
+I even compile time tested this on a panda with make dist!
+
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
+---
+diff --git a/exynos/Makefile.am b/exynos/Makefile.am
+index 539aea0..0a2663a 100644
+--- a/exynos/Makefile.am
++++ b/exynos/Makefile.am
+@@ -10,7 +10,11 @@ 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_SOURCES = exynos_drm.c exynos_fimg2d.c
++libdrm_exynos_la_SOURCES = \
++ exynos_drm.c \
++ exynos_fimg2d.c \
++ fimg2d.h \
++ fimg2d_reg.h
+
+ libdrm_exynoscommonincludedir = ${includedir}/exynos
+ libdrm_exynoscommoninclude_HEADERS = exynos_drm.h
+diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
+index f46a780..ba9bd68 100644
+--- a/freedreno/Makefile.am
++++ b/freedreno/Makefile.am
+@@ -10,7 +10,15 @@ 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_SOURCES = freedreno_device.c freedreno_pipe.c freedreno_ringbuffer.c freedreno_bo.c
++libdrm_freedreno_la_SOURCES = \
++ freedreno_device.c \
++ freedreno_pipe.c \
++ freedreno_priv.h \
++ freedreno_ringbuffer.c \
++ freedreno_bo.c \
++ kgsl_drm.h \
++ list.h \
++ msm_kgsl.h
+
+ libdrm_freedrenocommonincludedir = ${includedir}/freedreno
+ libdrm_freedrenocommoninclude_HEADERS = freedreno_drmif.h freedreno_ringbuffer.h
+--
+cgit v0.9.0.2-2-gbebe
Copied: libdrm/repos/testing-i686/no-pthread-stubs.patch (from rev 183257, libdrm/trunk/no-pthread-stubs.patch)
===================================================================
--- testing-i686/no-pthread-stubs.patch (rev 0)
+++ testing-i686/no-pthread-stubs.patch 2013-04-19 15:23:18 UTC (rev 183258)
@@ -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 \
Copied: libdrm/repos/testing-x86_64/COPYING (from rev 183257, libdrm/trunk/COPYING)
===================================================================
--- testing-x86_64/COPYING (rev 0)
+++ testing-x86_64/COPYING 2013-04-19 15:23:18 UTC (rev 183258)
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
Copied: libdrm/repos/testing-x86_64/PKGBUILD (from rev 183257, libdrm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-04-19 15:23:18 UTC (rev 183258)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libdrm
+pkgver=2.4.44
+pkgrel=1
+pkgdesc="Userspace interface to kernel DRM services"
+arch=(i686 x86_64)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('cairo' 'valgrind')
+replaces=('libdrm-new' 'libdrm-nouveau')
+options=('!libtool')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
+ no-pthread-stubs.patch
+ COPYING)
+sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2'
+ 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
+ '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../no-pthread-stubs.patch
+
+ #libtoolize --force
+ autoreconf --force --install
+ ./configure --prefix=/usr \
+ --enable-udev \
+ --enable-omap-experimental-api \
+ --enable-exynos-experimental-api \
+ --enable-freedreno-experimental-api
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+ install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+}
Copied: libdrm/repos/testing-x86_64/git_fixes.diff (from rev 183257, libdrm/trunk/git_fixes.diff)
===================================================================
--- testing-x86_64/git_fixes.diff (rev 0)
+++ testing-x86_64/git_fixes.diff 2013-04-19 15:23:18 UTC (rev 183258)
@@ -0,0 +1,49 @@
+From 99105e765c31b598746b849e66e7a9106dcefa24 Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst at canonical.com>
+Date: Wed, 27 Mar 2013 13:06:43 +0000
+Subject: makefiles: Add missing headers.
+
+I even compile time tested this on a panda with make dist!
+
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
+---
+diff --git a/exynos/Makefile.am b/exynos/Makefile.am
+index 539aea0..0a2663a 100644
+--- a/exynos/Makefile.am
++++ b/exynos/Makefile.am
+@@ -10,7 +10,11 @@ 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_SOURCES = exynos_drm.c exynos_fimg2d.c
++libdrm_exynos_la_SOURCES = \
++ exynos_drm.c \
++ exynos_fimg2d.c \
++ fimg2d.h \
++ fimg2d_reg.h
+
+ libdrm_exynoscommonincludedir = ${includedir}/exynos
+ libdrm_exynoscommoninclude_HEADERS = exynos_drm.h
+diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
+index f46a780..ba9bd68 100644
+--- a/freedreno/Makefile.am
++++ b/freedreno/Makefile.am
+@@ -10,7 +10,15 @@ 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_SOURCES = freedreno_device.c freedreno_pipe.c freedreno_ringbuffer.c freedreno_bo.c
++libdrm_freedreno_la_SOURCES = \
++ freedreno_device.c \
++ freedreno_pipe.c \
++ freedreno_priv.h \
++ freedreno_ringbuffer.c \
++ freedreno_bo.c \
++ kgsl_drm.h \
++ list.h \
++ msm_kgsl.h
+
+ libdrm_freedrenocommonincludedir = ${includedir}/freedreno
+ libdrm_freedrenocommoninclude_HEADERS = freedreno_drmif.h freedreno_ringbuffer.h
+--
+cgit v0.9.0.2-2-gbebe
Copied: libdrm/repos/testing-x86_64/no-pthread-stubs.patch (from rev 183257, libdrm/trunk/no-pthread-stubs.patch)
===================================================================
--- testing-x86_64/no-pthread-stubs.patch (rev 0)
+++ testing-x86_64/no-pthread-stubs.patch 2013-04-19 15:23:18 UTC (rev 183258)
@@ -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 \
More information about the arch-commits
mailing list