Code/build-experimental-X - Revision history

ThinkGNU: Put script in

 block.

2025-04-11T07:27:42Z

Put script in <pre> block.

Thinker: New and improved

2007-11-07T09:17:14Z

New and improved

Show changes

Thinker: Minor tweaks and add "--disable-freetype --disable-xselinux"

2007-07-31T17:40:02Z

Minor tweaks and add "--disable-freetype --disable-xselinux"

Thinker: Add pixman module

2007-06-11T14:19:22Z

Add pixman module

Thinker: Mesa has moved from CVS to Git

2006-12-08T08:16:38Z

Mesa has moved from CVS to Git

Jgor: added change directory between git clone and git repack

2006-12-06T22:49:21Z

added change directory between git clone and git repack

Thinker: Updated xkeyboard-config; git repack; removed outdated Mesa patch; added a few X modules

2006-12-06T11:55:05Z

Updated xkeyboard-config; git repack; removed outdated Mesa patch; added a few X modules

Thinker: Add XCB (default off); fix share/X11/xkb/compiled.tmp issue; add MAKE_CLEAN; add font X.org modules

2006-10-16T14:33:47Z

Add XCB (default off); fix share/X11/xkb/compiled.tmp issue; add MAKE_CLEAN; add font X.org modules

Thinker: Allow forced reconfiguring; avoid reconfiguring libdrm unnecessarily; fix Mesa "make"; disable xprint; change X permissions; add FETCH and BUILD flags

2006-10-06T11:13:05Z

Allow forced reconfiguring; avoid reconfiguring libdrm unnecessarily; fix Mesa "make"; disable xprint; change X permissions; add FETCH and BUILD flags

Singularity: added missing Xau

2006-09-22T18:31:29Z

added missing Xau

@@ Line 1: / Line 1: @@
 #!/bin/bash
 # Script to fetch and build X.org (incl. XCB and pixman), DRI, Mesa and
@@ Line 458: / Line 459: @@
 echo "Done."
 ! $FETCH || echo "Run '. $DEST/bin/xsetenv' to point env vars to this installation."

@@ Line 9: / Line 9: @@
 #   http://gitweb.freedesktop.org
 #   http://dri.freedesktop.org/wiki/Building
-#   http://www.mesa3d.org/cvs_access.html
+#   http://www.mesa3d.org/repository.html
 #   http://www.mesa3d.org/install.html
 #   http://web.telia.com/~u89404340/touchpad
@@ Line 17: / Line 17: @@
 #############################################
 # Init
 PIT=$HOME/3d-pit       # Download and build here
 DEST=$PIT/install      # Install here
 FLAGS='-O2 -g -march=pentium-m'
 trap "echo Aborting.; exit 1" ERR
@@ Line 46: / Line 58: @@
      run cd "$PARENT_DIR/$DIR"
      run git pull
    else
      run cd "$PARENT_DIR"
