diff options
| -rw-r--r-- | x11-base/xfree/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 | bin | 0 -> 20913 bytes | |||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.1-r2.ebuild | 15 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.99.3-r1.ebuild | 18 |
4 files changed, 24 insertions, 19 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index a1c05939ce93..415f9f599d17 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,11 +1,17 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.75 2002/12/23 05:08:39 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.76 2002/12/23 18:12:59 azarah Exp $ - 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> : + 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild, + xfree-4.2.99.3-r1.ebuild : Fix bug #12599 (type o in Xsession). + Update trident patches to fix bug #10624 again. + + Fix check for $DEBUGBUILD to test for "yes" and not "true", + fixing bug #12572. + *xfree-4.2.99.3-r1 (23 Dec 2002) 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.99.3-r1.ebuild : diff --git a/x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 b/x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 Binary files differnew file mode 100644 index 000000000000..be0b4d64ffe9 --- /dev/null +++ b/x11-base/xfree/files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild index 9b45c341dee5..f2636b6cdc10 100644 --- a/x11-base/xfree/xfree-4.2.1-r2.ebuild +++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.8 2002/12/23 04:52:09 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.9 2002/12/23 18:12:59 azarah Exp $ IUSE="sse nls mmx truetype 3dnow 3dfx" @@ -160,6 +160,10 @@ src_unpack() { ${S}/lib/Xrender/Imakefile.orig > ${S}/lib/Xrender/Imakefile eend 0 + # Need to fix patches for trident driver, bug #10624 + rm -f ${WORKDIR}/patch/036* + cp ${FILESDIR}/${PVR}/036*bug* ${WORKDIR}/patch/ + if [ "`gcc-version`" = "2.95" ] then # Do not apply this patch for gcc-2.95.3, as it cause compile to fail, @@ -240,7 +244,7 @@ src_unpack() { fi echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - if [ "${DEBUGBUILD}" != "true" ] + if [ "${DEBUGBUILD}" != "yes" ] then # use less ram .. got this from Spider's makeedit.eclass :) echo "#define GccWarningOptions -Wno-return-type -w" >> config/cf/host.def @@ -303,11 +307,8 @@ src_unpack() { src_compile() { - if [ -f /proc/cpuinfo ] - then - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - fi + # Set MAKEOPTS to have proper -j? option .. + get_number_of_jobs einfo "Building XFree86..." emake World || die diff --git a/x11-base/xfree/xfree-4.2.99.3-r1.ebuild b/x11-base/xfree/xfree-4.2.99.3-r1.ebuild index a2750330309e..31eca44b6942 100644 --- a/x11-base/xfree/xfree-4.2.99.3-r1.ebuild +++ b/x11-base/xfree/xfree-4.2.99.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.3-r1.ebuild,v 1.2 2002/12/23 05:44:50 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.3-r1.ebuild,v 1.3 2002/12/23 18:12:59 azarah Exp $ IUSE="sse nls mmx truetype 3dnow 3dfx" @@ -102,6 +102,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3 >=dev-libs/expat-1.95.3 sys-devel/perl >=media-libs/freetype-${FT2_VER}-r2 + >=media-libs/fontconfig-2.1-r1 >=x11-base/opengl-update-1.4 >=x11-misc/ttmkfdir-2.0-r1 pam? ( >=sys-libs/pam-0.75 ) @@ -112,12 +113,12 @@ RDEPEND=">=sys-apps/baselayout-1.8.3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/expat-1.95.3 >=media-libs/freetype-${FT2_VER}-r2 - >=media-libs/fontconfig-2.1 + >=media-libs/fontconfig-2.1-r1 >=x11-base/opengl-update-1.4 >=x11-misc/ttmkfdir-2.0-r1 pam? ( >=sys-libs/pam-0.75 )" -PDEPEND=">=x11-libs/xft-2.0.1 +PDEPEND=">=x11-libs/xft-2.0.1-r1 3dfx? ( >=media-libs/glide-v3-3.10 )" PROVIDE="virtual/x11 @@ -221,7 +222,7 @@ src_unpack() { fi echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def - if [ "${DEBUGBUILD}" != "true" ] + if [ "${DEBUGBUILD}" != "yes" ] then # use less ram .. got this from Spider's makeedit.eclass :) echo "#define GccWarningOptions -Wno-return-type -w" >> config/cf/host.def @@ -289,11 +290,8 @@ src_unpack() { src_compile() { - if [ -f /proc/cpuinfo ] - then - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - fi + # Set MAKEOPTS to have proper -j? option .. + get_number_of_jobs einfo "Building XFree86..." emake World || die @@ -400,7 +398,7 @@ src_install() { eend 0 fi - # Change the silly red pointer to a while one ... + # Change the silly red pointer to a white one ... dosed 's:redglass:whiteglass:' /usr/X11R6/lib/X11/icons/default/index.theme # Standard symlinks |