Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 42992 Details for
Bug 68544
x11-base/xorg-x11: new libXpm security patch (confidential)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
xfree-4.3.0-r8.ebuild
xfree-4.3.0-r8.ebuild (text/plain), 35.34 KB, created by
Donnie Berkholz (RETIRED)
on 2004-10-31 01:05:18 UTC
(
hide
)
Description:
xfree-4.3.0-r8.ebuild
Filename:
MIME Type:
Creator:
Donnie Berkholz (RETIRED)
Created:
2004-10-31 01:05:18 UTC
Size:
35.34 KB
patch
obsolete
># Copyright 1999-2004 Gentoo Foundation ># Distributed under the terms of the GNU General Public License v2 ># $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.13 2004/10/21 01:04:37 spyderous Exp $ > >inherit eutils flag-o-matic toolchain-funcs x11 > ># Make sure Portage does _NOT_ strip symbols. We will do it later and make sure ># that only we only strip stuff that are safe to strip ... >RESTRICT="nostrip" > >IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk bindist" > >filter-flags "-funroll-loops" > >ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe" > ># Recently there has been a lot of stability problem in Gentoo-land. Many ># things can be the cause to this, but I believe that it is due to gcc3 ># still having issues with optimizations, or with it not filtering bad ># combinations (protecting the user maybe from themselves) yet. ># ># This can clearly be seen in large builds like glibc, where too aggressive ># CFLAGS cause the tests to fail miserbly. ># ># Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion ># knows what he is talking about: ># ># People really shouldn't force code-specific options on... It's a ># bad idea. The -march options aren't just to look pretty. They enable ># options that are sensible (and include sse,mmx,3dnow when apropriate). ># ># The next command strips CFLAGS and CXXFLAGS from nearly all flags. If ># you do not like it, comment it, but do not bugreport if you run into ># problems. ># ># <azarah@gentoo.org> (13 Oct 2002) >strip-flags > ># Configure for SYNAPTICS support >if [ "${ARCH}" = "x86" ] >then > if [ -z "${SYNAPTICS}" ] > then > SYNAPTICS="yes" > fi >else > unset SYNAPTICS >fi > ># Are we using a snapshot ? >USE_SNAPSHOT="no" > >PATCH_VER="2.1.25.8" >FT2_VER="2.1.3" >XCUR_VER="0.3.1" >SISDRV_VER="311003-1" >SAVDRV_VER="1.1.27t" >MGADRV_VER="1_3_0beta" >VIADRV_VER="0.1" >SYNDRV_VER="0.12.0" > >BASE_PV="${PV}" >MY_SV="${BASE_PV//\.}" >S="${WORKDIR}/xc" >SYNDIR="${WORKDIR}/synaptics" >SRC_PATH="mirror://xfree/${BASE_PV}/source" >HOMEPAGE="http://www.xfree.org" > ># Misc patches we may need to fetch .. >X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 > http://www.cpbotha.net/files/dri_resume/xfree86-dri-resume-v8.patch" > >X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz > http://www.probo.com/timr/savage-${SAVDRV_VER}.zip > http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz > http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-${SYNDRV_VER}.tar.bz2" ># mirror://gentoo/XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2" ># ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_1_3_0/mga-${MGADRV_VER}.tgz" ># 3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )" ># Updated Wacom driver: http://people.mandrakesoft.com/~flepied/projects/wacom/ ># Latest Savaga drivers: http://www.probo.com/timr/savage40.html ># Latest SIS drivers: http://www.winischhofer.net/ ># Glide headers for compiling the tdfx modules > ># For the MS Core fonts .. >MS_COREFONTS="./andale32.exe ./arial32.exe > ./arialb32.exe ./comic32.exe > ./courie32.exe ./georgi32.exe > ./impact32.exe ./times32.exe > ./trebuc32.exe ./verdan32.exe > ./webdin32.exe" ># ./IELPKTH.CAB" ># Need windows license to use Tahoma font >MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}" > >SRC_URI="${SRC_PATH}/X${MY_SV}src-1.tgz > ${SRC_PATH}/X${MY_SV}src-2.tgz > ${SRC_PATH}/X${MY_SV}src-3.tgz > ${SRC_PATH}/X${MY_SV}src-4.tgz > ${SRC_PATH}/X${MY_SV}src-5.tgz > doc? ( ${SRC_PATH}/X${MY_SV}src-6.tgz > ${SRC_PATH}/X${MY_SV}src-7.tgz )" > >SRC_URI="${SRC_URI} > ${X_PATCHES} > ${X_DRIVERS} > nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) > mirror://gentoo/eurofonts-X11.tar.bz2 > mirror://gentoo/xfsft-encodings.tar.bz2 > mirror://gentoo/XFree86-compose.dir-0.1.bz2 > mirror://gentoo/XFree86-en_US.UTF-8.old.bz2 > mirror://gentoo/XFree86-locale.alias.bz2 > mirror://gentoo/XFree86-locale.dir.bz2 > mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > truetype? ( !bindist? ( ${MS_FONT_URLS} ) )" > ># http://www.xfree86.org/4.3.0/LICENSE.html >LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2 > bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor > nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 > MIT SGI-B BSD || ( FTL GPL-2 ) MSttfEULA" >SLOT="0" >KEYWORDS="~x86 ~alpha" > >DEPEND=">=sys-apps/portage-2.0.50_pre9 > >=sys-libs/ncurses-5.1 > >=sys-libs/zlib-1.1.3-r2 > >=sys-devel/flex-2.5.4a-r5 > >=dev-libs/expat-1.95.3 > >=media-libs/freetype-${FT2_VER}-r2 > >=media-libs/fontconfig-2.1-r1 > >=x11-base/opengl-update-1.4 > >=x11-misc/ttmkfdir-3.0.4 > >=sys-apps/sed-4 > >=sys-devel/patch-2.5.9 > sys-apps/util-linux > dev-lang/perl > media-libs/libpng > app-arch/unzip > pam? ( >=sys-libs/pam-0.75 ) > truetype? ( !bindist? ( app-arch/cabextract ) ) > !virtual/x11 > !x11-base/xorg-x11 > !x11-libs/xft" > >#RDEPEND="$DEPEND" ># unzip - needed for savage driver (version 1.1.27t) ># x11-libs/xft -- blocked because of interference with xfree's > >PDEPEND="x86? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )" > >PROVIDE="virtual/x11 > virtual/opengl > virtual/glu > virtual/xft" > >DESCRIPTION="XFree86: free X server" > >PATCH_DIR=${WORKDIR}/patch > >pkg_setup() { > # A static build disallows building the SDK. > # See config/xf86.rules. > if use static > then > if use sdk > then > die "The static USE flag is incompatible with the sdk USE flag." > fi > fi > > # Check for existence of $CC, we use it later > if [ -z "${CC}" ] > then > die "Please set the CC variable to your compiler. export CC=gcc." > fi >} > >src_unpack() { > > # Unpack source and patches > unpack X${MY_SV}src-{1,2,3,4,5}.tgz > if use doc > then > unpack X${MY_SV}src-{6,7}.tgz > fi > > unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 > > # Unpack TaD's gentoo cursors > unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > > # Unpack extra fonts stuff from Mandrake > if use nls > then > unpack gemini-koi8-u.tar.bz2 > fi > unpack eurofonts-X11.tar.bz2 > unpack xfsft-encodings.tar.bz2 > > # Remove bum encoding > rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc > > # Update the Savage Driver > # savage driver 1.1.27t is a .zip and contains a savage directory > # (that's why we have to be in drivers, not in savage subdir). > # Could be USE flag based > > ebegin "Updating Savage driver" > cd ${S}/programs/Xserver/hw/xfree86/drivers > unpack savage-${SAVDRV_VER}.zip > /dev/null > ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ > ${S}/programs/Xserver/hw/xfree86/drivers/savage > cd ${S} > eend 0 > > ebegin "Updating SiS driver" > cd ${S}/programs/Xserver/hw/xfree86/drivers/sis > unpack sis_drv_src_${SISDRV_VER}.tar.gz > /dev/null > ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \ > ${S}/programs/Xserver/hw/xfree86/drivers/sis > cd ${S} > eend 0 > > if [ "${SYNAPTICS}" = "yes" ] > then > ebegin "Adding Synaptics touchpad driver" > cd ${WORKDIR} > unpack synaptics-${SYNDRV_VER}.tar.bz2 > /dev/null > eend 0 > fi > cd ${S} > ># ebegin "Adding VIA driver" ># cd ${WORKDIR} ># unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2 ># cd ${S} ># eend 0 > ># ebegin "Updating Matrox HAL driver" ># unpack mga-${MGADRV_VER}.tgz ># touch ${WORKDIR}/mga/HALlib/mgaHALlib.a ># mv ${WORKDIR}/mga/HALlib/mgaHALlib.a \ ># #{S}/programs/Xserver/hw/xfree86/drivers/mga/HALlib ># eend 0 > > if [ "`gcc-version`" = "2.95" ] > then > # Do not apply this patch for gcc-2.95.3, as it cause compile to fail, > # closing bug #10146. > mv -f ${PATCH_DIR}/0138_all_4.2.1-gcc32-internal-compiler-error.patch \ > ${PATCH_DIR}/excluded > > mv -f ${PATCH_DIR}/0260_ia64_4.2.99.1-gcc3.1.patch \ > ${PATCH_DIR}/excluded > fi > > # We dont have an implementation for S/390's yet... > if [ ! "${ARCH}" = "s390" ] > then > mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded > fi > > # 9017 fixes many 64-bit issues with non-PIC libs > # patch 9017 overlaps 9015 and 9016 and is applied instead > if [ "${ARCH}" = "amd64" ] > then > mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded > mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded > fi > > # This was formerly applied if USE=debug, but it causes builds > # to randomly die (spyderous). > mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded > > # This is splite's ia64 patch. Is it necessary, > # now that 0262 is applied? (spyderous) > mv -f ${PATCH_DIR}/0261* ${PATCH_DIR}/excluded > > if use debug > then > mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded > fi ># FIXME: bug #19812, 075 should be deprecated by 076, left as ># TDFX_RISKY for feedback (put in -r3 if no problems) > if use 3dfx && [ "${TDFX_RISKY}" = "yes" ] > then > mv -f ${PATCH_DIR}/5850* ${PATCH_DIR}/excluded > else > mv -f ${PATCH_DIR}/5851* ${PATCH_DIR}/excluded > fi > > if ! use ipv6 > then > mv -f ${PATCH_DIR}/200* ${PATCH_DIR}/excluded > mv -f ${PATCH_DIR}/9921* ${PATCH_DIR}/excluded > else > mv -f ${PATCH_DIR}/9920* ${PATCH_DIR}/excluded > if ! use doc > then > mv -f ${PATCH_DIR}/2001* ${PATCH_DIR}/excluded > fi > fi > > # Various Patches from all over > EPATCH_SUFFIX="patch" epatch ${PATCH_DIR} > > unset EPATCH_EXCLUDE > > epatch ${FILESDIR}/xpm-secfix-thomas.diff > > # Fix DRI related problems > cd ${S}/programs/Xserver/hw/xfree86/ > epatch ${DISTDIR}/xfree86-dri-resume-v8.patch > > # Update Wacom Driver, hopefully resolving bug #1632 > # The kernel driver should prob also be updated, this can be > # found at: > # > # http://people.mandrakesoft.com/~flepied/projects/wacom/ > # > if ( [ -e "${ROOT}/usr/src/linux" ] && \ > [ ! `is_kernel "2" "2"` ] ) || \ > [ "`uname -r | cut -d. -f1,2`" != "2.2" ] > then > ebegin "Updating Wacom USB Driver" > gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \ > ${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die > eend 0 > fi > > # Unpack the MS fonts > if use truetype && use !bindist > then > einfo "Unpacking MS Core Fonts..." > mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype > for x in ${MS_COREFONTS} > do > if [ -f ${DISTDIR}/${x} ] > then > einfo " ${x/\.\/}..." > cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die > fi > done > ebegin "Done unpacking Core Fonts"; eend 0 > fi > > ebegin "Setting up config/cf/host.def" > cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die > echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ > >> config/cf/host.def > > # We're using Xwrapper instead -- so that nothing else needs to be > # set uid any more. > echo "#define InstallXserverSetUID NO" >> config/cf/host.def > echo "#define BuildServersOnly NO" >> config/cf/host.def > > # Bug #12775 .. fails with -Os. > replace-flags "-Os" "-O2" > > if [ "`gcc-version`" != "2.95" ] > then > # Should fix bug #4189. gcc-3.x have problems with -march=pentium4 > # and -march=athlon-tbird > replace-flags "-march=pentium4" "-march=pentium3" > replace-flags "-march=athlon-tbird" "-march=athlon" > > # Without this, modules breaks with gcc3 > if [ "`gcc-version`" = "3.1" ] > then > append-flags "-fno-merge-constants" > append-flags "-fno-merge-constants" > fi > fi > > if ( [ -e "${ROOT}/usr/src/linux" ] && \ > [ ! `is_kernel "2" "2"` ] ) || \ > [ "`uname -r | cut -d. -f1,2`" != "2.2" ] > then > echo "#define HasLinuxInput YES" >> config/cf/host.def > fi > > # this is needed for ./configure and runtime linking and building not to fall into falsely believing > # that there are some headers and functions for builtin video drivers or font libraries present > > echo "#define CcCmd ${CC}" >> config/cf/host.def > echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def > echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def > > if use static > then > echo "#define DoLoadableServer NO" >>config/cf/host.def > fi > > if use debug > then > echo "#define XFree86Devel YES" >> config/cf/host.def > else > echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def > # use less ram .. got this from Spider's makeedit.eclass :) > echo "#define GccWarningOptions -Wno-return-type -w" \ > >> config/cf/host.def > fi > > if use pam > then > # If you want to have optional pam support, do it properly ... > echo "#define HasPam YES" >> config/cf/host.def > echo "#define HasPamMisc YES" >> config/cf/host.def > else > echo "#define HasPam NO" >> config/cf/host.def > echo "#define HasPamMisc NO" >> config/cf/host.def > fi > > if use nls > then > echo "#define XtermWithI18N YES" >> config/cf/host.def > fi > > if [ "${ARCH}" = "x86" ] > then > # optimize Mesa for architecture > if use mmx > then > echo "#define HasMMXSupport YES" >> config/cf/host.def > echo "#define MesaUseMMX YES" >> config/cf/host.def > else > echo "#define HasMMXSupport NO" >> config/cf/host.def > echo "#define MesaUseMMX NO" >> config/cf/host.def > fi > > if use 3dnow > then > echo "#define Has3DNowSupport YES" >> config/cf/host.def > echo "#define MesaUse3DNow YES" >> config/cf/host.def > else > echo "#define Has3DNowSupport NO" >> config/cf/host.def > echo "#define MesaUse3DNow NO" >> config/cf/host.def > fi > if use sse > then > echo "#define HasKatmaiSupport YES" >> config/cf/host.def > echo "#define MesaUseKatmai YES" >> config/cf/host.def > else > echo "#define HasKatmaiSupport NO" >> config/cf/host.def > echo "#define MesaUseKatmai NO" >> config/cf/host.def > fi > > # build with glide3 support? (build the tdfx_dri.o module) > if use 3dfx > then > echo "#define HasGlide3 YES" >> config/cf/host.def > fi > > # Compile the VIA driver ># echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def > fi > > if [ "${ARCH}" = "hppa" ] > then > echo "#define DoLoadableServer NO" >> config/cf/host.def > fi > > if [ "${ARCH}" = "alpha" ] > then > echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ > i740 tdfx cirrus tseng fbdev \ > ati vga v4l glint" >> config/cf/host.def > fi > > if [ "${ARCH}" = "ppc" ] > then > echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ > chips tdfx fbdev ati DevelDrivers vga nv imstt \ > XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def > fi > > if [ "${ARCH}" = "sparc" ] > then > echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ > suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ > XF86OSCardDrivers XF86ExtraCardDrivers \ > DevelDrivers" >> config/cf/host.def > fi > > if [ "${ARCH}" = "amd64" ] > then > # the built-in zlib doesnt build in amd64 because of -fPIC issues > grep -v HasZlib config/cf/host.def > ${T}/host.def > mv ${T}/host.def config/cf/host.def > echo "#define HasZlib YES" >> config/cf/host.def > fi > > if use xml2 > then > echo "#define HasLibxml2 YES" >> config/cf/host.def > fi > > # The definitions for fontconfig > echo "#define UseFontconfig YES" >> config/cf/host.def > echo "#define HasFontconfig YES" >> config/cf/host.def > > # Use the xfree Xft2 lib > echo "#define SharedLibXft YES" >> config/cf/host.def > > # disable docs if doc not in USE > if ! use doc > then > echo "#define BuildLinuxDocText NO" >> config/cf/host.def > echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def > echo "#define BuildLinuxDocPS NO" >> config/cf/host.def > echo "#define BuildSpecsDocs NO" >> config/cf/host.def > fi > > # enable Japanese docs, optionally > if use cjk && use doc > then > echo "#define InstallJapaneseDocs YES" >> config/cf/host.def > fi > > # Native Language Support Fonts > if ! use nls > then > echo "#define BuildCyrillicFonts NO" >> config/cf/host.def > echo "#define BuildArabicFonts NO" >> config/cf/host.def > echo "#define BuildGreekFonts NO" >> config/cf/host.def > echo "#define BuildHebrewFonts NO" >> config/cf/host.def > echo "#define BuildThaiFonts NO" >> config/cf/host.def > > if ! use cjk > then > echo "#define BuildCIDFonts NO" >> config/cf/host.def > echo "#define BuildJapaneseFonts NO" >> config/cf/host.def > echo "#define BuildKoreanFonts NO" >> config/cf/host.def > echo "#define BuildChineseFonts NO" >> config/cf/host.def > fi > fi > > if use ipv6 > then > echo "#define HasIPv6 YES" >> config/cf/host.def > fi > ># # Build with the binary MatroxHAL driver ># echo "#define HaveMatroxHal YES" >> config/cf/host.def ># echo "#define UseMatroxHal YES" >> config/cf/host.def > ># Will uncomment this after kde, qt, and *box ebuilds are alterered to use ># it ># if use xinerama ># then ># echo "#define BuildXinerama YES" >> config/cf/host.def ># echo "#define BuildXineramaLibrary YES" >> config/cf/host.def ># fi > > # End the host.def definitions here > eend 0 > > cd ${S} > bzcat ${DISTDIR}/XFree86-compose.dir-0.1.bz2 > nls/compose.dir > bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias > bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir > bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8 > > if use doc > then > # These are not included anymore as they are obsolete > rm -rf ${S}/doc/hardcopy/{XIE,PEX5} > for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config} > do > if [ -f ${x} ] > then > cp ${x} ${x}.orig > grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x} > rm -f ${x}.orig > fi > done > fi >} > >src_compile() { > > # Set MAKEOPTS to have proper -j? option .. > get_number_of_jobs > > # Compile ucs2any C implementation (patch #9142) > ebegin "Compiling ucs2any C implementation" > cd ${S}/fonts/util > $(tc-getCC) -Wall -o ucs2any ucs2any.c > [ ! -d ../../exports/bin/ ] && mkdir -p ../../exports/bin/ > mv ucs2any ../../exports/bin/ > ls ${S}/exports/bin/ > cd ${S} > eend 0 > > # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of > # MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the > # xfree build will silently die. This is tricky to track down, so I'm > # adding a preemptive fix for this issue by making sure that MAKE_OPTS is > # unset. (drobbins, 08 Mar 2003) > unset MAKE_OPTS > > einfo "Building XFree86..." > cd ${S} > FAST=1 emake World || die > > if use nls > then > cd ${S}/nls > make || die > cd ${S} > fi > > if [ "${SYNAPTICS}" = "yes" ] > then > ebegin "Building Synaptics driver..." > cd ${SYNDIR} > make > eend 0 > fi > >} > >src_install() { > > unset MAKE_OPTS > > einfo "Installing XFree86..." > # gcc3 related fix. Do this during install, so that our > # whole build will not be compiled without mmx instructions. > if [ "`gcc-version`" != "2.95" ] && [ "${ARCH}" = "x86" ] > then > make install DESTDIR=${D} || \ > make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ > CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ > install DESTDIR=${D} || die > else > make install DESTDIR=${D} || die > fi > > if use sdk > then > einfo "Installing XFree86 SDK..." > make install.sdk DESTDIR=${D} || die > fi > > # We do not want these, so remove them ... > rm -rf ${D}/usr/X11R6/include/fontconfig > rm -f ${D}/usr/X11R6/lib/libfontconfig.* > rm -f ${D}/usr/X11R6/bin/{fontconfig-config,fc-cache,fc-list} > rm -f ${D}/usr/X11R6/man/man3/fontconfig.3x* > rm -rf ${D}/etc/fonts/ > > # This one needs to be in /usr/lib > insinto /usr/lib/pkgconfig > doins ${D}/usr/X11R6/lib/pkgconfig/{xcursor,xft}.pc > # Now remove the invalid xft.pc, and co ... > rm -rf ${D}/usr/X11R6/lib/pkgconfig > > einfo "Installing man pages..." > make install.man DESTDIR=${D} || die > einfo "Compressing man pages..." > prepman /usr/X11R6 > > if use nls > then > cd ${S}/nls > make DESTDIR=${D} install || die > fi > > # Make sure the user running xterm can only write to utmp. > fowners root:utmp /usr/X11R6/bin/xterm > fperms 2755 /usr/X11R6/bin/xterm > > # Fix permissions on locale/common/*.so > for x in ${D}/usr/X11R6/lib/X11/locale/lib/common/*.so* > do > if [ -f ${x} ] > then > fperms 0755 `echo ${x} | sed -e "s|${D}||"` > fi > done > > # Fix permissions on modules ... > for x in $(find ${D}/usr/X11R6/lib/modules -name '*.o') \ > $(find ${D}/usr/X11R6/lib/modules -name '*.so') > do > if [ -f ${x} ] > then > fperms 0755 `echo ${x} | sed -e "s|${D}||"` > fi > done > > # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can > # mess up other things that use xmkmf > ebegin "Fixing lib/X11/config/host.def" > cp ${D}/usr/X11R6/lib/X11/config/host.def ${T} > awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ > ${T}/host.def > ${D}/usr/X11R6/lib/X11/config/host.def > # theoretically, /usr/X11R6/lib/X11/config is a possible candidate for > # config file management. If we find that people really worry about imake > # stuff, we may add it. But for now, we leave the dir unprotected. > eend 0 > > insinto /etc/X11 > # We still use freetype for now ... > doins ${FILESDIR}/${PV}/XftConfig > newins ${FILESDIR}/${PV}/XftConfig XftConfig.new > # This is if we are using Fontconfig only ... > #newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig > dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig > > # Install example config file > newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example > > # Install MS fonts. > if use truetype && use !bindist > then > ebegin "Installing MS Core Fonts" > dodir /usr/X11R6/lib/X11/fonts/truetype > cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype > eend 0 > fi > > # EURO support > ebegin "Euro Support..." > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ > ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ > gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/lib" \ > ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ > gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz > eend 0 > > # Standard symlinks > dodir /usr/{bin,include,lib} > dosym ../X11R6/bin /usr/bin/X11 > dosym ../X11R6/include/X11 /usr/include/X11 > dosym ../X11R6/include/DPS /usr/include/DPS > dosym ../X11R6/include/GL /usr/include/GL > dosym ../X11R6/lib/X11 /usr/lib/X11 > dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb > > # Some critical directories > keepdir /var/lib/xdm > dosym ../../../var/lib/xdm /etc/X11/xdm/authdir > > # Remove invalid symlinks > rm -f ${D}/usr/lib/libGL.* > # Create required symlinks > dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so > dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so.1 > dosym libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so > # We move libGLU to /usr/lib now > dosym libGLU.so.1.3 /usr/lib/libMesaGLU.so > > # .la files for libtool support > insinto /usr/X11R6/lib > doins ${FILESDIR}/${PV}/lib/*.la > > # Remove libz.a, as it causes problems (bug #4777) > rm -f ${D}/usr/X11R6/lib/libz.a > # And do not forget the includes (bug #9470) > rm -f ${D}/usr/X11R6/include/{zconf.h,zlib.h} > > # Use the Xwrapper as the X binary > rm -f ${D}/usr/X11R6/bin/X > dosym Xwrapper /usr/X11R6/bin/X > dosym ../../usr/X11R6/bin/XFree86 /etc/X11/X > > # Fix perms > fperms 755 /usr/X11R6/lib/X11/xkb/geometry/sgi > fperms 755 /usr/X11R6/bin/dga > > # Hack from Mandrake (update ours that just created Compose files for > # all locales) > for x in $(find ${D}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) > do > # make empty Compose files for some locales > # CJK must not have that file (otherwise XIM don't works some times) > case `basename ${x}` in > C|microsoft-*|iso8859-*|koi8-*) > if [ ! -f ${x}/Compose ] > then > touch ${x}/Compose > fi > ;; > ja*|ko*|zh*) > if [ -r ${x}/Compose ] > then > rm -f ${x}/Compose > fi > ;; > esac > done > > # Another hack from Mandrake -- to fix dead + space for the us > # international keyboard > for i in ${D}/usr/X11R6/lib/X11/locale/*/Compose > do > sed -i \ > -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ > -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" \ > ${i} > done > > # Yet more Mandrake > ebegin "Encoding files for xfsft font server..." > dodir /usr/X11R6/lib/X11/fonts/encodings > cp -a ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/* \ > ${D}/usr/X11R6/lib/X11/fonts/encodings > > for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc > do > [ -f "${x}" ] && gzip -9 -f ${x} > done > eend 0 > > if use nls > then > ebegin "gemini-koi8 fonts..." > cd ${WORKDIR}/ukr > gunzip *.Z > gzip -9 *.pcf > cd ${S} > cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts > eend 0 > fi > > exeinto /etc/X11 > # new session management script > doexe ${FILESDIR}/${PV}/chooser.sh > # new display manager script > doexe ${FILESDIR}/${PV}/startDM.sh > exeinto /etc/X11/Sessions > for x in ${FILESDIR}/${PV}/Sessions/* > do > [ -f ${x} ] && doexe ${x} > done > insinto /etc/env.d > doins ${FILESDIR}/${PV}/10xfree > insinto /etc/X11/xinit > doins ${FILESDIR}/${PV}/xinitrc > exeinto /etc/X11/xdm > doexe ${FILESDIR}/${PV}/Xsession ${FILESDIR}/${PV}/Xsetup_0 > insinto /etc/X11/fs > newins ${FILESDIR}/${PV}/xfs.config config > > if use pam > then > insinto /etc/pam.d > newins ${FILESDIR}/${PV}/xdm.pamd xdm > # Need to fix console permissions first > newins ${FILESDIR}/${PV}/xserver.pamd xserver > fi > > exeinto /etc/init.d > newexe ${FILESDIR}/${PV}/xdm.start xdm > newexe ${FILESDIR}/${PV}/xfs.start xfs > insinto /etc/conf.d > newins ${FILESDIR}/${PV}/xfs.conf.d xfs > > # we want libGLU.so* in /usr/lib > mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib > > # next section is to setup the dynamic libGL stuff > ebegin "Moving libGL and friends for dynamic switching" > dodir /usr/lib/opengl/xfree/{lib,extensions,include} > local x="" > for x in ${D}/usr/X11R6/lib/libGL.so* \ > ${D}/usr/X11R6/lib/libGL.la \ > ${D}/usr/X11R6/lib/libGL.a \ > ${D}/usr/X11R6/lib/libMesaGL.so > do > if [ -f ${x} -o -L ${x} ] > then > # libGL.a cause problems with tuxracer, etc > mv -f ${x} ${D}/usr/lib/opengl/xfree/lib > fi > done > for x in ${D}/usr/X11R6/lib/modules/extensions/libglx* > do > if [ -f ${x} -o -L ${x} ] > then > mv -f ${x} ${D}/usr/lib/opengl/xfree/extensions > fi > done > for x in ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h} > do > if [ -f ${x} -o -L ${x} ] > then > mv -f ${x} ${D}/usr/lib/opengl/xfree/include > fi > done > eend 0 > > # Make the core cursor the default. People seem not to like whiteglass > # for some reason. > dosed 's:whiteglass:core:' /usr/share/cursors/xfree/default/index.theme > > einfo "Striping binaries and libraries..." > # This bit I got from Redhat ... strip binaries and drivers .. > # NOTE: We do NOT want to strip the drivers, modules or DRI modules! > for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ > grep -v ' shared object,' | \ > sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p') > do > if [ -f ${x} ] > then > # Dont do the modules ... > if [ "${x/\/usr\/X11R6\/lib\/modules}" = "${x}" ] > then > echo "`echo ${x} | sed -e "s|${D}||"`" > strip ${x} || : > fi > fi > done > # Now do the libraries ... > for x in ${D}/usr/{lib,lib/opengl/xfree/lib}/*.so.* \ > ${D}/usr/X11R6/{lib,lib/X11/locale/lib/common}/*.so.* > do > if [ -f ${x} ] > then > echo "`echo ${x} | sed -e "s|${D}||"`" > strip --strip-debug ${x} || : > fi > done > > # Install TaD's gentoo cursors > insinto /usr/share/cursors/xfree/gentoo/cursors > doins ${WORKDIR}/cursors/gentoo/cursors/* > insinto /usr/share/cursors/xfree/gentoo-blue/cursors > doins ${WORKDIR}/cursors/gentoo-blue/cursors/* > insinto /usr/share/cursors/xfree/gentoo-silver/cursors > doins ${WORKDIR}/cursors/gentoo-silver/cursors/* > > if [ "${SYNAPTICS}" = "yes" ] > then > # Install Synaptics touchpad driver and docs > insinto /usr/X11R6/lib/modules/input > doins ${SYNDIR}/synaptics_drv.o > exeinto /usr/X11R6/bin > doexe ${SYNDIR}/synclient > docinto synaptics > dodoc ${SYNDIR}/{COMPATIBILITY,FEATURES,FILES,INSTALL,INSTALL.DE,LICENSE,NEWS,PARAMETER,TODO,VERSION} > fi >} > >pkg_preinst() { > > # These changed from a directory/file to a symlink and reverse > if [ ! -L ${ROOT}/usr/X11R6/lib/X11/XftConfig ] && \ > [ -f ${ROOT}/usr/X11R6/lib/X11/XftConfig ] > then > rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig > fi > > if [ -L ${ROOT}/etc/X11/app-defaults ] > then > rm -f ${ROOT}/etc/X11/app-defaults > fi > > if [ ! -L ${ROOT}/usr/X11R6/lib/X11/app-defaults ] && \ > [ -d ${ROOT}/usr/X11R6/lib/X11/app-defaults ] > then > if [ ! -d ${ROOT}/etc/X11/app-defaults ] > then > mkdir -p ${ROOT}/etc/X11/app-defaults > fi > > mv -f ${ROOT}/usr/X11R6/lib/X11/app-defaults ${ROOT}/etc/X11 > fi > > if [ -L ${ROOT}/usr/X11R6/lib/X11/xkb ] > then > rm -f ${ROOT}/usr/X11R6/lib/X11/xkb > fi > > if [ ! -L ${ROOT}/etc/X11/xkb ] && \ > [ -d ${ROOT}/etc/X11/xkb ] > then > if [ ! -d ${ROOT}/usr/X11R6/lib/X11/xkb ] > then > mkdir -p ${ROOT}/usr/X11R6/lib/X11 > fi > > mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11 > fi > > # clean the dinamic libGL stuff's home to ensure > # we dont have stale libs floating around > if [ -d ${ROOT}/usr/lib/opengl/xfree ] > then > rm -rf ${ROOT}/usr/lib/opengl/xfree/* > fi > > # clean out old fonts.* and encodings.dir files, as we > # will regenerate them > local G_FONTDIR > # Not Speedo or CID, as their fonts.scale files are "real" > local G_FONTDIRS="100dpi 75dpi TTF Type1 encodings local misc util" > for G_FONTDIR in ${G_FONTDIRS} > do > find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ > -exec rm -f {} \; > find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \ > -exec rm -f {} \; > done > > # make sure we do not have any stale files lying round > # that could break things. > rm -f ${ROOT}/usr/X11R6/lib/libGL* >} > >update_XftConfig() { > > if [ "${ROOT}" = "/" ] > then > local CHECK1="f901d29ec6e3cbb0a5b0fd5cbdd9ff33" > local CHECK2="$(md5sum ${ROOT}/etc/X11/XftConfig | cut -d ' ' -f1)" > > if [ "${CHECK1}" = "${CHECK2}" ] > then > echo > ewarn "Due to an invalid /etc/X11/XftConfig from x11-base/xfree-4.2.1," > ewarn "/etc/X11/XftConfig is being updated automatically. Your old" > ewarn "version of /etc/X11/XftConfig will be backed up as:" > ewarn > ewarn " ${ROOT}etc/X11/XftConfig.bak" > echo > > cp -a ${ROOT}/etc/X11/XftConfig \ > ${ROOT}/etc/X11/XftConfig.bak > mv -f ${ROOT}/etc/X11/XftConfig.new \ > ${ROOT}/etc/X11/XftConfig > rm -f ${ROOT}/etc/X11/._cfg????_XftConfig > else > rm -f ${ROOT}/etc/X11/XftConfig.new > fi > fi >} > > >pkg_postinst() { > > env-update > > if [ "${ROOT}" = "/" ] > then > local x="" > > umask 022 > > # This one cause ttmkfdir to segfault :/ > #rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz > > # ******************************************************************** > # A note about fonts and needed files: > # > # 1) Create /usr/X11R6/lib/X11/fonts/encodings/encodings.dir > # > # 2) Create font.scale for TrueType fonts (need to do this before > # we create fonts.dir files, else fonts.dir files will be > # invalid for TrueType fonts...) > # > # 3) Now Generate fonts.dir files. > # > # CID fonts is a bit more involved, but as we do not install any, > # thus I am not going to bother. > # > # <azarah@gentoo.org> (20 Oct 2002) > # > # ******************************************************************** > > ebegin "Generating encodings.dir..." > # Create the encodings.dir in /usr/X11R6/lib/X11/fonts/encodings > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ > ${ROOT}/usr/X11R6/bin/mkfontdir -n \ > -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ > -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ > -- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings > eend 0 > > if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] > then > ebegin "Creating fonts.scale files..." > for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) > do > [ -z "$(ls ${x}/)" ] && continue > [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue > > # Only generate .scale files if truetype, opentype or type1 > # fonts are present ... > > # First truetype (ttf,ttc) > # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) > # Also, there is no way to regenerate Speedo/CID fonts.scale > # <spyderous@gentoo.org> 2 August 2004 > if [ "${x/encodings}" = "${x}" -a \ > -n "$(find ${x} -iname '*.tt[cf]' -print)" ] > then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ > ${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \ > -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ > -o ${x}/fonts.scale -d ${x} > # Next type1 and opentype (pfa,pfb,otf,otc) > elif [ "${x/encodings}" = "${x}" -a \ > -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ] > then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ > ${ROOT}/usr/X11R6/bin/mkfontscale \ > -a ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \ > -- ${x} > fi > done > eend 0 > fi > > ebegin "Generating fonts.dir files..." > for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) > do > [ -z "$(ls ${x}/)" ] && continue > [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue > > if [ "${x/encodings}" = "${x}" ] > then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ > ${ROOT}/usr/X11R6/bin/mkfontdir \ > -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \ > -e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \ > -- ${x} > fi > done > eend 0 > > ebegin "Generating Xft Cache..." > for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1) > do > [ -z "$(ls ${x}/)" ] && continue > [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue > > # Only generate XftCache files if there are truetype > # fonts present ... > if [ "${x/encodings}" = "${x}" -a \ > -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] > then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ > ${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null > fi > done > eend 0 > > ebegin "Fixing permissions..." > find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \ > -exec chmod 0644 {} \; > eend 0 > > # danarmak found out that fc-cache should be run AFTER all the above > # stuff, as otherwise the cache is invalid, and has to be run again > # as root anyway > if [ -x ${ROOT}/usr/bin/fc-cache ] > then > ebegin "Creating FC font cache..." > HOME="/root" ${ROOT}/usr/bin/fc-cache > eend 0 > fi > > # Switch to the xfree implementation. > # Use new opengl-update that will not reset user selected > # OpenGL interface ... > echo; ${ROOT}/usr/sbin/opengl-update --use-old xfree > fi > > for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) > do > # Remove old compose files we might have created incorrectly > # CJK must not have that file (otherwise XIM don't works some times) > case `basename ${x}` in > ja*|ko*|zh*) > if [ -r "${x}/Compose" ] > then > rm -f ${x}/Compose > fi > ;; > esac > done > > # Update /etc/X11/XftConfig if its the one from Xft1.2, as its > # invalid for Xft1.1 .... > # NOTE: This should not be needed for xfree-4.2.99 or later, > # but lets not take chances with people that may downgrade > # at a later stage .... > update_XftConfig > > # These need to be owned by root and the correct permissions > # (bug #8281) > for x in ${ROOT}/tmp/.{ICE,X11}-unix > do > if [ ! -d ${x} ] > then > mkdir -p ${x} > fi > > chown root:root ${x} > chmod 1777 ${x} > done > > if use 3dfx > then > echo > einfo "If using a 3DFX card, and you had \"3dfx\" in your USE flags," > einfo "please merge media-libs/glide-v3 if you have not done so yet" > einfo "by doing:" > einfo > einfo " # emerge media-libs/glide-v3" > echo > fi > echo > ewarn "BEWARE 1:" > ewarn "This version of XFree won't work with ati-drivers-2.5.1-r1" > ewarn "if you are using them please unmerge ati-drivers" > ewarn " and emerge xfree-drm" > echo > ewarn "BEWARE 2:" > ewarn "If you experience font corruption on OpenOffice.org or similar" > ewarn "glitches please remake your XF86Config" > echo > > einfo "Please note that the xcursors are in /usr/share/cursors/xfree" > einfo "Any custom cursor sets should be placed in that directory" > einfo "This is different from the previous versions of 4.3 and" > einfo "the 4.2.99 series." > einfo > ewarn "New in this release: if you wish to set system-wide default" > ewarn "cursors, please set them in /usr/local/share/cursors/xfree" > ewarn "so that future emerges will not overwrite those settings" > einfo > einfo "To use the Synaptics touchpad driver, check the installed" > einfo "documentation in /usr/share/doc/xfree, as well as" > einfo "http://tuxmobil.org/touchpad_driver.html and" > einfo "http://w1.894.telia.com/~u89404340/touchpad/." > einfo > ewarn "Listening on tcp is disabled by default with startx." > ewarn "To enable it, edit /usr/X11R6/bin/startx." >} > >pkg_postrm() { > > # Fix problematic links > if [ -x ${ROOT}/usr/X11R6/bin/XFree86 ] > then > ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11 > ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 > ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS > ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL > ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 > fi >}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 68544
:
42414
|
42416
|
42845
|
42846
|
42989
|
42990
|
42991
| 42992 |
43077
|
43705
|
44000
|
44005
|
44038
|
44071