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

Samuel samuel.verstraete at gmail.com
Wed Apr 8 08:12:00 CEST 2009


commit 4ec5a95100e893b64f6aae338e9518f40048b671
Author: Samuel <samuel.verstraete at gmail.com>
Date:   Wed Apr 8 08:12:00 2009 +0200

    Xorg 7.4
    Squashed commit of the following:
    
    commit e8e267877d4e2460c95fd15ff260e6c1e49d2d68
    Author: Samuel <samuel.verstraete at gmail.com>
    Date:   Wed Apr 1 07:21:08 2009 +0200
    
        mesa-lib: version bump, 7.4
    
    commit dcfed964f36c93bacb8fc8586c7d2a8357d18c65
    Author: Samuel <samuel.verstraete at gmail.com>
    Date:   Wed Apr 1 07:21:25 2009 +0200
    
        dri2proto: version bump 1.99.3
    
    commit c47f3d03d4917695b2e5517bdc80d3b490565ad6
    Merge: 5621c22 dab3543
    Author: Samuel <samuel.verstraete at gmail.com>
    Date:   Wed Apr 8 08:08:18 2009 +0200
    
        Merge branch 'master' into xorg
    
        Conflicts:
        	xorg7/xorg-server/DETAILS
    
    commit 5621c22b2b531a8767356135530bbfd305e00406
    Author: Samuel <samuel.verstraete at gmail.com>
    Date:   Wed Apr 1 07:19:53 2009 +0200
    
        Revert "mpfr: versino bump"
    
        This reverts commit 8249152cb38cf15ec8d2054f30ab86aea611d460.
    
    commit 8249152cb38cf15ec8d2054f30ab86aea611d460
    Author: Samuel <samuel.verstraete at gmail.com>
    Date:   Wed Apr 1 07:19:30 2009 +0200
    
        mpfr: versino bump
    
    commit dc7ac17e9b64ac7304e9e679cdd884490a0ff5a2
    Merge: 64731f1 d540312
    Author: Samuel <samuel.verstraete at gmail.com>
    Date:   Mon Mar 2 20:05:38 2009 +0100
    
        Merge branch 'xorg' of ssh://elangelo@foo-projects.org/home/elangelo/moonbase into xorg
    
    commit d540312b43a9f725b8ab11c4e9b9810570b151bd
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Mon Mar 2 15:25:27 2009 +0100
    
        libxcb:POST_INSTALL added sort_by_dependency
    
    commit 36395d82ace196e42aa8ab1d56a4ef67c34ef92d
    Author: Samuel Verstraete <samuel.verstraete at gmail.com>
    Date:   Mon Mar 2 15:21:57 2009 +0100
    
        libxcb: add a special hook for this version
    
    commit 856ccf1efc89525f0618a3e569733640e6a0471e
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sun Mar 1 21:16:31 2009 +0100
    
        xorg-server extra depends and libxcb build stuff
    
    commit 8b9c812e177b690e8a7c9ec42554567b83016dff
    Merge: cc7801f 8f1eba4
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sun Mar 1 21:16:15 2009 +0100
    
        Merge branch 'master' into xorg
    
    commit cc7801f453b3b2efc2339f787c60a31bb88b8c27
    Merge: d6bf5e8 05a136d
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sun Mar 1 08:44:51 2009 +0100
    
        Merge branch 'master' into xorg
    
    commit d6bf5e834940bc54bdb34dd475551833463ed10d
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sun Mar 1 08:44:28 2009 +0100
    
        xorg-server: remove the patch stuff
    
    commit 05a136ddf3db399760e33f6b4a7e398cce633902
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sat Feb 28 20:41:13 2009 +0100
    
        randrproto 1.2.99.4
    
    commit 8273502017d7fe08ea154c9ec57e935ac8c32ebd
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sat Feb 28 20:40:56 2009 +0100
    
        xorg-server 1.6.0
    
    commit 2bae896a24e2ede2d1e2070471d99827f4d63dd9
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sat Feb 28 20:40:30 2009 +0100
    
        libXi 1.2.1
    
    commit f3425e31396e15afe530f430e4b1b8df61432bb9
    Merge: 2a5ac0f 77cb581
    Author: samuel verstraete <samuel.verstraete at gmail.com>
    Date:   Sat Feb 28 20:32:45 2009 +0100
    
        Merge branch 'xorg' of ssh://elangelo@doppio.foo-projects.org/home/elangelo/moonbase
    
        Conflicts:
        	xorg7/extra/libdrm/DETAILS
