summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-24 18:44:25 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-24 18:44:25 +0000
commit70a54e643938bed18cb7a15cab320ee5b2aba2fb (patch)
treeb676b43dc94eaa40ca51b724f44e2e07797b0efd /x11-base
parentnew version (diff)
downloadhistorical-70a54e643938bed18cb7a15cab320ee5b2aba2fb.tar.gz
historical-70a54e643938bed18cb7a15cab320ee5b2aba2fb.tar.bz2
historical-70a54e643938bed18cb7a15cab320ee5b2aba2fb.zip
fix stripping; fix fontconfig borking
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog10
-rw-r--r--x11-base/xfree/files/4.2.99.3-r1/site.def6
-rw-r--r--x11-base/xfree/files/4.2.99.3-r1/xfs.start4
-rw-r--r--x11-base/xfree/files/digest-xfree-4.2.99.3-r12
-rw-r--r--x11-base/xfree/xfree-4.2.1-r2.ebuild68
-rw-r--r--x11-base/xfree/xfree-4.2.99.3-r1.ebuild73
6 files changed, 109 insertions, 54 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 415f9f599d17..7f2ab16bb7ac 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,14 @@
# 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.76 2002/12/23 18:12:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.77 2002/12/24 18:44:25 azarah Exp $
+
+ 24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild,
+ xfree-4.2.99.3-r1.ebuild :
+
+ Do not let portage strip binaries and libraries, as then it stips the
+ DRI modules, which breaks things. Change 4.2.99.3-r1 to compile fontconfig,
+ but then we just remove all fontconfig related stuff. This should fix things
+ for Seemant and others.
23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild,
xfree-4.2.99.3-r1.ebuild :
diff --git a/x11-base/xfree/files/4.2.99.3-r1/site.def b/x11-base/xfree/files/4.2.99.3-r1/site.def
index 605a823a38aa..9338bf46c273 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/site.def
+++ b/x11-base/xfree/files/4.2.99.3-r1/site.def
@@ -26,7 +26,13 @@
#define Freetype2LibDir /usr/lib
/* #define BuildFreetype2Library YES */
#define UseFontconfig YES
+/* This is currently broken, so we depend on fontconfig, and then
+ just do not install any fontconfig related files ... */
/* #define HasFontconfig YES */
+
+/* We PDEPEND on Xft2, and link XFree86 only to the static lib,
+ so that we will not have conflicting files for Xft2 from
+ x11-base/xfree and x11-libs/xft ... */
#define SharedLibXft NO
#define SharedLibXft1 YES
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xfs.start b/x11-base/xfree/files/4.2.99.3-r1/xfs.start
index 66a098bb2d3e..1767b05ba61a 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xfs.start
+++ b/x11-base/xfree/files/4.2.99.3-r1/xfs.start
@@ -2,7 +2,7 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/xfs.start,v 1.1 2002/12/23 04:52:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/xfs.start,v 1.2 2002/12/24 18:44:25 azarah Exp $
#NB: Config is in /etc/conf.d/xfs
@@ -173,7 +173,7 @@ setup_font_dirs() {
if [ "${x/encodings}" = "${x}" -a \
-n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
then
- /usr/X11R6/bin/ttmkfdir \
+ /usr/X11R6/bin/ttmkfdir -x 2 \
-e /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
-o ${x}/fonts.scale -d ${x} &> /dev/null
fi
diff --git a/x11-base/xfree/files/digest-xfree-4.2.99.3-r1 b/x11-base/xfree/files/digest-xfree-4.2.99.3-r1
index 71df11fbfe8e..6dd43d19e04a 100644
--- a/x11-base/xfree/files/digest-xfree-4.2.99.3-r1
+++ b/x11-base/xfree/files/digest-xfree-4.2.99.3-r1
@@ -2,7 +2,7 @@ MD5 20ce3e8ad190ad8ae9aecc18cf168249 X4.2.99.3-1.tar.bz2 16691905
MD5 a70af970c95a9ec30365bc8ac8fb663f X4.2.99.3-2.tar.bz2 9770253
MD5 e0751934436f3679b128673aad663afc X4.2.99.3-3.tar.bz2 12774830
MD5 50dea4abe59a09da7fc1b83f88b9303b X4.2.99.3-4.tar.bz2 16700555
-MD5 dfe03b7ecc1d7a87d5245bf652c6e560 XFree86-4.2.99.3-patches-1.0.tar.bz2 236591
+MD5 4ecbe985e304445695dc82af0a532988 XFree86-4.2.99.3-patches-1.1.tar.bz2 232640
MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
MD5 5511a37ede0f6561c2dad26634b42e87 savage-1.1.26t.tgz 69707
MD5 8fe0419ad622053ae0e98f42c23ac3d5 sis_drv_src_141202-1.tar.gz 317440
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index f2636b6cdc10..08af28b642eb 100644
--- a/x11-base/xfree/xfree-4.2.1-r2.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild
@@ -1,6 +1,11 @@
# 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.9 2002/12/23 18:12:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.10 2002/12/24 18:44:25 azarah Exp $
+
+# 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 ...
+DEBUG="yes"
+RESTRICT="nostrip"
IUSE="sse nls mmx truetype 3dnow 3dfx"
@@ -81,7 +86,6 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
${X_PATCHES}
${X_DRIVERS}
truetype? ( ${MS_FONT_URLS} )"
-# mirror://sourceforge/freetype/freetype-${FT2_VER}.tar.bz2
LICENSE="X11 MSttfEULA"
SLOT="0"
@@ -92,12 +96,11 @@ DEPEND=">=sys-apps/baselayout-1.8.3
>=sys-libs/pam-0.75
>=sys-libs/zlib-1.1.3-r2
>=sys-devel/flex-2.5.4a-r5
- sys-devel/libtool
sys-devel/perl
>=media-libs/freetype-${FT2_VER}-r2
>=x11-base/opengl-update-1.4
- truetype? ( >=x11-misc/ttmkfdir-2.0
- app-arch/cabextract )"
+ >=x11-misc/ttmkfdir-2.0
+ truetype? ( app-arch/cabextract )"
RDEPEND=">=sys-apps/baselayout-1.8.3
>=sys-libs/ncurses-5.1
@@ -105,8 +108,7 @@ RDEPEND=">=sys-apps/baselayout-1.8.3
>=sys-libs/zlib-1.1.3-r2
>=media-libs/freetype-${FT2_VER}-r2
>=media-libs/fontconfig-2.1
- >=x11-base/opengl-update-1.4
- truetype? ( >=x11-misc/ttmkfdir-2.0 )"
+ >=x11-base/opengl-update-1.4"
# Above fontconfig is just to make sure user have a fixed version installed.
PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
@@ -120,19 +122,10 @@ src_unpack() {
unpack X${MY_SV}src-{1,2,3}.tgz \
fcpackage.${FC2_VER/\./_}.tar.gz \
XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
-# freetype-${FT2_VER}.tar.bz2
# Fix permissions
chmod -R 0755 ${WORKDIR}/fcpackage.${FC2_VER/\./_}/
- # Deploy our custom freetype2. We want it static for stability,
- # and because some things in Gentoo depends the freetype2 that
- # is distributed with XFree86.
-# ebegin "Updating Freetype2"
-# rm -rf ${S}/extras/freetype2
-# mv ${WORKDIR}/freetype-${FT2_VER} ${S}/extras/freetype2 || die
-# eend 0
-
# Install the glide3 headers for compiling the tdfx driver
if [ -n "`use 3dfx`" ]
then
@@ -298,11 +291,6 @@ src_unpack() {
rm -f ${x}.orig
fi
done
-
- # Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/
-# einfo "Applying Xft quality hack..."
-# cd ${S}/lib/Xft
-# cat ${FILESDIR}/${PVR}/xft-quality.diff | patch -p1 > /dev/null || die
}
src_compile() {
@@ -517,6 +505,34 @@ src_install() {
fi
done
eend 0
+
+ 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
}
pkg_preinst() {
@@ -560,12 +576,6 @@ pkg_preinst() {
mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
fi
- # This one was borked, so make sure fixed one gets installed.
- if [ -L ${ROOT}/usr/lib/X11 ]
- then
- rm -f ${ROOT}/usr/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 ]
@@ -582,7 +592,7 @@ pkg_preinst() {
# make sure we do not have any stale files lying round
# that could break things.
- rm -f ${ROOT}/usr/X11R6/lib/libGL.*
+ rm -f ${ROOT}/usr/X11R6/lib/libGL*
}
update_XftConfig() {
@@ -780,7 +790,7 @@ pkg_postrm() {
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
+ ln -snf ../X11R6/lib ${ROOT}/usr/lib/X11
fi
}
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 31eca44b6942..6af053c69305 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,11 @@
# 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.3 2002/12/23 18:12:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.3-r1.ebuild,v 1.4 2002/12/24 18:44:25 azarah Exp $
+
+# 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 ...
+DEBUG="yes"
+RESTRICT="nostrip"
IUSE="sse nls mmx truetype 3dnow 3dfx"
@@ -33,7 +38,7 @@ strip-flags
# Are we using a snapshot ?
USE_SNAPSHOT="yes"
-PATCH_VER="1.0"
+PATCH_VER="1.1"
FT2_VER="2.1.3"
SISDRV_VER="141202-1"
SAVDRV_VER="1.1.26t"
@@ -103,8 +108,9 @@ DEPEND=">=sys-apps/baselayout-1.8.3
sys-devel/perl
>=media-libs/freetype-${FT2_VER}-r2
>=media-libs/fontconfig-2.1-r1
+ media-libs/libpng
>=x11-base/opengl-update-1.4
- >=x11-misc/ttmkfdir-2.0-r1
+ >=x11-misc/ttmkfdir-3.0.4
pam? ( >=sys-libs/pam-0.75 )
truetype? ( app-arch/cabextract )"
@@ -114,8 +120,9 @@ RDEPEND=">=sys-apps/baselayout-1.8.3
>=dev-libs/expat-1.95.3
>=media-libs/freetype-${FT2_VER}-r2
>=media-libs/fontconfig-2.1-r1
+ media-libs/libpng
>=x11-base/opengl-update-1.4
- >=x11-misc/ttmkfdir-2.0-r1
+ >=x11-misc/ttmkfdir-3.0.4
pam? ( >=sys-libs/pam-0.75 )"
PDEPEND=">=x11-libs/xft-2.0.1-r1
@@ -305,10 +312,6 @@ src_compile() {
src_install() {
- # Since we do not build fontconfig internally, we need to add
- # this, or things breaks.
- ln -s /usr/bin/fc-cache ${S}/exports/bin/fc-cache
-
einfo "Installing XFree86..."
# gcc3 related fix. Do this during install, so that our
# whole build will not be compiled without mmx instructions.
@@ -322,10 +325,16 @@ src_install() {
make install DESTDIR=${D} || die
fi
- # These could cause problems, so remove them ...
- rm -f ${D}/usr/X11R6/bin/xft-config
- rm -f ${D}/usr/X11R6/lib/libXft.{a,so}
+ # We do not want these, so remove them ...
rm -rf ${D}/usr/X11R6/include/X11/Xft
+ rm -f ${D}/usr/X11R6/lib/libXft.{a,so}
+ rm -f ${D}/usr/X11R6/bin/xft-config
+ rm -f ${D}/usr/X11R6/man/man3/Xft.3x*
+ rm -rf ${D}/usr/X11R6/include/fontconfig
+ rm -f ${D}/usr/X11R6/lib/libfontconfig.*
+ rm -f ${D}/usr/X11R6/bin/fontconfig-config
+ 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
@@ -518,6 +527,34 @@ src_install() {
fi
done
eend 0
+
+ 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
}
pkg_preinst() {
@@ -561,12 +598,6 @@ pkg_preinst() {
mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
fi
- # This one was borked, so make sure fixed one gets installed.
- if [ -L ${ROOT}/usr/lib/X11 ]
- then
- rm -f ${ROOT}/usr/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 ]
@@ -583,7 +614,7 @@ pkg_preinst() {
# make sure we do not have any stale files lying round
# that could break things.
- rm -f ${ROOT}/usr/X11R6/lib/libGL.*
+ rm -f ${ROOT}/usr/X11R6/lib/libGL*
}
update_XftConfig() {
@@ -647,7 +678,7 @@ pkg_postinst() {
# 3) Now Generate fonts.dir files.
#
# CID fonts is a bit more involved, but as we do not install any,
- # I am not going to bother.
+ # thus I am not going to bother.
#
# <azarah@gentoo.org> (20 Oct 2002)
#
@@ -675,7 +706,7 @@ pkg_postinst() {
if [ "${x/encodings}" = "${x}" -a \
-n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
then
- ${ROOT}/usr/X11R6/bin/ttmkfdir \
+ ${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \
-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
-o ${x}/fonts.scale -d ${x}
fi
@@ -783,7 +814,7 @@ pkg_postrm() {
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
+ ln -snf ../X11R6/lib ${ROOT}/usr/lib/X11
fi
}