[Lunar-commits] r22385 - in moonbase: branches/deleted-modules/xorg-7.0 trunk/xorg7/mesa-lib trunk/xorg7/x11-extras/libdrm trunk/zbeta trunk/zbeta/drm-git

Moritz Heiber moe at lunar-linux.org
Fri Dec 1 20:34:21 CET 2006 

Author: moe
Date: 2006-12-01 20:34:21 +0100 (Fri, 01 Dec 2006)
New Revision: 22385

Added:
   moonbase/branches/deleted-modules/xorg-7.0/libdrm-cvs/
   moonbase/trunk/zbeta/drm-git/
   moonbase/trunk/zbeta/drm-git/BUILD
   moonbase/trunk/zbeta/drm-git/DEPENDS
   moonbase/trunk/zbeta/drm-git/DETAILS
Removed:
   moonbase/trunk/zbeta/libdrm-cvs/
Modified:
   moonbase/trunk/xorg7/mesa-lib/BUILD
   moonbase/trunk/xorg7/mesa-lib/DEPENDS
   moonbase/trunk/xorg7/mesa-lib/DETAILS
   moonbase/trunk/xorg7/mesa-lib/PRE_BUILD
   moonbase/trunk/xorg7/x11-extras/libdrm/DETAILS
Log:
Okay, this is a major overhaul:

* Removed libdrm-cvs and added drm-git instead.

* Made mesa-lib use the installed copy of libdrm (behaviour) has
  been changed). Beware: Currently mesa-lib is x86 only! Its an
  easy fix though (just add a proper BUILD.x86_64 which is not
  x86 specific). Also, the mach64 and the r300 drivers are disabled.
  They don't work with the stable mesa release. sofar says thats
  fixed in their cvs.

* Made mesa-lib depend on drm-git. I know, thats a bit harsh ..
  but people want 3D acceleration when they install mesa-lib. Without
  the kernel modules that is not going to happen (and drm-git provides
  them).

* Update libdrm to 2.3.0. Works good.



Copied: moonbase/branches/deleted-modules/xorg-7.0/libdrm-cvs (from rev 22384, moonbase/trunk/zbeta/libdrm-cvs)

Modified: moonbase/trunk/xorg7/mesa-lib/BUILD
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/BUILD	2006-12-01 17:30:41 UTC (rev 22384)
+++ moonbase/trunk/xorg7/mesa-lib/BUILD	2006-12-01 19:34:21 UTC (rev 22385)
@@ -2,12 +2,14 @@
 
   MESA_PREFIX="/usr"
 
+  # Disabled these for now as they do not compile
+  sedit 's/mach64\ //g' configs/linux-dri &&
+  sedit 's/r300\ //g' configs/linux-dri &&
+
   find . -type f -exec sed -i 's@/usr/X11R6@/usr/X11 at g' {} \; &&
   sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c	&&
-   
-  unpack $SOURCE2 &&
 
-  make linux-dri DRM_SOURCE_PATH="${SOURCE_DIRECTORY}/drm" &&
+  make linux-dri-x86 && 
 
   prepare_install &&
 

Modified: moonbase/trunk/xorg7/mesa-lib/DEPENDS
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/DEPENDS	2006-12-01 17:30:41 UTC (rev 22384)
+++ moonbase/trunk/xorg7/mesa-lib/DEPENDS	2006-12-01 19:34:21 UTC (rev 22385)
@@ -1,3 +1,5 @@
+depends libdrm  &&
+depends drm-git &&
 depends glproto &&
 depends libX11  &&
 depends makedepend &&

Modified: moonbase/trunk/xorg7/mesa-lib/DETAILS
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/DETAILS	2006-12-01 17:30:41 UTC (rev 22384)
+++ moonbase/trunk/xorg7/mesa-lib/DETAILS	2006-12-01 19:34:21 UTC (rev 22385)
@@ -1,17 +1,15 @@
            MODULE=mesa-lib
           VERSION=6.5
            SOURCE=MesaLib-$VERSION.tar.bz2
-          SOURCE2=libdrm-cvs-beta.tar.bz2
-          SOURCE3=MesaDemos-$VERSION.tar.bz2
-          SOURCE4=MesaGLUT-$VERSION.tar.bz2
+          SOURCE2=MesaDemos-$VERSION.tar.bz2
+          SOURCE3=MesaGLUT-$VERSION.tar.bz2
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
        SOURCE_URL=$SFORGE_URL/mesa3d/
-      SOURCE2_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri:drm
+      SOURCE2_URL=$SFORGE_URL/mesa3d/
       SOURCE3_URL=$SFORGE_URL/mesa3d/