---
 xorg7/driver/xf86-input-fpit/DETAILS     |    6 +++---
 xorg7/driver/xf86-input-penmount/DETAILS |    6 +++---
 xorg7/extra/libxcb/BUILD                 |    2 +-
 xorg7/extra/libxcb/DETAILS               |   12 ++++++------
 xorg7/extra/libxcb/POST_INSTALL          |    5 +++++
 xorg7/extra/xcb-proto/DETAILS            |    6 +++---
 xorg7/lib/libX11/DETAILS                 |    6 +++---
 xorg7/lib/libXfont/DETAILS               |    6 +++---
 xorg7/lib/libXi/DETAILS                  |    6 +++---
 xorg7/mesa-lib/BUILD                     |    2 +-
 xorg7/mesa-lib/CONFIGURE                 |    6 +-----
 xorg7/mesa-lib/DETAILS                   |   10 +++++-----
 xorg7/proto/dri2proto/DETAILS            |    6 +++---
 xorg7/proto/randrproto/DETAILS           |    6 +++---
 xorg7/xorg-server/BUILD                  |    2 +-
 xorg7/xorg-server/DEPENDS                |    1 +
 xorg7/xorg-server/DETAILS                |   12 ++++++------
 17 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/xorg7/driver/xf86-input-fpit/DETAILS b/xorg7/driver/xf86-input-fpit/DETAILS
index d3a3058..679f50f 100644
--- a/xorg7/driver/xf86-input-fpit/DETAILS
+++ b/xorg7/driver/xf86-input-fpit/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xf86-input-fpit
-         VERSION=1.2.0
+         VERSION=1.3.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/driver/
-      SOURCE_VFY=sha1:9b52aa91d97dd4d64e494090bee5c29cd57048d5
+      SOURCE_VFY=sha1:bc80c546c1b7838754a02a99391dbe31e5f1c475
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060303
-         UPDATED=20080414
+         UPDATED=20090228
            SHORT="Fujitsu Stylistic input driver"
 
 cat << EOF
diff --git a/xorg7/driver/xf86-input-penmount/DETAILS b/xorg7/driver/xf86-input-penmount/DETAILS
index a7ad42f..9ddd611 100644
--- a/xorg7/driver/xf86-input-penmount/DETAILS
+++ b/xorg7/driver/xf86-input-penmount/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xf86-input-penmount
-         VERSION=1.3.0
+         VERSION=1.4.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/driver/
-      SOURCE_VFY=sha1:d77e4570b5b96500720eae3768dd1e23808a68fc
+      SOURCE_VFY=sha1:f997597a754f5dd0b5df4c1db0b42fbb11400514
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060303
-         UPDATED=20080414
+         UPDATED=20090228
            SHORT="penmount input driver"
 
 cat << EOF
