[Frugalware-git] xorgtesting: libdrm-2.4.17-1-i686

Michel Hermier hermier at frugalware.org
Mon Dec 21 10:29:48 CET 2009


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=906c63d59d0418d02bc6416e1ffe7a2f713bf009

commit 906c63d59d0418d02bc6416e1ffe7a2f713bf009
Author: Michel Hermier <hermier at frugalware.org>
Date:   Mon Dec 21 10:29:02 2009 +0100

libdrm-2.4.17-1-i686

* Bump version.
* Reenable libpthreads-stubs.

diff --git a/source/x11/libdrm/FrugalBuild b/source/x11/libdrm/FrugalBuild
index d2e9fb4..c81908e 100644
--- a/source/x11/libdrm/FrugalBuild
+++ b/source/x11/libdrm/FrugalBuild
@@ -4,36 +4,30 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=libdrm
-pkgver=2.4.16
-Fuse $USE_DEVEL && pkgver=$pkgver.g3bd834a
+pkgver=2.4.17
pkgrel=1
pkgdesc="X.Org Userspace interface to kernel DRM services"
url="http://xorg.freedesktop.org/"
-depends=()
+depends=('libpthread-stubs')
archs=('i686' 'x86_64' 'ppc')
groups=('x11' 'xorg-core' 'xorg-libs')
if Fuse $USE_DEVEL; then
+	pkgver=$pkgver.gfdb33d5
unset source sha1sums
_F_scm_type="git"
_F_scm_url="git://anongit.freedesktop.org/mesa/drm"
Finclude scm
else
up2date="Flasttar http://dri.freedesktop.org/libdrm/"
-	source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.gz no-pthread-stubs.patch)
-	sha1sums=('dea5b1c683cb1498729a7af08356c8066a3c5c9b' \
-	          'cc835b89eec11f55ba09587774eb2435fd61decf')
+	source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2)
+	sha1sums=('52f12fc75ecf3d0c2e89579b7454f040ac515aa6')
fi
Fconfopts="${Fconfopts[@]} --enable-nouveau-experimental-api --enable-radeon-experimental-api"

build()
{
Fuse $USE_DEVEL && Funpack_scm
-	Fcd
-	Fpatchall
-	Fautoreconf
-	Fconf
-	Fmake
-	Fmakeinstall
+	Fbuild
}

# optimization OK
diff --git a/source/x11/libdrm/no-pthread-stubs.patch b/source/x11/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index eaedd06..0000000
--- a/source/x11/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- libdrm-2.4.16/configure.ac~	2009-12-03 16:28:44.000000000 +0000
-+++ libdrm-2.4.16/configure.ac	2009-12-03 21:38:35.000000000 +0000
-@@ -33,9 +33,6 @@
- AC_HEADER_STDC
- AC_SYS_LARGEFILE
-
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
-
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
---- libdrm-2.4.16/nouveau/Makefile.am~	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am	2009-12-03 21:42:24.000000000 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
-
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
---- libdrm-2.4.16/radeon/Makefile.am~	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am	2009-12-03 21:43:12.000000000 +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 \
---- libdrm-2.4.16/intel/Makefile.am~	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am	2009-12-03 22:02:36.000000000 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
-+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
-
- libdrm_intel_la_SOURCES = \
- 	intel_atomic.h \


More information about the Frugalware-git mailing list