[arch-commits] Commit in nouveau-drm/trunk (PKGBUILD)

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 15:15:36
  Author: jgc
Revision: 46545

upgpkg: nouveau-drm 20090612-3
    Only install the kernel modules, the rest should be in libdrm

Modified:
  nouveau-drm/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 19:06:18 UTC (rev 46544)
+++ PKGBUILD	2009-07-18 19:15:36 UTC (rev 46545)
@@ -6,22 +6,18 @@
 pkgver=20090612
 _gitdate=20090612
 _kernver='2.6.30-ARCH'
-pkgrel=2
+pkgrel=3
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
-makedepends=('git' 'autoconf' 'pkgconfig')
-depends=("kernel26>=2.6.30" "kernel26<2.6.31" 'udev>=141' 'cairo')
+depends=("kernel26>=2.6.30" "kernel26<2.6.31")
+#makedepends=('git' 'autoconf' 'pkgconfig')
 install=${pkgname}.install
 license=('GPL')
-provides=('libdrm' 'libdrm-git')
-conflicts=('libdrm' 'libdrm-git')
 source=(ftp://ftp.archlinux.org/other/$pkgname/mesa-drm-${_gitdate}.tar.bz2
-	dont_check_for_pthread.patch COPYING)
+	      COPYING)
 md5sums=('b673761e0e64546638fc533b91da801a'
-         'e5f8f3b9f6357c2f82950cdfb8e9c9ec'
          'ba65e71c481b94ef0fb6c23c7f21ffa1')
-options=('!libtool')
                   
 build() {
   # get git code
@@ -32,12 +28,12 @@
 #  return 1
 
   cd ${srcdir}/mesa-drm-${_gitdate}
-  patch -Np1 -i ${srcdir}/dont_check_for_pthread.patch || return 1
-  ./autogen.sh --prefix=/usr --enable-nouveau-experimental-api --enable-udev
+#patch -Np1 -i ${srcdir}/dont_check_for_pthread.patch || return 1
+#  ./autogen.sh --prefix=/usr --enable-nouveau-experimental-api --enable-udev
   
   # libdrm-git now
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+#  make || return 1
+#  make DESTDIR="${pkgdir}" install || return 1
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 
@@ -46,7 +42,7 @@
   make DRM_MODULES="nouveau" || return 1
   install -D -m 0644 drm.ko ${pkgdir}/lib/modules/`uname -r`/updates/drm.ko || return 1
   install -D -m 0644 nouveau.ko ${pkgdir}/lib/modules/`uname -r`/kernel/drivers/video/nouveau.ko || return 1
-  install -D -m 0644 ../shared-core/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || return 1
+#install -D -m 0644 ../shared-core/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || return 1
 
   # install script
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/${pkgname}.install