diff --git a/xorg7/extra/libxcb/BUILD b/xorg7/extra/libxcb/BUILD
index 9462acb..8b665b6 100644
--- a/xorg7/extra/libxcb/BUILD
+++ b/xorg7/extra/libxcb/BUILD
@@ -1,7 +1,7 @@
 (
   . /etc/profile.d/x11r7.rc &&
 
-  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+#  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
 
   default_build
 
diff --git a/xorg7/extra/libxcb/DETAILS b/xorg7/extra/libxcb/DETAILS
index fa0669c..c309f7c 100644
--- a/xorg7/extra/libxcb/DETAILS
+++ b/xorg7/extra/libxcb/DETAILS
@@ -1,15 +1,15 @@
           MODULE=libxcb
-         VERSION=1.1
+         VERSION=1.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-          SOURCE2=xcb-1.1_xlib-no-assert-on-lock.patch
+#        SOURCE2=xcb-1.1_xlib-no-assert-on-lock.patch
       SOURCE_URL=http://xcb.freedesktop.org/dist
-      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:b27c7eb86fd2ea43cea83cadcf20cc77abf5defe
-      SOURCE2_VFY=sha1:ee21ec4f4f7c1dfe05cdb75eafb073ffa0cdac0c
+#    SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:12be595ce1e26da3b63e6a17a47ab9392259f10f
+#    SOURCE2_VFY=sha1:ee21ec4f4f7c1dfe05cdb75eafb073ffa0cdac0c
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://xcb.freedesktop.org
          ENTERED=20070216
-         UPDATED=20071122
+         UPDATED=20090228
            SHORT="replacement of the Xlib interface"
 
 cat << EOF
diff --git a/xorg7/extra/libxcb/POST_INSTALL b/xorg7/extra/libxcb/POST_INSTALL
new file mode 100644
index 0000000..4e6f251
--- /dev/null
+++ b/xorg7/extra/libxcb/POST_INSTALL
@@ -0,0 +1,5 @@
+LIST=$(for i in $(grep libxcb-xlib.la /usr/lib/*.la | cut -d":" -f1); do j=$(lvu from $i|cut -d":" -f1); echo $j; done | sort -n)
+for i in $(sort_by_dependency $LIST); do
+  lin -c $i;
+done
+  
diff --git a/xorg7/extra/xcb-proto/DETAILS b/xorg7/extra/xcb-proto/DETAILS
index 1afaf9c..86ecdc7 100644
--- a/xorg7/extra/xcb-proto/DETAILS
+++ b/xorg7/extra/xcb-proto/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xcb-proto
-         VERSION=1.2
+         VERSION=1.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://xcb.freedesktop.org/dist
-      SOURCE_VFY=sha1:8af555f05bcd790352391a868edd0c0d4af82253
+      SOURCE_VFY=sha1:ab9bb7c875558a3324673bb749e0502046f31083
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://xcb.freedesktop.org
          ENTERED=20060216
-         UPDATED=20080719
+         UPDATED=20090228
            SHORT="the X C-bindings (XCB) protocol headers"
 
 cat << EOF
diff --git a/xorg7/lib/libX11/DETAILS b/xorg7/lib/libX11/DETAILS
index e15acc7..eddcae9 100644
--- a/xorg7/lib/libX11/DETAILS
+++ b/xorg7/lib/libX11/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libX11
-         VERSION=1.1.5
+         VERSION=1.2
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/lib
-      SOURCE_VFY=sha1:b703cb7c97e5aa35bf04a8df798e128ae16cf0d0
+      SOURCE_VFY=sha1:b3d2bbdb5839031f4372c5711348d493c7a41dd6
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20080908
+         UPDATED=20090228
            SHORT="The X.Org client-side library"
 
 cat << EOF
diff --git a/xorg7/lib/libXfont/DETAILS b/xorg7/lib/libXfont/DETAILS
index 2b7f2c0..b51bf13 100644
--- a/xorg7/lib/libXfont/DETAILS
+++ b/xorg7/lib/libXfont/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libXfont
-         VERSION=1.3.4
+         VERSION=1.4.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/lib
-      SOURCE_VFY=sha1:d7782b506f82cfce928c8be35be859c18f1e852f
+      SOURCE_VFY=sha1:f47a2f41273cdbe5198ac700df70686fab72cd35
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20081225
+         UPDATED=20090228
            SHORT="The X.Org font rasterisation library"
 
 cat << EOF
diff --git a/xorg7/lib/libXi/DETAILS b/xorg7/lib/libXi/DETAILS
index 2994833..c78442a 100644
--- a/xorg7/lib/libXi/DETAILS
+++ b/xorg7/lib/libXi/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libXi
-         VERSION=1.2.0
+         VERSION=1.2.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/lib
-      SOURCE_VFY=sha1:2395265b87556bd60216d0e5b56080380d0a3bd5
+      SOURCE_VFY=sha1:47a1141bfafbdc4eca0d742acd7b978f98c7a749
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20081225
+         UPDATED=20090228
            SHORT="The X.Org XINPUT extension library"
 
 cat << EOF
diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index 58a78dd..cd7e7a9 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -8,7 +8,7 @@
   make && 
 
   make install                                                
-  install -v -m644 include/GLView.h /usr/include/        &&
+#  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
index 2d1a6ad..f4bb4d2 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -2,10 +2,6 @@ SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage si
 
 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
@@ -32,7 +28,7 @@ if ! grep -q CONFIGURED $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
+  if query "Would you like to select drivers? (if not selected, all drivers will be installed)" y; then
     unpack_localedata
 
     MESADRIVER=`select_drivers`
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index 57ba101..8677788 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -1,5 +1,5 @@
            MODULE=mesa-lib
-          VERSION=7.2
+          VERSION=7.4
            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:a6dce814cc56a562890ab79cf4e205f62459a29c
-      SOURCE2_VFY=sha1:3d7b9b3ee84ed3637849f7598faf3d60c5a2a9fd
-      SOURCE3_VFY=sha1:2d969fc8214622b93bcc594c36e56bb573678d05
+       SOURCE_VFY=sha1:66b5fe185e63706ee2a76e247fd982fdf13972e2
+      SOURCE2_VFY=sha1:d57c792e05fe5347ff8600f8aab078fe047a4035
+      SOURCE3_VFY=sha1:91a405b23b0b848325cc11fbffc0f62008d2a9a7
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20080921
+          UPDATED=20090331
             PSAFE="no"
             SHORT="Mesa 3D library"
 
diff --git a/xorg7/proto/dri2proto/DETAILS b/xorg7/proto/dri2proto/DETAILS
index 8144981..a9475d1 100644
--- a/xorg7/proto/dri2proto/DETAILS
+++ b/xorg7/proto/dri2proto/DETAILS
@@ -1,12 +1,12 @@
           MODULE=dri2proto
-         VERSION=1.1
+         VERSION=1.99.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/proto
-      SOURCE_VFY=sha1:6429338a703561c02c0aa7516d1d981e7a2bf005
+      SOURCE_VFY=sha1:0be97cbc1440df50cd950b4b5f36e5fcb44a4ab7
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20080909
-         UPDATED=20080909
+         UPDATED=20090331
            SHORT="Protocol headers"
 
 cat << EOF
diff --git a/xorg7/proto/randrproto/DETAILS b/xorg7/proto/randrproto/DETAILS
index 86daa2a..d229f5f 100644
--- a/xorg7/proto/randrproto/DETAILS
+++ b/xorg7/proto/randrproto/DETAILS
@@ -1,12 +1,12 @@
           MODULE=randrproto
-         VERSION=1.2.2
+         VERSION=1.2.99.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$XORG_URL/individual/proto
-      SOURCE_VFY=sha1:bc231f1099eea9c5365679053a6ff3353e974ff9
+      SOURCE_VFY=sha1:5266dac65661a58dcca999633d87a4d6708775a8
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20080705
+         UPDATED=20090228
            SHORT="The X.Org RandR protocol headers"
 
 cat << EOF
diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 3538870..338b591 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -1,6 +1,6 @@
 (
 
-  patch_it $SOURCE2 1 &&
+#  patch_it $SOURCE2 1 &&
 
   . /etc/profile.d/x11r7.rc &&
 
diff --git a/xorg7/xorg-server/DEPENDS b/xorg7/xorg-server/DEPENDS
index c69f468..23bfa4d 100644
--- a/xorg7/xorg-server/DEPENDS
+++ b/xorg7/xorg-server/DEPENDS
@@ -31,5 +31,6 @@ depends  hal
 depends  xkeyboard-config
 depends  mesa-lib
 depends  libpciaccess
+depends  libXinerama
 
 optional_depends "acpid" "" "" "for ACPI support through xorg-server"
diff --git a/xorg7/xorg-server/DETAILS b/xorg7/xorg-server/DETAILS
index 92e818f..a2fd1cb 100644
--- a/xorg7/xorg-server/DETAILS
+++ b/xorg7/xorg-server/DETAILS
@@ -1,15 +1,15 @@
           MODULE=xorg-server
-         VERSION=1.5.3
+         VERSION=1.6.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=updateXf86InfoDefaults.patch
+#        SOURCE2=updateXf86InfoDefaults.patch
       SOURCE_URL=$XORG_URL/individual/xserver
-      SOURCE_VFY=sha1:177529b6d7191a73df6abf2990cd7708398a8d81
-     SOURCE2_URL=http://foo-projects.org/~elangelo/
-     SOURCE2VFY=sha1:33d767d4012be79e499226eeed6461788113a137
+      SOURCE_VFY=sha1:9baf703a0dac91cb84c02caea18268d6afa78662
+#     SOURCE2_URL=http://foo-projects.org/~elangelo/
+#     SOURCE2VFY=sha1:33d767d4012be79e499226eeed6461788113a137
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20090111
+         UPDATED=20090228
       MAINTAINER=elangelo at lunar-linux.org
            SHORT="The X.Org X11R7 server for the X Window System"
 


More information about the Lunar-commits mailing list