[arch-commits] Commit in nouveau-drm/repos (5 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Jun 13 12:11:57 UTC 2009 

    Date: Saturday, June 13, 2009 @ 08:11:57
  Author: andyrtr
Revision: 42354

Merged revisions 42310-42311,42330,42343 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/nouveau-drm/trunk

........
  r42310 | andyrtr | 2009-06-12 20:51:41 +0000 (Fr, 12 Jun 2009) | 1 line
  
  fix kernelver in install scriptlet, update to todays snapshot
........
  r42311 | andyrtr | 2009-06-12 21:01:20 +0000 (Fr, 12 Jun 2009) | 2 lines
  
  upgpkg: nouveau-drm 20090612-1
      update kernel module
........
  r42330 | andyrtr | 2009-06-13 09:15:24 +0000 (Sa, 13 Jun 2009) | 2 lines
  
  upgpkg: nouveau-drm 20090612-1
      update kernel module, include libdrm-git that is required by a recent driver shot
........
  r42343 | andyrtr | 2009-06-13 12:02:08 +0000 (Sa, 13 Jun 2009) | 2 lines
  
  upgpkg: nouveau-drm 20090612-2
      remove replace line
........

Added:
  nouveau-drm/repos/testing-i686/COPYING
    (from rev 42343, nouveau-drm/trunk/COPYING)
Modified:
  nouveau-drm/repos/testing-i686/	(properties)
  nouveau-drm/repos/testing-i686/PKGBUILD
  nouveau-drm/repos/testing-i686/dont_check_for_pthread.patch
  nouveau-drm/repos/testing-i686/nouveau-drm.install

------------------------------+
 COPYING                      |   48 +++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                     |   45 ++++++++++++++++++++++++--------------
 dont_check_for_pthread.patch |   40 ++++++++++++++++++++++++++++++++--
 nouveau-drm.install          |    6 ++---
 4 files changed, 118 insertions(+), 21 deletions(-)


Property changes on: nouveau-drm/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nouveau-drm/trunk:1-42186
   + /nouveau-drm/trunk:1-42352

Copied: nouveau-drm/repos/testing-i686/COPYING (from rev 42343, nouveau-drm/trunk/COPYING)
===================================================================
--- testing-i686/COPYING	                        (rev 0)
+++ testing-i686/COPYING	2009-06-13 12:11:57 UTC (rev 42354)
@@ -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.

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-06-13 12:11:45 UTC (rev 42353)
+++ testing-i686/PKGBUILD	2009-06-13 12:11:57 UTC (rev 42354)
@@ -3,9 +3,10 @@
 # Contributor: buddabrod <buddabrod at gmail.com>
 
 pkgname=nouveau-drm
-pkgver=20090611
-_gitdate=20090611
-pkgrel=1
+pkgver=20090612
+_gitdate=20090612
+_kernver='2.6.30-ARCH'
+pkgrel=2
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -13,28 +14,40 @@
 depends=("kernel26>=2.6.30" "kernel26<2.6.31" 'udev>=141' 'cairo')
 install=${pkgname}.install
 license=('GPL')
-md5sums=()
+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)
-
+	dont_check_for_pthread.patch COPYING)
+md5sums=('b673761e0e64546638fc533b91da801a'
+         'e5f8f3b9f6357c2f82950cdfb8e9c9ec'
+         'ba65e71c481b94ef0fb6c23c7f21ffa1')
+options=('!libtool')
+                  
 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}
+#  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
 
-  # build the drm kernel module
-  # make sure the system kernel doesn't have "drm" set to "yes", 
-  # default Arch kernel26 has it as module drm.ko, make sure it's not loaded
   cd ${srcdir}/mesa-drm-${_gitdate}
-  patch -Np0 -i ${srcdir}/dont_check_for_pthread.patch || return 1
+  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
+  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
   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 script
+  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/${pkgname}.install
 }
-

Modified: testing-i686/dont_check_for_pthread.patch
===================================================================
--- testing-i686/dont_check_for_pthread.patch	2009-06-13 12:11:45 UTC (rev 42353)
+++ testing-i686/dont_check_for_pthread.patch	2009-06-13 12:11:57 UTC (rev 42354)
@@ -1,5 +1,6 @@
---- configure.ac	2008-10-25 18:15:50.000000000 +0200
-+++ configure.ac.new	2008-10-26 21:33:53.000000000 +0100
+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
@@ -11,3 +12,38 @@
  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 \
+--- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig	2009-02-28 19:06:24.000000000 +0000
++++ libdrm-2.4.5/libdrm/nouveau/Makefile.am	2009-02-28 19:06:33.000000000 +0000
+@@ -2,13 +2,12 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir)/libdrm \
+ 	-I$(top_srcdir)/libdrm/nouveau \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/shared-core
+ 
+ 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 \

Modified: testing-i686/nouveau-drm.install
===================================================================
--- testing-i686/nouveau-drm.install	2009-06-13 12:11:45 UTC (rev 42353)
+++ testing-i686/nouveau-drm.install	2009-06-13 12:11:57 UTC (rev 42354)
@@ -1,15 +1,15 @@
 post_install() {
-  KERNEL_VERSION='2.6.29-ARCH'
+  KERNEL_VERSION='2.6.30-ARCH'
   depmod -v $KERNEL_VERSION  > /dev/null 2>&1		 
 }
 
 post_upgrade() {
   post_install $1
- # rmmod nouveau || echo 'In order to use the new nouneau module, exit Xserver and unload it manually.'
+  rmmod nouveau || echo 'In order to use the new nouneau module, exit Xserver and unload it manually.'
 }
 
 post_remove() {
-  KERNEL_VERSION='2.6.28-ARCH'
+  KERNEL_VERSION='2.6.30-ARCH'
   depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
 }

More information about the arch-commits mailing list