[arch-commits] Commit in nouveau-drm/repos (extra-i686 extra-i686/PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Sep 9 18:17:15 UTC 2009
Date: Wednesday, September 9, 2009 @ 14:17:14
Author: andyrtr
Revision: 51572
Merged revisions 51562,51568,51570 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/nouveau-drm/trunk
........
r51562 | andyrtr | 2009-09-09 17:50:33 +0200 (Mi, 09 Sep 2009) | 2 lines
upgpkg: nouveau-drm 0.0.15_20090908-1
new snapshot; base on master-compat tree
........
r51568 | andyrtr | 2009-09-09 19:50:22 +0200 (Mi, 09 Sep 2009) | 2 lines
upgpkg: nouveau-drm 0.0.15_20090908-1
add two additional required modules
........
r51570 | andyrtr | 2009-09-09 20:00:22 +0200 (Mi, 09 Sep 2009) | 2 lines
upgpkg: nouveau-drm 0.0.15_20090908-1
fix modules name+path
........
Modified:
nouveau-drm/repos/extra-i686/ (properties)
nouveau-drm/repos/extra-i686/PKGBUILD
----------+
PKGBUILD | 48 ++++++++++++++++++------------------------------
1 file changed, 18 insertions(+), 30 deletions(-)
Property changes on: nouveau-drm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /nouveau-drm/trunk:1-46566
+ /nouveau-drm/trunk:1-51571
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-09-09 18:01:10 UTC (rev 51571)
+++ extra-i686/PKGBUILD 2009-09-09 18:17:14 UTC (rev 51572)
@@ -3,10 +3,11 @@
# Contributor: buddabrod <buddabrod at gmail.com>
pkgname=nouveau-drm
-pkgver=20090612
-_gitdate=20090612
+_snapdate=20090908
+pkgver=0.0.15_${_snapdate} # see drivers/gpu/drm/nouveau_drv.h for version
+#_gitdate=20090908
_kernver='2.6.30-ARCH'
-pkgrel=3
+pkgrel=1
pkgdesc="nvidia opensource X driver"
arch=('i686' 'x86_64')
url="http://nouveau.freedesktop.org/"
@@ -14,36 +15,23 @@
#makedepends=('git' 'autoconf' 'pkgconfig')
install=${pkgname}.install
license=('GPL')
-source=(ftp://ftp.archlinux.org/other/$pkgname/mesa-drm-${_gitdate}.tar.bz2
- COPYING)
-md5sums=('b673761e0e64546638fc533b91da801a'
- 'ba65e71c481b94ef0fb6c23c7f21ffa1')
-
-build() {
- # get git code
-# cd ${srcdir}
-# git clone -v git://anongit.freedesktop.org/git/mesa/drm/
-# cd drm
-# git archive --prefix=mesa-drm-${_gitdate}/ --format=tar HEAD | bzip2 > ../../mesa-drm-${_gitdate}.tar.bz2
-# 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
+options=('force')
+source=(ftp://ftp.archlinux.org/other/$pkgname/master-compat_${_snapdate}.tar.gz
+ #http://people.freedesktop.org/~pq/nouveau-drm/master-compat.tar.gz
+)
+md5sums=('a181adcef3ffd8806037bf883d137d4e')
- # libdrm-git now
-# 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
-
- # build the drm kernel module
- cd linux-core
+build() {
+ cd ${srcdir}/master-compat
+ cd nouveau
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 ${srcdir}/master-compat/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/`uname -r`/updates/drm.ko || return 1
+ install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/`uname -r`/kernel/drivers/video/nouveau.ko || return 1
+ install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/`uname -r`/updates/ttm.ko || return 1
+ install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/`uname -r`/updates/ch7006.ko || return 1
+ install -D -m 0644 ${srcdir}/master-compat/include/drm/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
}
More information about the arch-commits
mailing list