CVS: moonbase/zbeta/xfree86-dev BUILD, 1.1, 1.2 CONFIGURE, 1.1,
1.2 DEPENDS, 1.1, 1.2 DETAILS, 1.1, 1.2 POST_INSTALL, 1.1, 1.2
Florin Braescu
florin at lunar-linux.org
Sun Dec 21 18:31:54 GMT 2003
Update of /var/cvs/lunar/moonbase/zbeta/xfree86-dev
In directory dbguin.lunar-linux.org:/tmp/cvs-serv23531
Modified Files:
BUILD CONFIGURE DEPENDS DETAILS POST_INSTALL
Log Message:
bump version from 4.3.99.16 to 4.3.99.902. compiled and tested with gcc 3.3.2, kernel and kernel-headers version 2.6.
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-dev/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD 3 Dec 2003 20:21:58 -0000 1.1
+++ BUILD 21 Dec 2003 18:31:51 -0000 1.2
@@ -14,8 +14,20 @@
echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
fi
-if [ -f $CONFIG_CACHE/host.def ]
-then cp $CONFIG_CACHE/host.def config/cf/host.def
+if [ -f $CONFIG_CACHE/host.def ]; then
+ #BECAUSE CONFIGURE dosent always catch this!
+ if module_installed freetype2; then
+ if ! grep -q "#define BuildFreetype2Library[:space:] NO" $CONFIG_CACHE/host.def
+ then
+ sedit "/ HasFreetype2/d" $CONFIG_CACHE/host.def
+ sedit "/ BuildFreetype2Library/d" $CONFIG_CACHE/host.def
+ sedit "/ Freetype2Dir/" $CONFIG_CACHE/host.def
+ echo "#define HasFreetype2 YES" >> $CONFIG_CACHE/host.def
+ echo "#define BuildFreetype2Library NO" >> $CONFIG_CACHE/host.def
+ echo "#define Freetype2Dir /usr" >> $CONFIG_CACHE/host.def
+ fi
+ fi
+ cp $CONFIG_CACHE/host.def config/cf/host.def
fi
message "Building XFree86 takes a very long time."
@@ -23,7 +35,7 @@
(
- echo "#define InstallXdmConfig NO" >> config/cf/site.def
+ echo "#define InstallXdmConfig NO" >> config/cf/site.def
echo "#define InstallXinitConfig YES" >> config/cf/site.def
export CFLAGS=`echo $CFLAGS | sed s/-funroll-loops//`
@@ -33,6 +45,8 @@
export CPPFLAGS=`echo $CPPFLAGS | sed s/-funroll-loops//`
export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
+ patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+
if module_installed Linux-PAM
then echo "#define HasPam YES" >> config/cf/site.def
fi &&
@@ -47,6 +61,7 @@
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
Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-dev/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE 3 Dec 2003 20:21:58 -0000 1.1
+++ CONFIGURE 21 Dec 2003 18:31:51 -0000 1.2
@@ -136,9 +136,9 @@
GzipFontCompression"
FONT_OPTIONS="$YES_FONT_OPTIONS $NO_FONT_OPTIONS"
- YES_MISC_OPTIONS="HasShm BuildGLULibrary BuildGLXLibrary BuildGlxExt BuildDBE BuildRECORD InstallXinitConfig InstallXdmConfig XprtServer ThreadedX"
- NO_MISC_OPTIONS="BuildServersOnly BuildPexExt XnestServer
- LinuxFBDevSupport XVirtualFramebufferServer
+ YES_MISC_OPTIONS="HasShm BuildGLULibrary BuildGLXLibrary BuildGlxExt BuildDBE BuildRECORD InstallXinitConfig InstallXdmConfig ThreadedX"
+ NO_MISC_OPTIONS="BuildServersOnly BuildPexExt XnestServer XprtServer
+ LinuxFBDevSupport XVirtualFramebufferServer
BuildXF86DRI BuildXF86DRM"
MISC_OPTIONS="$YES_MISC_OPTIONS $NO_MISC_OPTIONS"
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-dev/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS 3 Dec 2003 20:21:58 -0000 1.1
+++ DEPENDS 21 Dec 2003 18:31:51 -0000 1.2
@@ -2,4 +2,5 @@
depends zlib &&
depends libpng &&
depends freetype2
+
#optional_depends "Linux-PAM" "" "" "for Linux-PAM Support"
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-dev/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS 3 Dec 2003 20:21:58 -0000 1.1
+++ DETAILS 21 Dec 2003 18:31:51 -0000 1.2
@@ -1,34 +1,34 @@
- MODULE=xfree86-dev
- VERSION=4.3.99.16
- SOURCE=XFree86-$VERSION.tar.bz2
- SOURCE9=xft.pc
- FUZZY="off"
+ MODULE=xfree86-dev
+ VERSION=4.3.99.902
+ SOURCE=XFree86-$VERSION.tar.bz2
+ SOURCE2=XFree86-dev-drm.patch.bz2
+ FUZZY="off"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
SOURCE_URL[0]=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE
- SOURCE_VFY=md5:9060c02f9e07620b8595e4d3da77a4b3
+ SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+ SOURCE_VFY=md5:eec2d5e4b980ec73a7772b9362ed9021
WEB_SITE=http://www.xfree86.org
ENTERED=20031203
- UPDATED=20031203
-
- SHORT="xfree86 is a free implementation of the X Window System."
+ UPDATED=20031221
+ SHORT="xfree86 is a free implementation of the X Window System."
+
cat << EOF
-What is XFree86?
-The XFree86 Project, Inc is an organisation which produces XFree86, a
-freely redistributable open-source implementation of the X Window System
-that runs on UNIX(R) and UNIX-like (like Linux, the BSDs, Mac OS X (aka
-Darwin) and Solaris x86 series) operating systems and OS/2.
-XFree86 is the underlying software that is between the hardware and
-graphical user interface (aka gui) that people see and use. If you are
-using KDE, GNOME, Enlightenment, Blackbox, AfterStep, twm or fvwm then
-you are already using and running XFree86 as these run as our clients.
-Traditionally, The XFree86 Project has focused on Intel x86-based
-platforms, which is where the 86 in our name comes from, but our
-current release supports other platforms like the Alpha, PowerPC, Sparc
-and in-the-works MIPS CPU families.
-Our goal at XFree86 is to have X run on every platform available,
-including those we do not currently support, as the best windowing
-system available on that platform.
+ The XFree86 Project, Inc is an organisation which produces XFree86, a
+ freely redistributable open-source implementation of the X Window System
+ that runs on UNIX(R) and UNIX-like (like Linux, the BSDs, Mac OS X (aka
+ Darwin) and Solaris x86 series) operating systems and OS/2.
+ XFree86 is the underlying software that is between the hardware and
+ graphical user interface (aka gui) that people see and use. If you are
+ using KDE, GNOME, Enlightenment, Blackbox, AfterStep, twm or fvwm then
+ you are already using and running XFree86 as these run as our clients.
+ Traditionally, The XFree86 Project has focused on Intel x86-based
+ platforms, which is where the 86 in our name comes from, but our
+ current release supports other platforms like the Alpha, PowerPC, Sparc
+ and in-the-works MIPS CPU families.
+ Our goal at XFree86 is to have X run on every platform available,
+ including those we do not currently support, as the best windowing
+ system available on that platform.
-This a developement snapshot for testing purposes. It can be compiled
-under linux-test kernels, with kernel-headers for that kernels too.
+ This is a developement snapshot for testing purposes. It can be compiled
+ under linux-test kernels, with kernel-headers for that kernels too.
EOF
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfree86-dev/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL 3 Dec 2003 20:21:58 -0000 1.1
+++ POST_INSTALL 21 Dec 2003 18:31:51 -0000 1.2
@@ -1,6 +1,6 @@
rm -f $BOOST_LOCK
-if module_installed NVIDIA; then lin NVIDIA; fi
-if module_installed pango; then lin -c pango; fi
+if module_installed NVIDIA; then lin NVIDIA; fi
+if module_installed pango; then lin -c pango; fi
if module_installed fontconfig; then lin -c fontconfig; fi
if ! grep -q '. /etc/profile' /etc/X11/xdm/Xsession; then
@@ -19,14 +19,12 @@
fi
fi
-if ! [ -d /usr/lib/pkgconfig ]
-then mkdir -p /usr/lib/pkgconfig
+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 &&
-message "Running fc-cache please be patient" &&
+# running fc-cache please be patient
/usr/X11R6/bin/fc-cache -f
-
-cp $SOURCE_CACHE/$SOURCE9 /usr/X11R6/lib/pkgconfig/xft.pc
More information about the Lunar-commits
mailing list