[arch-commits] Commit in libdrm/repos (3 files)

[Jan de Groot]

    Date: Monday, November 10, 2008 @ 03:19:53
  Author: jgc
Revision: 18909

Merged revisions 17522,18908 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/libdrm/trunk

........
  r17522 | jgc | 2008-10-30 23:01:47 +0100 (Thu, 30 Oct 2008) | 1 line
  
  upgpkg: libdrm 2.4.1-1
........
  r18908 | jgc | 2008-11-10 09:19:35 +0100 (Mon, 10 Nov 2008) | 2 lines
  
  upgpkg: libdrm 2.3.1-2
      Downgrade, 2.4 does not work so nice
........

Modified:
  libdrm/repos/testing-x86_64/	(properties)
  libdrm/repos/testing-x86_64/PKGBUILD
Deleted:
  libdrm/repos/testing-x86_64/no-pthread-stubs.patch

------------------------+
 PKGBUILD               |   16 +++++-----------
 no-pthread-stubs.patch |   32 --------------------------------
 2 files changed, 5 insertions(+), 43 deletions(-)


Property changes on: libdrm/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libdrm/trunk:1-16360
   + /libdrm/trunk:1-18908

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-11-10 08:19:35 UTC (rev 18908)
+++ testing-x86_64/PKGBUILD	2008-11-10 08:19:53 UTC (rev 18909)
@@ -2,24 +2,18 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.0
-pkgrel=1
+pkgver=2.3.1
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
 depends=('glibc')
-options=('!libtool')
+options=('!libtool' 'force')
 url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	no-pthread-stubs.patch)
-md5sums=('3ab868dd3e4622bf49ca194c62a1fded' '5b5db79453e585d9fbdbf0ec577a3046')
+source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('620fe7dd02c3236c3e9881a3a238173d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" || return 1
-  libtoolize --force || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: testing-x86_64/no-pthread-stubs.patch
===================================================================
--- testing-x86_64/no-pthread-stubs.patch	2008-11-10 08:19:35 UTC (rev 18908)
+++ testing-x86_64/no-pthread-stubs.patch	2008-11-10 08:19:53 UTC (rev 18909)
@@ -1,32 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -32,10 +32,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)
- AC_ARG_ENABLE(udev,	AS_HELP_STRING([--enable-udev],
-diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am
---- libdrm-2.4.0/libdrm/intel/Makefile.am	2008-10-14 01:39:32.000000000 +0200
-+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am	2008-10-21 10:49:00.000000000 +0200
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir)/libdrm \
- 	-I$(top_srcdir)/libdrm/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/shared-core
- 
- 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@
-+libdrm_intel_la_LIBADD = ../libdrm.la
- 
- libdrm_intel_la_SOURCES = \
- 	intel_bufmgr.c \