[Lunar-commits] <moonbase> Squashed commit of the following:

Samuel Verstraete elangelo at lunar-linux.org
Mon Oct 13 20:38:17 CEST 2008


commit 577d15a3987e38fe0af4b8ba083bb8a59c0873dc
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Mon Oct 13 20:38:17 2008 +0200

    Squashed commit of the following:
    
    commit 2fabf2e74eba6cfc01e96710c44339fa7ad6043e
    Merge: 43de893... d6d9e64...
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 20:38:02 2008 +0200
    
        Merge branch 'master' into xorg
    
    commit 43de893c2ba0edfef5340e5e5f52986ccd178ad3
    Merge: 15af790... 42a3a8a...
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 20:37:42 2008 +0200
    
        Merge branch 'master' into xorg
    
    commit 15af790b83fc129287f8d41a5ed125eb7549769d
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 20:37:12 2008 +0200
    
        xf86-video-radeonhd: 1.2.3
         - Added Command Submission infrastructure.
    
    commit f4b6a1bac557ad6a91d09a8799015084194c229c
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 20:35:57 2008 +0200
    
        xtrans: 1.2.2
    
    commit 2d207d9a0a79f3b220ca557ceb66e8c59da95621
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 20:11:01 2008 +0200
    
        xf86-video-radeonhd: 1.2.2
         - Added DRI support (R5xx and RS6xx).
         - Added support for RV770, RS780, M82, M86, and M88.
         - Added XVideo support.
         - Added CP based 2D acceleration (R5xx and RS6xx).
         - Added EXA render acceleration (R5xx and RS6xx).
         - Added support for AtomBIOS based mode setting.
         - Added support for scaled modes.
         - Added RandR support for backlight control.
         - Lots of modesetting related bug fixes.
    
    commit 10ae5026d42191ba8d129b37815917d0f61f8a84
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 06:58:48 2008 +0200
    
        xorg-server fix sha1sum
    
    commit b9dc1d98d874fda70daeea355964045dd2cbe72e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Mon Oct 13 06:57:15 2008 +0200
    
        xorg-server 1.5.2
    
    commit 579ef2377ed7e989059d93158953193850c0f4f2
    Merge: 7735173... 539743b...
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Sun Sep 28 16:20:38 2008 +0200
    
        Merge branch 'master' into xorg
    
    commit 7735173c542f742e8893a9e80de70870d5afdd16
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Sat Sep 27 07:18:16 2008 +0200
    
        xorg-server 1.5.1 version bump
    
    commit c984cc5b13fd6431627dc458d99aaadeda6cbe03
    Merge: 877f16b... 7412af1...
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Sat Sep 27 07:18:04 2008 +0200
    
        Merge branch 'master' into xorg
    
    commit 877f16be97e3fe4d2adb18d3007d504dbf843ea1
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Tue Sep 23 04:56:32 2008 +0200
    
        xf86driproto: version bump to 2.0.4
    
    commit ab096cf386170efe8ab753d919129ff532ae5f23
    Merge: 1eecfb6... 4c0732b...
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Tue Sep 23 04:54:12 2008 +0200
    
        Merge branch 'master' into xorg
    
        Conflicts:
        	xorg7/driver/xf86-input-synaptics/DETAILS
        	xorg7/mesa-lib/CONFLICTS
    
    commit 1eecfb6ad211e9c5c64e561cdd23a4eade853f8b
    Merge: 225cf1c... 789de11...
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Tue Sep 23 04:53:09 2008 +0200
    
        Merge branch 'xorg' of ssh://elangelo@foo-projects.org/home/elangelo/moonbase into xorg
    
        Conflicts:
        	xfce4/goodies/thunar-thumbnailers/DEPENDS
        	xorg7/driver/xf86-input-synaptics/DETAILS
        	xorg7/lib/pixman/BUILD
        	xorg7/lib/pixman/DETAILS
        	xorg7/mesa-lib/DETAILS
    
    commit 225cf1cd59a601026ac2dfc04f607a6f244f237e
    Author: Florin Braescu <florin at lunar-linux.org>
    Date:   Thu Sep 4 21:28:55 2008 +0300
    
        libXau: version bumped to 1.0.4.
    
        Bugfixes release.
    
    commit b4b06bde0dec8c1b57b389787f636c081281f1fb
    Author: Florin Braescu <florin at lunar-linux.org>
    Date:   Mon Sep 8 11:55:51 2008 +0300
    
        libX11: version bumped to 1.1.5.
    
        Bugfixes release.
    
    commit b06b077595a7f8f83625e01f98475bdef3366cc6
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Tue Sep 23 04:42:49 2008 +0200
    
        xf86-input-synaptics: version bump`
    
        Conflicts:
    
        	xorg7/driver/xf86-input-synaptics/DETAILS
    
    commit ff281f0f64408262e932fc104bab27584af9c3d7
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Mon Sep 22 20:03:18 2008 +0200
    
        mesa-lib 7.2
    
        Conflicts:
    
        	xorg7/mesa-lib/DETAILS
    
    commit 789de115ceb2a229ab40d2a1e5bbb0b615615096
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Thu Sep 18 21:23:59 2008 +0200
    
        xorg-server: add libpciaccess in DEPENDS
    
    commit 28dc3511c26d74d3a0e22866626ebc2736bff35c
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Fri Sep 12 16:31:36 2008 +0200
    
        libgda2 update
    
    commit a9f04120d2b37555b1381448c11cc7210cf7f9ee
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Sep 10 17:28:45 2008 +0200
    
        xorg-server: bump to 1.5.0
    
    commit 2f4bc75a622e6c038a29c0c498fd0aeb53a7a0a6
    Merge: a26fe93... 0ee1052...
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Sep 10 17:28:37 2008 +0200
    
        Merge branch 'master' into xorg
    
    commit a26fe9346fc50dba77100ec751aa03d0b079a2ef
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Sep 10 11:40:45 2008 +0200
    
        mesa-glu is no longer needed
    
    commit fa3d054bc9444260bc563bf16f5f39d49d20afc3
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Sep 10 09:10:57 2008 +0200
    
        NVIDIA: install libs in /usr/lib/opengl/nvidia
    
        allows for seamless switching from opensource drivers to propriearity
    
    commit 58919909da6edd2a53772414cc8c66dc11dd0a9a
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Tue Sep 9 14:11:52 2008 +0200
    
        mesa-lib bump to 7.1 + ncurses based selector for drivers
    
    commit 0917b9bce0538144b1ce847fa77ac3f6d50ef31f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Tue Sep 9 10:46:31 2008 +0200
    
        dri2proto: something new
    
    commit ae6e6316873e03dcf1f8e8c8cff156209b73738f
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Tue Sep 9 09:56:58 2008 +0200
    
        libdrm: bump to 2.3.1
    
    commit eaf3f0024649f6af977a951d264c4a708b737321
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 23 15:39:01 2008 +0200
    
        thunar-thumbnailers: version bump and depends tweak
    
    commit 37150743ccfcfbcffd9045f74e314a8ef5a7cbf6
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 23 15:33:22 2008 +0200
    
        raw-thumbnailer: new module
    
    commit 405a36eefe9dc46578ffe01984a9abfde617137e
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 23 15:33:04 2008 +0200
    
        libopenraw: new module
    
    commit ff95fe1ba84710221d4253028c4b0f8b9831f291
    Author: Samuel Verstraete <elangelo at lunar-linux.org>
    Date:   Wed Jul 23 14:52:05 2008 +0200
    
        xorg7 stuff&
---
 gnome2/core/libgda2/DETAILS              |    6 ++--
 video/ffmpeg/DEPENDS                     |    2 +-
 xorg7/driver/xf86-video-radeonhd/DETAILS |    6 ++--
 xorg7/extra/libdrm/DETAILS               |    6 ++--
 xorg7/extra/xcb-proto/DETAILS            |    6 ++--
 xorg7/lib/pixman/BUILD                   |    2 +-
 xorg7/lib/xtrans/DETAILS                 |    6 ++--
 xorg7/mesa-glu/BUILD                     |   27 -----------------
 xorg7/mesa-glu/CONFLICTS                 |    5 ---
 xorg7/mesa-glu/DEPENDS                   |    6 ----
 xorg7/mesa-glu/DETAILS                   |   30 -------------------
 xorg7/mesa-glu/PRE_BUILD                 |    5 ---
 xorg7/mesa-lib/BUILD                     |   45 ++++++++++++++++++----------
 xorg7/mesa-lib/CONFIGURE                 |   47 ++++++++++++++++++++++++++++++
 xorg7/mesa-lib/CONFLICTS                 |    8 +----
 xorg7/mesa-lib/DEPENDS                   |    1 +
 xorg7/mesa-lib/DETAILS                   |   10 +++---
 xorg7/proto/dri2proto/BUILD              |    6 ++++
 xorg7/proto/dri2proto/CONFLICTS          |    6 ++++
 xorg7/proto/dri2proto/DEPENDS            |    1 +
 xorg7/proto/dri2proto/DETAILS            |   13 ++++++++
 xorg7/proto/xf86driproto/DETAILS         |    6 ++--
 xorg7/xorg-server/BUILD                  |    8 ++--
 xorg7/xorg-server/CONFIGURE              |    2 +-
 xorg7/xorg-server/DEPENDS                |    2 +
 xorg7/xorg-server/DETAILS                |   14 ++++----
 xorg7/xorg-server/PRE_BUILD              |    4 +-
 27 files changed, 146 insertions(+), 134 deletions(-)

diff --git a/gnome2/core/libgda2/DETAILS b/gnome2/core/libgda2/DETAILS
index 183c085..e3e3960 100644
--- a/gnome2/core/libgda2/DETAILS
+++ b/gnome2/core/libgda2/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libgda2
-         VERSION=3.1.2
+         VERSION=3.1.5
           SOURCE=libgda-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgda-$VERSION
       SOURCE_URL=$GNOME_URL/sources/libgda/3.1/
-      SOURCE_VFY=sha1:b4874d24878a139671ea3b7e74a494cdb111ca45
+        SOURCE_VFY=sha1:b4874d24878a139671ea3b7e74a494cdb111ca45
         WEB_SITE=http://www.gnome-db.org
          ENTERED=20020714
-         UPDATED=20071104
+         UPDATED=20080912
            PSAFE=no
            SHORT="libgda/libgnomedb are a framework for developing database-oriented applications"
 cat << EOF
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index d64cff7..cede196 100644
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -13,6 +13,6 @@ optional_depends a52dec     "--enable-liba52 --enable-liba52bin" \
 
 optional_depends xvidcore   "--enable-libxvid"    ""  "for xvid support"
 optional_depends libdc1394  "--enable-libdc1394"  ""  "for firewire support"
-optional_depends x264-git   "--enable-libx264"    ""  "for H264 support"
+optional_depends x264-snapshot  "--enable-libx264"    ""  "for H264 support"
 optional_depends amrwb      "--enable-libamr-wb"  ""  "for AMR Wideband speech"
 optional_depends amrnb      "--enable-libamr-nb"  ""  "for AMR narrowband speech"
diff --git a/xorg7/driver/xf86-video-radeonhd/DETAILS b/xorg7/driver/xf86-video-radeonhd/DETAILS
index f43328c..df4e054 100644
--- a/xorg7/driver/xf86-video-radeonhd/DETAILS
+++ b/xorg7/driver/xf86-video-radeonhd/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xf86-video-radeonhd
-         VERSION=1.2.1
+         VERSION=1.2.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/driver/
-      SOURCE_VFY=sha1:9784c0c3562b7076de72db4a11118e0660fe2272
+      SOURCE_VFY=sha1:031d00676b0263beafba0b26060e49bf7ba52791
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://wiki.x.org/wiki/radeonhd
          ENTERED=20071130
-         UPDATED=20080414
+         UPDATED=20081013
            SHORT="the X.Org video driver for R500 and newer ATI based cards"
 
 cat << EOF
diff --git a/xorg7/extra/libdrm/DETAILS b/xorg7/extra/libdrm/DETAILS
index c31d81c..dc16e78 100644
--- a/xorg7/extra/libdrm/DETAILS
+++ b/xorg7/extra/libdrm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libdrm
-         VERSION=2.3.0
+         VERSION=2.3.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://dri.freedesktop.org/libdrm/
-      SOURCE_VFY=sha1:af2e8d6e3ad6b906b4d6f1b2ada2d523188c28ea
+      SOURCE_VFY=sha1:775dc69fcabb324552b0b9fe3a67eceb324be194
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.freedesktop.org/
          ENTERED=20061017
-         UPDATED=20061201
+         UPDATED=20080909
            SHORT="the userspace interface to kernel DRM services"
 
 cat << EOF
diff --git a/xorg7/extra/xcb-proto/DETAILS b/xorg7/extra/xcb-proto/DETAILS
index bf01313..1afaf9c 100644
--- a/xorg7/extra/xcb-proto/DETAILS
+++ b/xorg7/extra/xcb-proto/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xcb-proto
-         VERSION=1.1
+         VERSION=1.2
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://xcb.freedesktop.org/dist
-      SOURCE_VFY=sha1:72bb3fe28e7ef55af335e8df41ca871517891698
+      SOURCE_VFY=sha1:8af555f05bcd790352391a868edd0c0d4af82253
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://xcb.freedesktop.org
          ENTERED=20060216
-         UPDATED=20071122
+         UPDATED=20080719
            SHORT="the X C-bindings (XCB) protocol headers"
 
 cat << EOF
diff --git a/xorg7/lib/pixman/BUILD b/xorg7/lib/pixman/BUILD
index 624d77b..cfe3408 100644
--- a/xorg7/lib/pixman/BUILD
+++ b/xorg7/lib/pixman/BUILD
@@ -1,5 +1,5 @@
 (
-  . /etc/profile.d/x11r7.rc  &&
+  . /etc/profile.d/x11r7.rc &&
 
   default_build
 
diff --git a/xorg7/lib/xtrans/DETAILS b/xorg7/lib/xtrans/DETAILS
index 5aa00a6..64cabc3 100644
--- a/xorg7/lib/xtrans/DETAILS
+++ b/xorg7/lib/xtrans/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xtrans
-         VERSION=1.2.1
+         VERSION=1.2.2
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/lib
-      SOURCE_VFY=sha1:66d7916e5386d2e0485af04a3b2314fbccc2d23a
+      SOURCE_VFY=sha1:21fd452efc1fe196bd3b49cd0426bfef2cc3fcaa
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20080705
+         UPDATED=20081013
            SHORT="The X.Org transport library"
 
 cat << EOF
diff --git a/xorg7/mesa-glu/BUILD b/xorg7/mesa-glu/BUILD
deleted file mode 100644
index 9f7ce96..0000000
--- a/xorg7/mesa-glu/BUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-
-  sedit 's,/usr/X11R6/lib/modules,/usr/lib,' configs/default &&
-  sedit 's,/usr/X11R6,/usr,g' configs/linux* configs/default &&
-  sedit 's,lib64,lib,g' configs/linux* configs/default &&
-  sedit 's,usr/local,usr,g' configs/linux* configs/default &&
-  sedit 's,lib/modules,lib,g' src/glx/x11/dri_glx.c &&
-
-  case `arch` in
-    x86_64) CONF=linux-dri-x86-64 ;;
-    i?86)   CONF=linux-dri-x86 ;;
-    *)      exit 1 ;;
-  esac &&
-
-  make $CONF && 
-  make -C progs/xdemos PROGS='glxinfo glxgears' &&
-
-  prepare_install &&
-
-  cp -a lib/libGLU.so* lib/libglut.so* /usr/lib/ &&
-  cp -a include/GL/glu*.h /usr/include/GL/ &&
-
-  install -m644 include/GLView.h /usr/include &&
-
-  install -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
-
-) > $C_FIFO 2>&1
diff --git a/xorg7/mesa-glu/CONFLICTS b/xorg7/mesa-glu/CONFLICTS
deleted file mode 100644
index 3bb2417..0000000
--- a/xorg7/mesa-glu/CONFLICTS
+++ /dev/null
@@ -1,5 +0,0 @@
-conflicts XOrg6      &&
-conflicts XOrg-test  &&
-conflicts mesa-lib   &&
-conflicts glut       &&
-conflicts freeglut
diff --git a/xorg7/mesa-glu/DEPENDS b/xorg7/mesa-glu/DEPENDS
deleted file mode 100644
index feae696..0000000
--- a/xorg7/mesa-glu/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-depends glproto      
-depends libX11       
-depends makedepend   
-depends libdrm       
-depends libXi        
-depends libXext
diff --git a/xorg7/mesa-glu/DETAILS b/xorg7/mesa-glu/DETAILS
deleted file mode 100644
index eb9a3d9..0000000
--- a/xorg7/mesa-glu/DETAILS
+++ /dev/null
@@ -1,30 +0,0 @@
-          MODULE=mesa-glu
-         VERSION=7.0.4
-          SOURCE=MesaLib-$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=$SFORGE_URL/mesa3d/
-     SOURCE3_URL=$SFORGE_URL/mesa3d/
-      SOURCE_VFY=sha1:7e2ecbe89d245510d2681d04e959aee6adc205c5
-     SOURCE2_VFY=sha1:1adb2010d6d3103bd57c08f228e2bbed38178e14
-     SOURCE3_VFY=sha1:488a9e39f5ec4ad6b7fa84dd9bc91844337462d5
-        WEB_SITE=http://www.mesa3d.org
-      MAINTAINER=elangelo at lunar-linux.org
-         ENTERED=20060215
-         UPDATED=20080414
-           SHORT="Mesa 3D library"
-
-cat << EOF
-Mesa is a 3-D graphics library with an API which is
-very similar to that of OpenGL.* To the extent that
-Mesa utilizes the OpenGL command syntax or state machine,
-it is being used with authorization from Silicon
-Graphics, Inc.(SGI).
-
-mesa-glu provides libGL.so needed for many different programs.
-
-Choose this module instead of mesa-lib if you intend to use the NVIDIA
-or ATI (fglrx) binary driver.
-EOF
diff --git a/xorg7/mesa-glu/PRE_BUILD b/xorg7/mesa-glu/PRE_BUILD
deleted file mode 100644
index e8dce3e..0000000
--- a/xorg7/mesa-glu/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build    &&
-cd $BUILD_DIRECTORY  &&
-unpack $SOURCE2      &&
-unpack $SOURCE3             &&
-cd $SOURCE_DIRECTORY
diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index a2e9bcc..f124c6a 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,25 +1,38 @@
 (
+OPTS+="--with-dri-drivers="
+#for driver in $MESADRIVER; do
+#  echo $driver;
+#  OPTS+="$driver,";
+#done
+OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
 
-  sedit 's,/usr/X11R6/lib/modules,/usr/lib,' configs/default &&
-  sedit 's,/usr/X11R6,/usr,g' configs/linux* configs/default &&
-  sedit 's,lib64,lib,g' configs/linux* configs/default &&
-  sedit 's,usr/local,usr,g' configs/linux* configs/default &&
-  sedit 's,lib/modules,lib,g' src/glx/x11/dri_glx.c &&
-  sedit 's,[-]g,,g' configs/default configs/linux-dri-x86 configs/linux-dri-x86-64 configs/linux-dri &&
 
-  case `arch` in
-    x86_64) CONF=linux-dri-x86-64 ;;
-    i?86)   CONF=linux-dri ;;
-    *)      exit 1 ;;
-  esac &&
 
-  make $CONF &&
-  make -C progs/xdemos PROGS='glxinfo glxgears' &&
+
+
+#  sedit 's,/usr/X11R6/lib/modules,/usr/lib,' configs/default &&
+#  sedit 's,/usr/X11R6,/usr,g' configs/linux* configs/default &&
+#  sedit 's,lib64,lib,g' configs/linux* configs/default &&
+#  sedit 's,usr/local,usr,g' configs/linux* configs/default &&
+#  sedit 's,lib/modules,lib,g' src/glx/x11/dri_glx.c &&
+#  sedit 's,[-]g,,g' configs/default configs/linux-dri-x86 configs/linux-dri-x86-64 configs/linux-dri &&
+
+#  case `arch` in
+#    x86_64) CONF=linux-dri-x86-64 ;;
+#    i?86)   CONF=linux-dri ;;
+#    *)      exit 1 ;;
+#  esac &&
+
+#  make $CONF &&
+  ./configure --prefix=/usr $OPTS && 
+  #make -C progs/xdemos PROGS='glxinfo glxgears' &&
 
   prepare_install &&
 
-  make install                                                &&
-  install -v -m644 include/GLView.h /usr/include/        &&
-  install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
+  make && 
+
+ make install                                                
+  #install -v -m644 include/GLView.h /usr/include/        &&
+  #install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
new file mode 100644
index 0000000..8866664
--- /dev/null
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -0,0 +1,47 @@
+SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis swrast tdfx trident unichrome"
+
+make_drivers_checklist() {
+  
+  # Execute the modified supported locales file to get a list of 
+  # supported variables in the $SUPPORTED_LOCALES variable
+#  . $SUPPORTED_DRIVERS &&
+  
+  # For each locale, extract name, title and charmap information
+  for driver in $SUPPORTED_DRIVERS; do
+      title=$driver
+
+    echo "\"$driver\" \"$title\" \"off\" "
+  done
+}
+
+select_drivers() {
+  BACKTITLE="MesaLib Configuration"
+      TITLE="Driver Selection"
+       HELP=""
+  make_drivers_checklist | xargs \
+  dialog --backtitle "$BACKTITLE" \
+         --title     "$TITLE"     \
+         --stdout                 \
+         --separate-output        \
+         --checklist "$HELP"      \
+         0 0 0
+}
+
+if ! grep -q CONFIGURED $MODULE_CONFIG; then
+  if grep -q "MESADRIVER=" $MODULE_CONFIG; then
+    message "Selecting drivers is optional"
+  fi
+
+  if query "Would you like to select drivers? (if not selected, all locales will be installed)" y; then
+    unpack_localedata
+
+    MESADRIVER=`select_drivers`
+    TEMP=`grep -v "MESADRIVER="             $MODULE_CONFIG`
+    echo "$TEMP"                             > $MODULE_CONFIG
+    echo "MESADRIVER=\"$MESADRIVER\"" >> $MODULE_CONFIG
+
+  fi
+
+  echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
+  echo "CONFIGURED=y"          >> $MODULE_CONFIG
+fi
diff --git a/xorg7/mesa-lib/CONFLICTS b/xorg7/mesa-lib/CONFLICTS
index 92b4411..e53e630 100644
--- a/xorg7/mesa-lib/CONFLICTS
+++ b/xorg7/mesa-lib/CONFLICTS
@@ -1,6 +1,2 @@
-conflicts XOrg6       &&
-conflicts XOrg-test   &&
-conflicts NVIDIA-old  &&
-conflicts mesa-glu    &&
-conflicts glut        &&
-conflicts freeglut
+conflicts XOrg6
+conflicts XOrg-test
diff --git a/xorg7/mesa-lib/DEPENDS b/xorg7/mesa-lib/DEPENDS
index 054cb73..42477c4 100644
--- a/xorg7/mesa-lib/DEPENDS
+++ b/xorg7/mesa-lib/DEPENDS
@@ -6,3 +6,4 @@ depends libXi
 depends libXext
 depends libXfixes
 depends libXdamage
+depends dri2proto
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index 6bb9f5c..f44a785 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -1,5 +1,5 @@
            MODULE=mesa-lib
-          VERSION=7.0.4
+          VERSION=7.2
            SOURCE=MesaLib-$VERSION.tar.bz2
           SOURCE2=MesaDemos-$VERSION.tar.bz2
           SOURCE3=MesaGLUT-$VERSION.tar.bz2
@@ -7,12 +7,12 @@
        SOURCE_URL=$SFORGE_URL/mesa3d/
       SOURCE2_URL=$SFORGE_URL/mesa3d/
       SOURCE3_URL=$SFORGE_URL/mesa3d/
-       SOURCE_VFY=sha1:7e2ecbe89d245510d2681d04e959aee6adc205c5
-      SOURCE2_VFY=sha1:1adb2010d6d3103bd57c08f228e2bbed38178e14
-      SOURCE3_VFY=sha1:488a9e39f5ec4ad6b7fa84dd9bc91844337462d5
+       SOURCE_VFY=sha1:a6dce814cc56a562890ab79cf4e205f62459a29c
+      SOURCE2_VFY=sha1:3d7b9b3ee84ed3637849f7598faf3d60c5a2a9fd
+      SOURCE3_VFY=sha1:2d969fc8214622b93bcc594c36e56bb573678d05
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20080818
+          UPDATED=20080921
             PSAFE="no"
             SHORT="Mesa 3D library"
 
diff --git a/xorg7/proto/dri2proto/BUILD b/xorg7/proto/dri2proto/BUILD
new file mode 100644
index 0000000..cfe3408
--- /dev/null
+++ b/xorg7/proto/dri2proto/BUILD
@@ -0,0 +1,6 @@
+(
+  . /etc/profile.d/x11r7.rc &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/xorg7/proto/dri2proto/CONFLICTS b/xorg7/proto/dri2proto/CONFLICTS
new file mode 100644
index 0000000..fa885b1
--- /dev/null
+++ b/xorg7/proto/dri2proto/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts XOrg6
+conflicts XOrg-test
+conflicts XOrg-fonts-base
+conflicts XOrg-fonts-extra
+conflicts XOrg-drm
+conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/dri2proto/DEPENDS b/xorg7/proto/dri2proto/DEPENDS
new file mode 100644
index 0000000..af131c9
--- /dev/null
+++ b/xorg7/proto/dri2proto/DEPENDS
@@ -0,0 +1 @@
+depends xproto
diff --git a/xorg7/proto/dri2proto/DETAILS b/xorg7/proto/dri2proto/DETAILS
new file mode 100644
index 0000000..8144981
--- /dev/null
+++ b/xorg7/proto/dri2proto/DETAILS
@@ -0,0 +1,13 @@
+          MODULE=dri2proto
+         VERSION=1.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$XORG_URL/individual/proto
+      SOURCE_VFY=sha1:6429338a703561c02c0aa7516d1d981e7a2bf005
+   MODULE_PREFIX=${X11R7_PREFIX:-/usr}
+        WEB_SITE=http://www.x.org
+         ENTERED=20080909
+         UPDATED=20080909
+           SHORT="Protocol headers"
+
+cat << EOF
+EOF
diff --git a/xorg7/proto/xf86driproto/DETAILS b/xorg7/proto/xf86driproto/DETAILS
index 3643d4d..9cf4a76 100644
--- a/xorg7/proto/xf86driproto/DETAILS
+++ b/xorg7/proto/xf86driproto/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xf86driproto
-         VERSION=2.0.3
+         VERSION=2.0.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/proto/
-      SOURCE_VFY=sha1:7ec544426fd33239ae7b0a293baa41a82eb2cbf4
+      SOURCE_VFY=sha1:bba018443dad831b328e7353cf034522401e2e6b
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120
-         UPDATED=20060120
+         UPDATED=20080923
            SHORT="the X.Org XFree86-DRI protocol headers"
 
 cat << EOF
diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index eefd0f4..cc345d7 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -6,13 +6,13 @@
     rm -f /usr/share/X11/xkb/compiled
   fi &&
 
-  if [[ "$USE_NVIDIA" = "y" ]]; then
-    OPTS="$OPTS --disable-glx --disable-glx-tlx"
-  fi &&
+#  if [[ "$USE_NVIDIA" = "y" ]]; then
+#    OPTS="$OPTS --disable-glx --disable-glx-tlx"
+#  fi &&
 
   OPTS+=" --enable-composite --enable-aiglx --enable-xorgcfg \
-         --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
          --with-dri-driver-path=${MODULE_PREFIX}/lib/dri" &&
+         #--with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
 
   default_build &&
 
diff --git a/xorg7/xorg-server/CONFIGURE b/xorg7/xorg-server/CONFIGURE
index 659c2db..7bf847c 100644
--- a/xorg7/xorg-server/CONFIGURE
+++ b/xorg7/xorg-server/CONFIGURE
@@ -1 +1 @@
-mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
+#mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
diff --git a/xorg7/xorg-server/DEPENDS b/xorg7/xorg-server/DEPENDS
index c657725..c69f468 100644
--- a/xorg7/xorg-server/DEPENDS
+++ b/xorg7/xorg-server/DEPENDS
@@ -29,5 +29,7 @@ depends  pixman
 depends  dbus-glib
 depends  hal
 depends  xkeyboard-config
+depends  mesa-lib
+depends  libpciaccess
 
 optional_depends "acpid" "" "" "for ACPI support through xorg-server"
diff --git a/xorg7/xorg-server/DETAILS b/xorg7/xorg-server/DETAILS
index 04b15c9..db3a184 100644
--- a/xorg7/xorg-server/DETAILS
+++ b/xorg7/xorg-server/DETAILS
@@ -1,16 +1,16 @@
           MODULE=xorg-server
-         VERSION=1.4.2
-    MESA_VERSION=7.0.4
+         VERSION=1.5.2
+    #MESA_VERSION=7.1
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
+     #    SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
       SOURCE_URL=$XORG_URL/individual/xserver
-     SOURCE2_URL=$SFORGE_URL/mesa3d
-      SOURCE_VFY=sha1:385348721ecb6da4bc51a2b7ee5784de6be0a8b6
-     SOURCE2_VFY=sha1:7e2ecbe89d245510d2681d04e959aee6adc205c5
+    # SOURCE2_URL=$SFORGE_URL/mesa3d
+      SOURCE_VFY=sha1:fc8b5ed20af34f504d55a004c35ebacbc603b339
+    # SOURCE2_VFY=sha1:0b946a8a4334ca22baf3e0fe583f88187e9d74fa
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20080816
+         UPDATED=20080925
       MAINTAINER=elangelo at lunar-linux.org
            SHORT="The X.Org X11R7 server for the X Window System"
 
diff --git a/xorg7/xorg-server/PRE_BUILD b/xorg7/xorg-server/PRE_BUILD
index de60ec0..3185795 100644
--- a/xorg7/xorg-server/PRE_BUILD
+++ b/xorg7/xorg-server/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build         &&
-cd $SOURCE_DIRECTORY         &&
-unpack $SOURCE2
+cd $SOURCE_DIRECTORY         
+#unpack $SOURCE2


More information about the Lunar-commits mailing list