From d27936d09fb7eac62d860c01a13be4c53196a6a6 Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Sat, 24 Feb 2007 06:03:10 +0000 Subject: [PATCH] Apply a patch from desbaine@yahoo.com to fix bug #168163: make ati-drivers compile if a previous version is not installed. Package-Manager: portage-2.1.2-r10 --- x11-drivers/ati-drivers/ChangeLog | 6 ++++- x11-drivers/ati-drivers/Manifest | 22 +++++++++---------- .../ati-drivers/ati-drivers-8.34.8.ebuild | 10 +++++---- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index c587a236e775..ade2bde82075 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.65 2007/02/22 22:24:22 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.66 2007/02/24 06:03:10 marienz Exp $ + + 24 Feb 2007; Marien Zwart ati-drivers-8.34.8.ebuild: + Apply a patch from desbaine@yahoo.com to fix bug #168163: make ati-drivers + compile if a previous version is not installed. *ati-drivers-8.34.8 (22 Feb 2007) diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 54f049e0e532..fa18a357bc7a 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -81,14 +81,14 @@ EBUILD ati-drivers-8.33.6.ebuild 10670 RMD160 4eca26a8283930b042bc8a4179fa049632 MD5 484bad00c19c5743bc0cca2a135bc909 ati-drivers-8.33.6.ebuild 10670 RMD160 4eca26a8283930b042bc8a4179fa0496320316db ati-drivers-8.33.6.ebuild 10670 SHA256 f58a7b26609f2007136f7ca7a843bd2329bc6cf5d78678ace670a208bc5fea0c ati-drivers-8.33.6.ebuild 10670 -EBUILD ati-drivers-8.34.8.ebuild 12939 RMD160 f757169e195c63523de5917200c6f6e2f4e54907 SHA1 e87a6daa07c8730c35fdb638713bfccc5206d126 SHA256 e08ab3d3d3ad951d2d8d909485022f212c8d3eb0b61e074ca6d895ff2caaa9ab -MD5 5c25072671be89d16f5d89b4e4d3044f ati-drivers-8.34.8.ebuild 12939 -RMD160 f757169e195c63523de5917200c6f6e2f4e54907 ati-drivers-8.34.8.ebuild 12939 -SHA256 e08ab3d3d3ad951d2d8d909485022f212c8d3eb0b61e074ca6d895ff2caaa9ab ati-drivers-8.34.8.ebuild 12939 -MISC ChangeLog 35272 RMD160 dffce224cdd33e3d3df62c76a24d0effd8b56b51 SHA1 79ad67e4c72aae4a7572fa5484e6155c9875814a SHA256 5518c37ec186447c3d159d83ad6224f181778be7e2b89ba557ce54ba72cb105d -MD5 de1e3d083001b7e3af13c8f1104d6160 ChangeLog 35272 -RMD160 dffce224cdd33e3d3df62c76a24d0effd8b56b51 ChangeLog 35272 -SHA256 5518c37ec186447c3d159d83ad6224f181778be7e2b89ba557ce54ba72cb105d ChangeLog 35272 +EBUILD ati-drivers-8.34.8.ebuild 13011 RMD160 4ad8634f602ec15c32eee2acd56a5770957b0988 SHA1 b6415fb936443c680625df80a80f3567cd7cc167 SHA256 6fc63bbe2fed02aa85f13d93ade62c96168b8d8ea5e50fc3fd173132006bce1f +MD5 9da7365ffbbe4b5d941db7c1dc778b2a ati-drivers-8.34.8.ebuild 13011 +RMD160 4ad8634f602ec15c32eee2acd56a5770957b0988 ati-drivers-8.34.8.ebuild 13011 +SHA256 6fc63bbe2fed02aa85f13d93ade62c96168b8d8ea5e50fc3fd173132006bce1f ati-drivers-8.34.8.ebuild 13011 +MISC ChangeLog 35476 RMD160 1c7e532d2cebbfeddb0a2607e701516109e7b497 SHA1 1e1c9470ee2372583381dc06d2562c949fa17a7f SHA256 ec41e2ece0b9ef55c36462ff13a1d5a53229d82d379f40a4170c4cc00b058068 +MD5 f121c7fdaf3baafad615a8df3b0b6535 ChangeLog 35476 +RMD160 1c7e532d2cebbfeddb0a2607e701516109e7b497 ChangeLog 35476 +SHA256 ec41e2ece0b9ef55c36462ff13a1d5a53229d82d379f40a4170c4cc00b058068 ChangeLog 35476 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494 @@ -129,7 +129,7 @@ SHA256 817e0ef6514267acd75aa95716be2b008a506029776060602d491985f1616d4f files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF3hhGUElL7eJpfEQRAj8RAJ9jSTIbQ4C5Z10XO6zPG0LCpSv+4ACglNLG -3mbRM5GkOCa3uPjdzFPbdtk= -=6PBM +iD8DBQFF39U7UElL7eJpfEQRAudtAKCfOvJ4kbHuTj/MSAX7FLSBJnex1ACfTpie +7j2ibFrgJlXUIstomEm6fN0= +=8X8I -----END PGP SIGNATURE----- diff --git a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild index 1f4f594cf495..e4cf2095498b 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.1 2007/02/22 22:24:22 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.2 2007/02/24 06:03:10 marienz Exp $ IUSE="acpi qt3" @@ -170,20 +170,22 @@ src_compile() { # The -DUSE_GLU is needed to compile using nvidia headers # according to a comment in ati-drivers-extra-8.33.6.ebuild. "$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ + -I"${S}"/common/usr/include \ -lGL -lGLU -lX11 -lm fgl_glxgears.c || die "fgl_glxgears build failed" einfo "Building fglrx_gamma lib" cd "${S}"/extra/lib/fglrx_gamma "$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \ - fglrx_gamma.c -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 \ + fglrx_gamma.c -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 -lXext \ || die "fglrx_gamma lib build failed" ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed" ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed" einfo "Building fglrx_gamma util" cd "${S}"/extra/programs/fglrx_gamma - "$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} fglrx_xgamma.c \ - -lm -lfglrx_gamma -lX11 -lXext -L../../lib/fglrx_gamma \ + "$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \ + -I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \ + fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \ || die "fglrx_gamma util build failed" if use qt3; then -- 2.26.2