-      SOURCE4_URL=$SFORGE_URL/mesa3d/
        SOURCE_VFY=sha1:a77368901b0731b662d0858aef2c405a7ddf6014
-      SOURCE3_VFY=sha1:9673c09df947a892955a850e9d86abc58dbf00c4
-      SOURCE4_VFY=sha1:0c28b6634f0109116d57001c55dc66091ae272ed 
+      SOURCE2_VFY=sha1:9673c09df947a892955a850e9d86abc58dbf00c4
+      SOURCE3_VFY=sha1:0c28b6634f0109116d57001c55dc66091ae272ed 
           WEBSITE=http://www.mesa3d.org
           ENTERED=20060215
           UPDATED=20060901

Modified: moonbase/trunk/xorg7/mesa-lib/PRE_BUILD
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/PRE_BUILD	2006-12-01 17:30:41 UTC (rev 22384)
+++ moonbase/trunk/xorg7/mesa-lib/PRE_BUILD	2006-12-01 19:34:21 UTC (rev 22385)
@@ -1,5 +1,5 @@
 default_pre_build	&&
 cd $BUILD_DIRECTORY	&&
+unpack $SOURCE2		&&
 unpack $SOURCE3		&&
-unpack $SOURCE4		&&
 cd $SOURCE_DIRECTORY

Modified: moonbase/trunk/xorg7/x11-extras/libdrm/DETAILS
===================================================================
--- moonbase/trunk/xorg7/x11-extras/libdrm/DETAILS	2006-12-01 17:30:41 UTC (rev 22384)
+++ moonbase/trunk/xorg7/x11-extras/libdrm/DETAILS	2006-12-01 19:34:21 UTC (rev 22385)
@@ -1,12 +1,12 @@
           MODULE=libdrm
-         VERSION=2.0.2
+         VERSION=2.3.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://people.freedesktop.org/~ajax/libdrm
-      SOURCE_VFY=sha1:99ed33bfd0fa41e8db0ad7d226f33f7546063a1a
+      SOURCE_URL=http://dri.freedesktop.org/libdrm/
+      SOURCE_VFY=sha1:af2e8d6e3ad6b906b4d6f1b2ada2d523188c28ea
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.freedesktop.org/
          ENTERED=20061017
-         UPDATED=20061017
+         UPDATED=20061201
            SHORT="the userspace interface to kernel DRM services"
 
 cat << EOF

Added: moonbase/trunk/zbeta/drm-git/BUILD
===================================================================
--- moonbase/trunk/zbeta/drm-git/BUILD	                        (rev 0)
+++ moonbase/trunk/zbeta/drm-git/BUILD	2006-12-01 19:34:21 UTC (rev 22385)
@@ -0,0 +1,15 @@
+(
+
+  ./autogen.sh  &&
+
+  prepare_install &&
+
+  if $(uname -r | grep -q "^2\.6") ; then
+	cd linux-core;
+	make;
+	mkdir -p /lib/modules/$(uname -r)/kernel/drivers/char/drm;
+	cp *.ko /lib/modules/$(uname -r)/kernel/drivers/char/drm;
+	depmod -a $(uname -r);
+  fi
+
+) > $C_FIFO 2>&1

Added: moonbase/trunk/zbeta/drm-git/DEPENDS
===================================================================
--- moonbase/trunk/zbeta/drm-git/DEPENDS	                        (rev 0)
+++ moonbase/trunk/zbeta/drm-git/DEPENDS	2006-12-01 19:34:21 UTC (rev 22385)
@@ -0,0 +1 @@
+depends git

Added: moonbase/trunk/zbeta/drm-git/DETAILS
===================================================================
--- moonbase/trunk/zbeta/drm-git/DETAILS	                        (rev 0)
+++ moonbase/trunk/zbeta/drm-git/DETAILS	2006-12-01 19:34:21 UTC (rev 22385)
@@ -0,0 +1,17 @@
+          MODULE=drm-git
+         VERSION=beta
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=git://anongit.freedesktop.org/git/mesa/drm
+   MODULE_PREFIX=${X11R7_PREFIX:-/usr}
+        WEB_SITE=http://www.freedesktop.org/
+         ENTERED=20060120
+         UPDATED=20060120
+           SHORT="DRM kernel modules"
+cat << EOF
+This module provides the latest DRM kernel modules for 3D
+accelaration in XOrg 7.x.
+
+If you're still using a 2.4.x based kernel its not going to
+do anything at all.
+EOF
+

More information about the Lunar-commits mailing list