[Lunar-commits] r18440 - moonbase/trunk/zbeta/XOrg-test
Terry Chan
tchan at lunar-linux.org
Tue Jan 31 18:03:53 UTC 2006
Author: tchan
Date: 2006-01-31 18:03:53 +0000 (Tue, 31 Jan 2006)
New Revision: 18440
Modified:
moonbase/trunk/zbeta/XOrg-test/BUILD
moonbase/trunk/zbeta/XOrg-test/DETAILS
moonbase/trunk/zbeta/XOrg-test/POST_INSTALL
moonbase/trunk/zbeta/XOrg-test/POST_REMOVE
Log:
Version bumping this module to XOrg-6.9.0. At least this way 6.9.0 is in
moonbase for those users that want the bugfixes and added drivers. fglrx
and NVIDIA modules will not currently work with 6.9.0.
Modified: moonbase/trunk/zbeta/XOrg-test/BUILD
===================================================================
--- moonbase/trunk/zbeta/XOrg-test/BUILD 2006-01-31 17:45:17 UTC (rev 18439)
+++ moonbase/trunk/zbeta/XOrg-test/BUILD 2006-01-31 18:03:53 UTC (rev 18440)
@@ -1,63 +1,49 @@
(
- install_drm() {
- DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
- DRI_DIR="extras/drm/linux"
- DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/drm"
- mkdir -p $DRM_DEST
- cd $DRM_DIR &&
- make
- cd $SOURCE_DIRECTORY
- cd $DRI_DIR &&
- make
- cp $DRI_DIR/*.o $DRM_DEST 2>/dev/null
- depmod -a
- true
- }
-
if [ -e /etc/X11/xinit/xinitrc ]; then
cp /etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc.orig
- echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
+ message "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
fi
bad_flags '-funroll-loops' '-ffast-math'
# Here we go for our host.def
+ (
+ echo "#define InstallXdmConfig YES"
+ echo "#define InstallXinitConfig YES"
+ echo "#define InstallXserverSetUID YES"
+ echo "#define BuildServersOnly NO"
- echo "#define InstallXdmConfig YES" >> config/cf/host.def &&
- echo "#define InstallXinitConfig YES" >> config/cf/host.def &&
- echo "#define InstallXserverSetUID YES" >> config/cf/host.def &&
- echo "#define BuildServersOnly NO" >> config/cf/host.def &&
+ if module_installed Linux-PAM ; then
+ echo "#define HasPam YES"
+ echo "#define HasPamMisc YES"
+ fi
- if module_installed Linux-PAM ; then
- echo "#define HasPam YES" >> config/cf/host.def &&
- echo "#define HasPamMisc YES" >> config/cf/host.def
- fi
+ if [ -n "$XORG_DRIVERS" ]; then
+ echo "#define XF86CardDrivers $XORG_DRIVERS"
+ fi
- if [ -n "$XORG_DRIVERS" ]; then
- echo "#define XF86CardDrivers $XORG_DRIVERS" >> config/cf/host.def
- fi
-
- echo "#define DefaultCCOptions $CFLAGS" >> config/cf/host.def &&
- echo "#define LibraryCDebugFlags $CFLAGS" >> config/cf/host.def &&
- echo "#define DefaultCDebugFlags $CFLAGS" >> config/cf/host.def &&
- echo "#define OptimizedCDebugFlags $CFLAGS" >> config/cf/host.def &&
- echo "#define XVendorString \"Lunar-Linux.org (xorg.freedesktop.org $VERSION)\"" >> config/cf/host.def &&
- echo "#define HasZlib YES" >> config/cf/host.def &&
- echo "#define HasFreetype2 YES" >> config/cf/host.def &&
- echo "#define ForceNormalLib YES" >> config/cf/host.def &&
- echo "#define HasExpat YES" >> config/cf/host.def &&
- echo "#define UseExpat YES" >> config/cf/host.def &&
- echo "#define HasLibpng YES" >> config/cf/host.def &&
- echo "#define BuildDocs NO" >> config/cf/host.def &&
- echo "#define HasLibxml2 YES" >> config/cf/host.def &&
- echo "#define InstallFontconfigLibrary NO" >> config/cf/host.def &&
- echo "#define SharedLibXft YES" >> config/cf/host.def &&
- echo "#define PreferXdmcpIPv6 YES" >> config/cf/host.def &&
- echo "#define BuildFontServer NO" >> config/cf/host.def &&
- echo "#define BuildFonts NO" >> config/cf/host.def &&
- echo "#define MakeLocalFontDir NO" >> config/cf/host.def &&
- echo "#define InstallFSConfig NO" >> config/cf/host.def &&
+ echo "#define DefaultCCOptions $CFLAGS"
+ echo "#define LibraryCDebugFlags $CFLAGS"
+ echo "#define DefaultCDebugFlags $CFLAGS"
+ echo "#define OptimizedCDebugFlags $CFLAGS"
+ echo "#define XVendorString \"Lunar-Linux.org (xorg.freedesktop.org $VERSION)\""
+ echo "#define HasZlib YES"
+ echo "#define HasFreetype2 YES"
+ echo "#define ForceNormalLib YES"
+ echo "#define HasExpat YES"
+ echo "#define UseExpat YES"
+ echo "#define HasLibpng YES"
+ echo "#define BuildDocs NO"
+ echo "#define HasLibxml2 YES"
+ echo "#define InstallFontconfigLibrary NO"
+ echo "#define SharedLibXft YES"
+ echo "#define PreferXdmcpIPv6 YES"
+ echo "#define BuildFontServer NO"
+ echo "#define BuildFonts NO"
+ echo "#define MakeLocalFontDir NO"
+ echo "#define InstallFSConfig NO"
+ ) >> config/cf/host.def
if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
# This must happen or it will cause the module to break
@@ -68,65 +54,47 @@
fi
# explicitly exit here now and not later on
- make World ||
- exit 1
+ make World || exit 1
prepare_install &&
cd $SOURCE_DIRECTORY &&
make install &&
make install.man &&
- install_drm &&
mkdir -p /usr/X11R6/include/GL &&
- rm -f /usr/X11R6/lib/libz.a &&
- rm -f /usr/X11R6/include/zlib.h &&
- rm -f /usr/X11R6/include/zconf.h &&
- rm -f /usr/X11R6/lib/libz.a &&
+ rm -f /usr/X11R6/lib/libz.a &&
+ rm -f /usr/X11R6/include/zlib.h &&
+ rm -f /usr/X11R6/include/zconf.h &&
+ rm -f /usr/X11R6/lib/libz.a &&
if [ ! -e /etc/skel/.xsession ]; then
cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
fi &&
- if [ ! -d /usr/bin/X11 ]; then
- ln -sf /usr/X11R6/bin /usr/bin/X11
- fi &&
+ ln -sf /usr/X11R6/bin /usr/bin/X11 &&
+ ln -sf /usr/X11R6 /usr/X11 &&
+ ln -sf /usr/X11R6/include/X11 /usr/include/X11 &&
+ ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &&
+ ln -sf /usr/share/fonts /usr/X11R6/lib/X11/fonts &&
+ ln -sf /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so &&
+ ln -sf /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so &&
+ ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig/xft.pc &&
- if [ ! -d /usr/X11 ]; then
- ln -sf /usr/X11R6 /usr/X11
- fi &&
+ install -g0 -m0 -m0700 $SCRIPT_DIRECTORY/init.d/ICE,X11-unix /etc/init.d/ &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc2.d/S20ICE,X11-unix &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc3.d/S20ICE,X11-unix &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc4.d/S20ICE,X11-unix &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc5.d/S20ICE,X11-unix &&
+ /etc/init.d/ICE,X11-unix start &&
- if [ ! -e /usr/include/X11 ]; then
- ln -sf /usr/X11R6/include/X11 /usr/include/X11
- fi &&
-
- if [ ! -d /usr/lib/X11 ]; then
- ln -sf /usr/X11R6/lib/X11 /usr/lib/X11
- fi &&
-
- if [ ! -d /usr/X11R6/lib/X11/fonts ]; then
- ln -sf /usr/share/fonts /usr/X11R6/lib/X11/fonts
- fi &&
-
- if [ ! -e /usr/lib/libMesaGLU.so ]; then
- ln -sf /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
- fi &&
-
- if [ ! -e /usr/X11R6/lib/libMesaGL.so ]; then
- ln -sf /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
- fi &&
-
- if [ ! -e /usr/lib/pkgconfig/xft.pc ]; then
- ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig/xft.pc
- fi
-
- if [ ! -d /tmp/.ICE-unix ]; then
- mkdir -p /tmp/.ICE-unix
- chown root /tmp/.ICE-unix
- chmod 777 /tmp/.ICE-unix
- fi
-
if [ -e /etc/X11/xinit/xinitrc.orig ]; then
cp /etc/X11/xinit/xinitrc.orig /etc/X11/xinit/xinitrc
- echo "Your master xinitrc file has been restored from /etc/X11/xinit/xinitrc.orig"
- fi
+ message "${MESSAGE_COLOR}Your master xinitrc file has been restored from /etc/X11/xinit/xinitrc.orig${DEFAULT_COLOR}"
+ fi &&
+ # cosmetic but needed adjustments:
+ if ! grep -q 'XTerm*loginShell:' /etc/X11/app-defaults/XTerm ; then
+ echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm &&
+ echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm-color
+ fi
+
) > $C_FIFO 2>&1
Modified: moonbase/trunk/zbeta/XOrg-test/DETAILS
===================================================================
--- moonbase/trunk/zbeta/XOrg-test/DETAILS 2006-01-31 17:45:17 UTC (rev 18439)
+++ moonbase/trunk/zbeta/XOrg-test/DETAILS 2006-01-31 18:03:53 UTC (rev 18440)
@@ -1,25 +1,28 @@
MODULE=XOrg-test
- VERSION=6.8.2
+ VERSION=6.9.0
SOURCE=X11R${VERSION}-src1.tar.gz
SOURCE2=X11R${VERSION}-src2.tar.gz
SOURCE3=X11R${VERSION}-src3.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
SOURCE_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
SOURCE_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
SOURCE2_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
SOURCE2_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE2_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
SOURCE3_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
SOURCE3_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
- SOURCE_VFY=sha1:23c60680274062a1db17f646a8388149309dc45c
- SOURCE2_VFY=sha1:af6190fd2619cc60e70c0a8c00dee6826e1fb726
- SOURCE3_VFY=sha1:de1569856b8023c58fc92bd0b3c8406214451fce
+ SOURCE3_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE_VFY=sha1:a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
+ SOURCE2_VFY=sha1:9aa8f222c141c735656305945da3cad3b7f33101
+ SOURCE3_VFY=sha1:0c8a0d6f9471ec022e12e2688d1991c985a1efb2
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20040325
- UPDATED=20050306
+ UPDATED=20060125
SHORT="XOrg is the Open Source Public Implementation of X11"
+ PSAFE=no
cat << EOF
-What is XOrg?
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model
to maintain the official Public Implementation of X11.
EOF
Modified: moonbase/trunk/zbeta/XOrg-test/POST_INSTALL
===================================================================
--- moonbase/trunk/zbeta/XOrg-test/POST_INSTALL 2006-01-31 17:45:17 UTC (rev 18439)
+++ moonbase/trunk/zbeta/XOrg-test/POST_INSTALL 2006-01-31 18:03:53 UTC (rev 18440)
@@ -1,4 +1,4 @@
-if module_installed NVIDIA; then lin NVIDIA; fi
+if module_installed NVIDIA; then lin -c NVIDIA; fi
if module_installed fontconfig; then lin -c fontconfig; fi
if module_installed glut; then lin -c glut; fi
if module_installed openMotif; then lin -c openMotif; fi
@@ -19,5 +19,5 @@
message "Running fc-cache..." &&
/usr/bin/fc-cache -f
-message "Some things are diffrent from XFree86 f.e. xf86config=xorgconfig"
-message "xf86cfg=xorgcfg and /etc/X11/XF86Config=/etc/X11/xorg.conf"
+message "${MESSAGE_COLOR}Some things are different from XFree86 f.e. xf86config=xorgconfig${DEFAULT_COLOR}"
+message "${MESSAGE_COLOR}xf86cfg=xorgcfg and /etc/X11/XF86Config=/etc/X11/xorg.conf${DEFAULT_COLOR}"
Modified: moonbase/trunk/zbeta/XOrg-test/POST_REMOVE
===================================================================
--- moonbase/trunk/zbeta/XOrg-test/POST_REMOVE 2006-01-31 17:45:17 UTC (rev 18439)
+++ moonbase/trunk/zbeta/XOrg-test/POST_REMOVE 2006-01-31 18:03:53 UTC (rev 18440)
@@ -1,16 +1,9 @@
# Remove xserver
+if module_installed xserver; then lrm xserver; fi
- if module_installed xserver; then lrm xserver; fi
-
-# Tidy up
-
- rm -Rf /usr/X11*
-
# Remove broken symlinks
+rm -Rf /usr/lib/pkgconfig/fontconfig.pc
+rm -Rf /usr/lib/pkgconfig/xft.pc
- rm -Rf /usr/lib/pkgconfig/fontconfig.pc
- rm -Rf /usr/lib/pkgconfig/xft.pc
-
# Reinstall fontconfig since its broken now
-
- if module_installed fontconfig; then lin -c fontconfig; fi
+if module_installed fontconfig; then lin -c fontconfig; fi
More information about the Lunar-commits
mailing list