@@ Line 54: / Line 67: @@
+}
-LAST_HASH=last_dir_hash
+LAST_HASH=.last_dir_hash
 dir_hash() {
    find . \( -name $LAST_HASH -o -path ./.git -prune \) -o -type f -ls | sort | md5sum
@@ Line 192: / Line 205: @@
    export LD_LIBRARY_PATH="$DEST/lib:$LD_LIBRARY_PATH"
    if [ $D == "xserver" ]; then
-     CONF_OPT="--with-mesa-source=$PIT/mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint"
+     CONF_OPT="--with-mesa-source=$PIT/mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint --disable-freetype --disable-xselinux"
    elif [ $D == "lib/libX11" ] && ! $USE_XCB; then
      CONF_OPT="--with-xcb=no"
@@ Line 265: / Line 278: @@
    export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
    export PATH="$DEST/bin:$PATH"
    ! $MAKE_CLEAN || run make clean
    run make
@@ Line 284: / Line 298: @@
 #############################################
 # Do it:
 if $FETCH; then

@@ Line 160: / Line 160: @@
    xorg/lib/lib{Xfont,Xfontcache,Xft}
    xorg/lib/lib{xkbui,Xrandr,Xv,XvMC,Xxf86dga,Xxf86misc,Xxf86vm}
    xorg/xserver
    xorg/driver/xf86-video-ati

@@ Line 105: / Line 105: @@
 fetch_mesa() {
    echo "########### Fetching Mesa ###########"
-   MESA_CVS=:pserver:anonymous@anoncvs.freedesktop.org:2401/cvs/mesa
+   MESA_GIT=git://anongit.freedesktop.org/git/mesa
    run mkdir -p $PIT
    run cd $PIT
-   grep -qF $MESA_CVS ~/.cvspass || run cvs -d $MESA_CVS login
+   fetch_from_git "$PIT" "$MESA_GIT" mesa
+}
@@ Line 120: / Line 117: @@
    echo "########### Building Mesa ###########"
    # This uses both old-style and new-style vars, to support older Mesa snapshots.
-   run cd $PIT/Mesa
+   run cd $PIT/mesa
    export DRM_SOURCE_PATH=$PIT/drm
    export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ Line 194: / Line 191: @@
    export LD_LIBRARY_PATH="$DEST/lib:$LD_LIBRARY_PATH"
    if [ $D == "xserver" ]; then
-     CONF_OPT="--with-mesa-source=$PIT/Mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint"
+     CONF_OPT="--with-mesa-source=$PIT/mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint"
    elif [ $D == "lib/libX11" ] && ! $USE_XCB; then
      CONF_OPT="--with-xcb=no"

@@ Line 49: / Line 49: @@
      run cd "$PARENT_DIR"
      run git clone "$GIT_REP/$MODULE" "$DIR"
      git repack -d
    fi

@@ Line 20: / Line 20: @@
 PIT=$HOME/3d-pit       # Download and build here
 DEST=$PIT/install      # Install here
 # MESA_DATE=2006-06-29 # Set this to get a historical Mesa CVS snapshot
 RECONFIGURE=false      # Reconfigure everything even if unchanged from last run
 MAKE_CLEAN=false       # If true, run "make clean" before building.
@@ Line 27: / Line 27: @@
 trap "echo Aborting.; exit 1" ERR
 die() {
@@ Line 48: / Line 49: @@
      run cd "$PARENT_DIR"
      run git clone "$GIT_REP/$MODULE" "$DIR"
    fi
+}
@@ Line 109: / Line 111: @@
    run cd $PIT/Mesa
    run cvs -z3 update -ACPd ${MESA_DATE:+-D $MESA_DATE}
+}
@@ Line 149: / Line 145: @@
 # build order (see util/modular/build.sh for dependencies).
 # Check CVS and the above URLs for other modules.
 XORG_DIRS=(
@@ Line 164: / Line 164: @@
    xorg/xserver
    xorg/driver/xf86-video-ati
-   xorg/driver/xf86-input-mouse driver/xf86-input-keyboard
+   xorg/driver/xf86-input-{mouse,keyboard,evdev}
-   xorg/app/{xkbutils,xkbcomp,setxkbmap}
+   xorg/app/{xkbutils,xkbcomp,setxkbmap,xrandr,xsetpointer}
+)
@@ Line 228: / Line 228: @@
 fetch_xkeyboard_config() {
    echo "########### Fetching xkeyboard-config ###########"
-   XKBC_CVS=:pserver:anoncvs@cvs.freedesktop.org:2401/cvs/xlibs
+   XKBC_CVS=:pserver:anoncvs@cvs.freedesktop.org:2401/cvs/xkeyboard-config
    run cd $PIT
    grep -qF $XKBC_CVS ~/.cvspass || run cvs -d $XKBC_CVS login
-   [ -d xkbdesc ] || run cvs -z3 -d $XKBC_CVS co xkbdesc
+   [ -d xkeyboard-config ] || run cvs -z3 -d $XKBC_CVS co xkeyboard-config
-   run cd $PIT/xkbdesc
+   run cd $PIT/xkeyboard-config
    run cvs -z3 update -ACPd
+}
@@ Line 238: / Line 238: @@
 build_xkeyboard_config() { (
    echo "########### Building xkeyboard-config ###########"
-   run cd $PIT/xkbdesc
+   run cd $PIT/xkeyboard-config
    run ./autogen.sh
    export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
    export PATH="$DEST/bin:$PATH"
    CFLAGS="$FLAGS" run ./configure --quiet --prefix=$DEST \
      --with-xkb-base=$DEST/share/X11/xkb --with-xkb-rules-symlink=xorg
    run make
    # "make install" replaces share/X11/xkb/compiled.tmp with a junk symlink, so override it:
@@ Line 292: / Line 292: @@
     fetch_drm
     fetch_mesa
     fetch_xorg
     fetch_xkeyboard_config

@@ Line 13: / Line 13: @@
 #   http://web.telia.com/~u89404340/touchpad
 #   http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
 #############################################
@@ Line 22: / Line 23: @@
 FLAGS='-O2 -g -march=pentium-m'
 RECONFIGURE=false      # Reconfigure everything even if unchanged from last run
 trap "echo Aborting.; exit 1" ERR
@@ Line 76: / Line 79: @@
      save_dir_hash
    fi
-   run make clean
+   ! $MAKE_CLEAN || run make clean
    run make
    save_dir_hash
@@ Line 86: / Line 89: @@
    echo "########### Build DRM kernel modules ###########"
    run cd $PIT/drm/linux-core
    run make DRM_MODULES="radeon"
    run sudo sh -c \
@@ Line 129: / Line 133: @@
    export PATH="$DEST/bin:$PATH"
    run mkdir -p $DRI_DRIVER_INSTALL_DIR
    if [ -e configs/current ]; then
      run make -e
@@ Line 146: / Line 151: @@
 XORG_DIRS=(
-   util/macros
+   xorg/util/macros
-   proto/{bigreqs,composite,fixes,damage,gl,input,kb,pm,randr,resource,xext,xcmisc}proto
+   xorg/proto/{bigreqs,composite,fixes,damage,gl,input,kb,pm,randr,resource,xext,xcmisc}proto
-   proto/{render,scrnsaver,video}proto
+   xorg/proto/{fontcache,fonts,kb}proto
-   proto/{x11,xf86dga,xf86dri,xf86misc,xf86vidmode,xinerama}proto
+  xorg/proto/{render,scrnsaver,video}proto
-   lib/lib{xtrans,Xau,X11,ICE,SM,Xt,Xmu,Xcomposite,Xrender,Xdamage,Xcursor,Xi,Xinerama}
+   xorg/proto/{x11,xf86dga,xf86dri,xf86misc,xf86vidmode,xinerama}proto
-   lib/lib{xkbui,Xrandr,Xv,XvMC,Xxf86dga,Xxf86misc,Xxf86vm}
+   xcb/proto
-   xserver
+  xorg/lib/lib{xtrans,Xau,Xdmcp}
-   driver/xf86-video-ati
+  xcb/libxcb
-   driver/xf86-input-mouse driver/xf86-input-keyboard
+  xorg/lib/lib{X11,ICE,SM,Xt,Xmu,Xcomposite,Xrender,Xdamage,Xcursor,Xi,Xinerama}
-   app/{xkbutils,xkbcomp,setxkbmap}
+   xorg/lib/lib{Xfont,Xfontcache,Xft}
+)
@@ Line 163: / Line 173: @@
 fetch_xorg() {
    echo "########### Fetching (selected) X.org modules ###########"
-   XORG_GIT=git://anongit.freedesktop.org/git/xorg
+   XORG_GIT=git://anongit.freedesktop.org/git
    run mkdir -p $PIT/xorg
    for D in "${XORG_DIRS[@]}"; do
-     fetch_from_git $PIT/xorg "$XORG_GIT" "$D"
+    if [[ $D == xcb/* ]] && ! $USE_XCB; then continue; fi
    done
+}
@@ Line 175: / Line 186: @@
 build_x_module() { (
-   D=$1
+   D="${1#xorg/}"
    echo "########### Building xorg/$D ###########"
    export PATH="$DEST/bin:$PATH"
@@ Line 183: / Line 194: @@
    if [ $D == "xserver" ]; then
      CONF_OPT="--with-mesa-source=$PIT/Mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint"
-   elif [ $D == "lib/libX11" ]; then
+   elif [ $D == "lib/libX11" ] && ! $USE_XCB; then
      CONF_OPT="--with-xcb=no"
    else
@@ Line 193: / Line 204: @@
      save_dir_hash
    fi
    run make
    save_dir_hash
@@ Line 203: / Line 215: @@
    run mkdir -p $DEST/share/aclocal
    run mkdir -p $DEST/var/log
    for D in "${XORG_DIRS[@]}"; do
      build_x_module $D || return 1
    done
@@ Line 232: / Line 245: @@
      --with-xkb-base=$DEST/share/X11/xkb --with-xkb-rules-symlink=xorg
    run make
-   run rm -fr $DEST/share/X11/xkb/compiled
+   # "make install" replaces share/X11/xkb/compiled.tmp with a junk symlink, so override it:
    run make install
 ) }
@@ Line 250: / Line 266: @@
    export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
    export PATH="$DEST/bin:$PATH"
    run make
    run cp -v synaptics_drv.so $DEST/lib/xorg/modules/input/
 ) }