[Lunar-commits] CVS: moonbase/zbeta/XOrg-test CONFIGURE, NONE,
1.1 drivers, NONE, 1.1 BUILD, 1.7, 1.8 CONFLICTS, 1.1,
1.2 DEPENDS, 1.2, 1.3 DETAILS, 1.3, 1.4 POST_INSTALL, 1.1,
1.2 PRE_BUILD, 1.1, 1.2 xsession, 1.1, 1.2
Florin Braescu
florin at lunar-linux.org
Sun Mar 6 11:58:58 UTC 2005
Update of /var/cvs/lunar/moonbase/zbeta/XOrg-test
In directory espresso.foo-projects.org:/tmp/cvs-serv28610
Modified Files:
BUILD CONFLICTS DEPENDS DETAILS POST_INSTALL PRE_BUILD
xsession
Added Files:
CONFIGURE drivers
Log Message:
use XOrg 6.8.2 instead of 6.8.1. This module is installed on my system and it works just fine.
--- NEW FILE: CONFIGURE ---
# only lin -r will trigger the driver chooser
if [ -n "$RECONFIGURE" ] || query "Select specific video drivers to build?" n ; then
ALL_XORG_DRIVERS=$(cat $SCRIPT_DIRECTORY/drivers | cut -d: -f1)
XORG_DRIVERS=$(get_module_config XORG_DRIVERS)
if [ -z "$XORG_DRIVERS" ]; then
XORG_DRIVERS=$(grep ':on$' $SCRIPT_DIRECTORY/drivers | cut -d: -f1)
fi
# if it's empty we just enable all
list_xorg_drivers()
{
(
unset IFS
for DRIVER in $ALL_XORG_DRIVERS; do
echo $DRIVER
echo $(grep ^$DRIVER: $SCRIPT_DIRECTORY/drivers | cut -d: -f2)
if echo $XORG_DRIVERS | grep -qw $DRIVER; then
echo on
else
echo off
fi
done
)
}
IFS="$TAB_ENTER_IFS" XORG_DRIVERS=`dialog --backtitle "XOrg video driver selection" --stdout --separate-output --checklist "Key: [X] = on, [ ] = off" 0 0 0 $(list_xorg_drivers)`
# hack to strip newlines
set_module_config XORG_DRIVERS "$(echo $XORG_DRIVERS)"
fi
--- NEW FILE: drivers ---
vga:Generic VGA:on
vesa:Generic VESA:on
fbdev:Generic FrameBuffer:on
v4l:Video for linux devices support:on
ati:Almost any ATI based card:on
i810:Intel(R) i810/IGP:on
mga:Matrox based cards:on
nv:NVidia (Non-accelerated):on
vmware:VMWare virtual video cards:on
apm:Alliance Promotion video cards:off
ark:Ark Logic devices:off
chips:Chips and Technologies video processors:off
cirrus:Cirrus Logic based cards:off
cyrix:Cyrix Logic MediaGX cards:off
GlideDriver:Glide capable video boards (3Dfx Voodoo mostly):off
glint:3Dlabs Permedia based cards:off
i128:Imagine 128 based cards:off
i740:Intel(R) 740 based cards:off
neomagic:Neomagic based integrated cards:off
rendition:Micron Verite based cards (V1000,V2x00):off
s3virge:S3 ViRGE and Trio3D(/2x) based cards:off
savage:S3 Savage based cards:off
siliconmotion:Silicon Motion based video cards:off
sis:SiS based cards:off
tdfx:3Dfx based video cards:off
tga:TGA1(!) based cards (DEC 21030):off
trident:Trident based video cards:off
tseng:Tseng Labs cased cards:off
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BUILD 17 Nov 2004 15:48:31 -0000 1.7
+++ BUILD 6 Mar 2005 11:58:55 -0000 1.8
@@ -5,9 +5,11 @@
DRI_DIR="extras/drm/linux"
DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/drm"
mkdir -p $DRM_DEST
- cd $DRM_DIR && make
+ cd $DRM_DIR &&
+ make
cd $SOURCE_DIRECTORY
- cd $DRI_DIR && make
+ cd $DRI_DIR &&
+ make
cp $DRI_DIR/*.o $DRM_DEST 2>/dev/null
depmod -a
true
@@ -18,14 +20,10 @@
echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
fi
- message "Building XOrg takes a very long time."
-
bad_flags '-funroll-loops' '-ffast-math'
- # first copy the stored settings over:
- #cp $CONFIG_CACHE/host.def config/cf/host.def &&
+ # Here we go for our host.def
- # then add stuff on the fly:
echo "#define InstallXdmConfig YES" >> config/cf/host.def &&
echo "#define InstallXinitConfig YES" >> config/cf/host.def &&
echo "#define InstallXserverSetUID YES" >> config/cf/host.def &&
@@ -36,28 +34,31 @@
echo "#define HasPamMisc YES" >> config/cf/host.def
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 (The X.Org Foundation $VERSION)\"" >> config/cf/host.def &&
- echo "#define FontDir /usr/share/fonts" >> 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 HasFontconfig 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 &&
- if module_installed libxml2 ; then
- echo "#define HasLibxml2 YES" >> config/cf/host.def
- else
- echo "#define HasLibxml2 NO" >> config/cf/host.def
- fi
+ 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 &&
+
if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
# This must happen or it will cause the module to break
# claiming "Kernel only header included in userspace"
@@ -66,44 +67,66 @@
invoke_installwatch
fi
- make World &&
+ # explicitly exit here now and not later on
+ make World ||
+ exit 1
+
prepare_install &&
cd $SOURCE_DIRECTORY &&
make install &&
- make install.man &&
+ make install.man &&
install_drm &&
mkdir -p /usr/X11R6/include/GL &&
- 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 [ ! -e /etc/skel/.xsession ]; then
+ cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
+ fi &&
- if [ ! -e /usr/bin/X11 ]; then
- ln -sf /usr/X11R6/bin /usr/bin/X11
- fi &&
+ if [ ! -d /usr/bin/X11 ]; then
+ ln -sf /usr/X11R6/bin /usr/bin/X11
+ fi &&
- if [ ! -e /usr/X11 ]; then
- ln -sf X11R6 /usr/X11
- fi &&
+ if [ ! -d /usr/X11 ]; then
+ ln -sf /usr/X11R6 /usr/X11
+ fi &&
- if [ ! -e /usr/include/X11 ]; then
- ln -sf ../X11R6/include/X11 /usr/include/X11
- fi &&
+ if [ ! -e /usr/include/X11 ]; then
+ ln -sf /usr/X11R6/include/X11 /usr/include/X11
+ fi &&
- if [ ! -e /usr/lib/X11 ]; then
- ln -sf ../X11R6/lib/X11 /usr/lib/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/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
+ 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
) > $C_FIFO 2>&1
Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS 10 Sep 2004 04:01:42 -0000 1.1
+++ CONFLICTS 6 Mar 2005 11:58:55 -0000 1.2
@@ -1,2 +1,3 @@
conflicts xfree86 &&
-conflicts xfree86-beta
+conflicts xfree86-beta &&
+conflicts XOrg-test
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/DEPENDS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEPENDS 1 Nov 2004 19:34:17 -0000 1.2
+++ DEPENDS 6 Mar 2005 11:58:55 -0000 1.3
@@ -1,6 +1,9 @@
-depends perl &&
-depends libpng &&
-depends fontconfig &&
+depends perl &&
+depends libpng &&
+depends libxml2 &&
+depends freetype2 &&
+depends XOrg-fonts-base &&
-# optional_depends "Linux-PAM" "" "" "for Linux-PAM Support" &&
+optional_depends "XOrg-fonts-extra" "" "" "for even more fonts" &&
+optional_depends "Linux-PAM" "" "" "for Linux-PAM Support" &&
optional_depends "tcl" "" "" "for tcl support"
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/DETAILS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DETAILS 5 Oct 2004 09:30:24 -0000 1.3
+++ DETAILS 6 Mar 2005 11:58:55 -0000 1.4
@@ -1,31 +1,23 @@
MODULE=XOrg-test
- VERSION=6.8.1
+ VERSION=6.8.2
SOURCE=X11R${VERSION}-src1.tar.gz
SOURCE2=X11R${VERSION}-src2.tar.gz
SOURCE3=X11R${VERSION}-src3.tar.gz
- SOURCE4=X11R${VERSION}-src4.tar.gz
- SOURCE5=X11R${VERSION}-src5.tar.gz
- SOURCE6=X11R${VERSION}-src6.tar.gz
- SOURCE7=X11R${VERSION}-src7.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
- SOURCE_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE2_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE3_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE4_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE5_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE6_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE7_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
- SOURCE_VFY=sha1:027d16317e07d9df166c0176a1f28b2614f38cc9
- SOURCE2_VFY=sha1:17f543f49599290b6e4cd4d963c643cd8c19158a
- SOURCE3_VFY=sha1:e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
- SOURCE4_VFY=sha1:5b01eb47eeaa6a3128e79ef6f1e37892ba613fff
- SOURCE5_VFY=sha1:9ce013e5524019f6fdabf8da117d8ca99153acf1
- SOURCE6_VFY=sha1:e376d0d389b96bf1fcc2b6263d02a4e09b4c8325
- SOURCE7_VFY=sha1:815de734f32dbb0c3f5ab669b6065bb8d23dd516
+ 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/
+ 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/
+ 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
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20040325
- UPDATED=20041005
+ UPDATED=20050306
SHORT="XOrg is the Open Source Public Implementation of X11"
+
cat << EOF
What is XOrg?
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL 10 Sep 2004 04:01:42 -0000 1.1
+++ POST_INSTALL 6 Mar 2005 11:58:55 -0000 1.2
@@ -1,31 +1,23 @@
-if module_installed NVIDIA; then lin NVIDIA; fi
-if module_installed fontconfig; then lin -c fontconfig; fi
+if module_installed NVIDIA; then lin 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
if ! grep -q '. /etc/profile' /etc/X11/xdm/Xsession; then
sedit 2s:#:.\ /etc/profile: /etc/X11/xdm/Xsession
fi
-# run xfs only on unix socket:
-if [ -f /etc/X11/fs/config ] ; then
- if ! grep -q "no-listen = tcp" /etc/X11/fs/config ; then
- cat >> /etc/X11/fs/config <<EOF
-
-# more secure: do not listen on tcp ports
-no-listen = tcp
-
-EOF
- fi
+if ! [ -d /usr/lib/pkgconfig ]; then
+ mkdir -p /usr/lib/pkgconfig
fi
-if ! [ -d /usr/lib/pkgconfig ]
-then mkdir -p /usr/lib/pkgconfig
-fi
-
-ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig &&
-ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig &&
+if ! grep -q /usr/X11R6/lib /etc/ld.so.conf ; then
+ echo "/usr/X11R6/lib" >> /etc/ld.so.conf
+ ldconfig
+fi
-message "Running fc-cache please be patient" &&
-/usr/X11R6/bin/fc-cache -f
+message "Running fc-cache..." &&
+/usr/bin/fc-cache -f
-message "Somethings are diffrent than XFree86, xf86config=xorgconfig"
+message "Some things are diffrent from XFree86 f.e. xf86config=xorgconfig"
message "xf86cfg=xorgcfg and /etc/X11/XF86Config=/etc/X11/xorg.conf"
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD 10 Sep 2004 04:01:42 -0000 1.1
+++ PRE_BUILD 6 Mar 2005 11:58:55 -0000 1.2
@@ -1,9 +1,5 @@
-validate_source_dir $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack $SOURCE
-unpack $SOURCE2 &&
-unpack $SOURCE3 &&
-unpack $SOURCE4 &&
-unpack $SOURCE5 &&
-unpack $SOURCE6 &&
-unpack $SOURCE7
+validate_source_dir $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack $SOURCE &&
+unpack $SOURCE2 &&
+unpack $SOURCE3
Index: xsession
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/xsession,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xsession 10 Sep 2004 04:01:42 -0000 1.1
+++ xsession 6 Mar 2005 11:58:55 -0000 1.2
@@ -1,33 +1,28 @@
#!/bin/sh
-if [ -e /usr/bin/xscreensaver ]; then
- xscreensaver -no-splash &
+if [ -e /usr/bin/xscreensaver ]; then
+ xscreensaver -no-splash &
fi
-if [ -x /usr/bin/enlightenment ]
-then exec enlightenment
-
-elif [ -x /opt/lunar/kde/3/bin/startkde ]
-then exec /opt/lunar/kde/3/bin/startkde
-
-elif [ -x /opt/lunar/kde/2/bin/startkde ]
-then exec /opt/lunar/kde/2/bin/startkde
+if [ -x /usr/bin/enlightenment ]
+ then exec enlightenment
-elif [ -x /usr/bin/wmaker ]
-then [ -d ~/GNUstep ] ||
- wmaker.inst
- exec wmaker
+ elif [ -x $KDEDIR/bin/startkde ]
+ then exec $KDEDIR/bin/startkde
-elif [ -x /usr/bin/icewm ]
-then exec icewm
+ elif [ -x /usr/bin/wmaker ]
+ then [ -d ~/GNUstep ] || wmaker.inst
+ exec wmaker
-elif [ -x /usr/bin/blackbox ]
-then exec blackbox
+ elif [ -x /usr/bin/icewm ]
+ then exec icewm
-elif [ -x /usr/bin/fvwm2 ]
-then exec fvwm2
+ elif [ -x /usr/bin/blackbox ]
+ then exec blackbox
-elif [ -x /usr/bin/gnome-session ]
-then exec gnome-session
+ elif [ -x /usr/bin/fvwm2 ]
+ then exec fvwm2
+ elif [ -x /usr/bin/gnome-session ]
+ then exec gnome-session
fi
More information about the Lunar-commits
mailing list