summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-06-11 23:33:19 -0300
committerMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-06-11 23:33:19 -0300
commited761ffd6cbc0a9e658f738c9b53c7679643714e (patch)
tree734d2ca0d02c5d64fcae61ef6911da1faa13e04f
parent4c4ef7c0a3a748e6c0bbc488752410886cf0591e (diff)
update libdrm-git package
-rw-r--r--~coadde/libdrm-git/COPYING48
-rw-r--r--~coadde/libdrm-git/PKGBUILD48
-rw-r--r--~coadde/libdrm-git/no-pthread-stubs.patch70
3 files changed, 147 insertions, 19 deletions
diff --git a/~coadde/libdrm-git/COPYING b/~coadde/libdrm-git/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/~coadde/libdrm-git/COPYING
@@ -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.
diff --git a/~coadde/libdrm-git/PKGBUILD b/~coadde/libdrm-git/PKGBUILD
index faced3da9..63af0c80c 100644
--- a/~coadde/libdrm-git/PKGBUILD
+++ b/~coadde/libdrm-git/PKGBUILD
@@ -1,19 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
# Arch libdrm Maintainers:
# Jan de Groot
# Andreas Radke
# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
pkgname=libdrm-git
-pkgver=20120611
-pkgrel=2
+pkgver=20120612
+pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=('i686' 'x86_64' 'mips64el')
-license=('MIT')
-depends=('libpciaccess')
-provides=('libdrm=2.4.35')
-makedepends=('git' 'cairo' 'udev')
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('cairo' 'valgrind' 'git')
options=('!libtool')
url="http://dri.freedesktop.org/"
+source=(no-pthread-stubs.patch
+ COPYING)
+sha1sums=('2a5410baa3e6e078f9378ce486a88f41d22fd838'
+ 'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
+provides=('libdrm=2.4.35')
conflicts=('libdrm')
_gitroot='git://git.freedesktop.org/git/mesa/drm'
@@ -21,25 +28,26 @@ _gitname='drm'
build() {
- cd "$srcdir"
+ cd "${srcdir}"
msg "Connecting to GIT server...."
- if [[ -d "$_gitname" ]]; then
- cd "$_gitname" && git pull origin
+ if [[ -d "${_gitname}" ]]; then
+ cd "${_gitname}" && git pull origin
msg "The local files are updated."
else
- git clone "$_gitroot" "$_gitname"
+ git clone "${_gitroot}" "${_gitname}"
fi
msg "GIT checkout done or server timeout"
msg "Starting build..."
- rm -rf "$srcdir/$_gitname-build"
- git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
- cd "$srcdir/$_gitname-build"
-
- sed -i 's/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)//' configure.ac
+ rm -rf "${srcdir}/${_gitname}-build"
+ git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
+ cd "${srcdir}/${_gitname}-build"
+ patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
+ #libtoolize --force
+ autoreconf --force --install
./autogen.sh
./configure --prefix=/usr \
--enable-udev \
@@ -47,15 +55,17 @@ build() {
--enable-radeon \
--enable-vmwgfx-experimental-api \
--enable-nouveau
- make V=1
+ make
}
check() {
- cd "$srcdir/$_gitname-build"
+ cd "${srcdir}/${_gitname}-build"
make -k check
}
package() {
- cd "$srcdir/$_gitname-build"
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}/${_gitname}-build"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
}
diff --git a/~coadde/libdrm-git/no-pthread-stubs.patch b/~coadde/libdrm-git/no-pthread-stubs.patch
new file mode 100644
index 000000000..6745f4bc4
--- /dev/null
+++ b/~coadde/libdrm-git/no-pthread-stubs.patch
@@ -0,0 +1,70 @@
+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:0 -no-undefined
+-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_radeon_la_LIBADD = ../libdrm.la
+
+ libdrm_radeon_la_SOURCES = \
+ radeon_bo_gem.c \