From: Luca Barbato Date: Sun, 3 Dec 2006 15:51:37 +0000 (+0000) Subject: ebuild cleanup and 2.6.19 support X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45a5bc2626910fbc633013d37852fab7ec984656;p=gentoo.git ebuild cleanup and 2.6.19 support Package-Manager: portage-2.1.2_rc2 --- diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index bf456f1f1fd6..880932aca395 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.53 2006/11/02 18:22:52 chrb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.54 2006/12/03 15:51:37 lu_zero Exp $ + + 03 Dec 2006; Luca Barbato + +files/ati-drivers-2.6.19.patch, ati-drivers-8.30.3-r1.ebuild: + ebuild cleanup from Anarchy&genstef (featuring dsd) see bug #143509 *ati-drivers-8.30.3-r1 (02 Nov 2006) diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 37b8cb7188d8..384216219ae3 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -2,6 +2,10 @@ AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710 MD5 5ac06946904a0282c5da617bda2a8f6b files/09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 files/09ati 75 SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 files/09ati 75 +AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6 +MD5 16940a74b7d6cb07affb2e18848d144c files/ati-drivers-2.6.19.patch 3158 +RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e files/ati-drivers-2.6.19.patch 3158 +SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6 files/ati-drivers-2.6.19.patch 3158 AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289 MD5 c3d42d3e0ad9acb6b682d7d7c27e6489 files/ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 files/ati-powermode.sh.patch 1142 @@ -27,18 +31,18 @@ EBUILD ati-drivers-8.29.6.ebuild 11199 RMD160 3a8c6ef276bc246298488cbb379f057dcd MD5 4551a8aaaaa9afd8addb70753ca45625 ati-drivers-8.29.6.ebuild 11199 RMD160 3a8c6ef276bc246298488cbb379f057dcd7fbab2 ati-drivers-8.29.6.ebuild 11199 SHA256 d7e759385c6f6e258bc020882172cb9d263d0e6e356b9682ab8c5c9c7ffec473 ati-drivers-8.29.6.ebuild 11199 -EBUILD ati-drivers-8.30.3-r1.ebuild 11202 RMD160 a1671b10fed33a6e4017b4bdfd01a6a76bbcb0cc SHA1 5dd4f6eba7c88fe2c534ca4aa338bc8922c464bc SHA256 e50e0f2f35dfdd80a19c4e5ff5fa116eddf67e4cefb9c376147694733770d3c9 -MD5 c3eed90f9ce3b60729e13a818516d513 ati-drivers-8.30.3-r1.ebuild 11202 -RMD160 a1671b10fed33a6e4017b4bdfd01a6a76bbcb0cc ati-drivers-8.30.3-r1.ebuild 11202 -SHA256 e50e0f2f35dfdd80a19c4e5ff5fa116eddf67e4cefb9c376147694733770d3c9 ati-drivers-8.30.3-r1.ebuild 11202 +EBUILD ati-drivers-8.30.3-r1.ebuild 10605 RMD160 448eaee4b8f9b2a61f4d5c6316768352a28f20d0 SHA1 014e268718f318c025d8fd4ce51401201894b678 SHA256 b31be17e329d58963df52de51fb57087cbe66ec4e2ac98a5dfa9b2cb1b8d3cb8 +MD5 796cc45788cc9de389264b47f489a503 ati-drivers-8.30.3-r1.ebuild 10605 +RMD160 448eaee4b8f9b2a61f4d5c6316768352a28f20d0 ati-drivers-8.30.3-r1.ebuild 10605 +SHA256 b31be17e329d58963df52de51fb57087cbe66ec4e2ac98a5dfa9b2cb1b8d3cb8 ati-drivers-8.30.3-r1.ebuild 10605 EBUILD ati-drivers-8.30.3.ebuild 11194 RMD160 6cef5a7467098dc471000bf7baf24776db056a0f SHA1 8b33c55477abc25a53ec821d07df5fedf679bf27 SHA256 3422ebee63d8418afe1855cba0e0625d9aca39b9aa37054b18fd1323d96cc684 MD5 dd66ec8951ad6e44f8959dabc43702f0 ati-drivers-8.30.3.ebuild 11194 RMD160 6cef5a7467098dc471000bf7baf24776db056a0f ati-drivers-8.30.3.ebuild 11194 SHA256 3422ebee63d8418afe1855cba0e0625d9aca39b9aa37054b18fd1323d96cc684 ati-drivers-8.30.3.ebuild 11194 -MISC ChangeLog 33003 RMD160 7c3b04f50eb1dae34edc8d83abfb307d8625613f SHA1 043d7d945360af1cae76e7e9d7926cc55e7028e8 SHA256 89cda4ee38e18e999ef9d4e28e7ce9ee5eacdbda4ad22e8ec60391b166698fc6 -MD5 0496855c7510cdc7159b85a192ad2b14 ChangeLog 33003 -RMD160 7c3b04f50eb1dae34edc8d83abfb307d8625613f ChangeLog 33003 -SHA256 89cda4ee38e18e999ef9d4e28e7ce9ee5eacdbda4ad22e8ec60391b166698fc6 ChangeLog 33003 +MISC ChangeLog 33191 RMD160 f16e8bcd0652d3649c2c7bc8e7273a2ef862a6ce SHA1 64ec2a1f3f959781ea08c51fad5555a61ec10c0f SHA256 5b743c3b45c7adb9ce1515648bafb88cfff4f70e3aa2146a04afabcb5addcc49 +MD5 934d38acd3c2e0560c207db03ee07958 ChangeLog 33191 +RMD160 f16e8bcd0652d3649c2c7bc8e7273a2ef862a6ce ChangeLog 33191 +SHA256 5b743c3b45c7adb9ce1515648bafb88cfff4f70e3aa2146a04afabcb5addcc49 ChangeLog 33191 MISC metadata.xml 227 RMD160 995920cb9ba6325fe5a22db8af8e2fbd175626ba SHA1 55b89696d4d0085dabefd5a84c7de12856c1b399 SHA256 e88d5d6f3ed73a348132ed81f0f37e422b0ca0e739a36918c99beba883175bbf MD5 743a1c880d5bdf91acb9fc889a99fe2f metadata.xml 227 RMD160 995920cb9ba6325fe5a22db8af8e2fbd175626ba metadata.xml 227 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild index 9c36ee935a99..357da7cf20c7 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 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.30.3-r1.ebuild,v 1.1 2006/11/02 18:22:52 chrb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild,v 1.2 2006/12/03 15:51:37 lu_zero Exp $ IUSE="acpi doc opengl" -inherit eutils rpm multilib linux-mod linux-info toolchain-funcs +inherit eutils rpm multilib linux-mod toolchain-funcs DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" HOMEPAGE="http://www.ati.com" @@ -27,11 +27,11 @@ DEPEND=">=virtual/linux-sources-2.4 PROVIDE="virtual/opengl" +S="${WORKDIR}/common/lib/modules/fglrx/build_mod" + ATIBIN="${D}/opt/ati/bin" RESTRICT="nostrip multilib-pkg-force stricter" -MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)" - QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so" QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so" QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2" @@ -78,38 +78,22 @@ choose_driver_paths() { pkg_setup(){ #check kernel and sets up KV_OBJ + MODULE_NAMES="fglrx(video)" + BUILD_TARGETS="kmod_build" linux-mod_pkg_setup - local agp - ebegin "Checking for MTRR support enabled" - linux_chkconfig_present MTRR - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You don't have MTRR support enabled, the direct rendering" - ewarn "will not work." - fi - - ebegin "Checking for AGP support enabled" - linux_chkconfig_present AGP - eend $? + BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - if [[ $? -ne 0 ]] ; then - - ebegin "Checking for PCI Express support enabled" - linux_chkconfig_present PCIEPORTBUS - eend $? - - if [[ $? -ne 0 ]] ; then - ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering" - ewarn "could work only using the internal support." - fi + if ! linux_checkconfig_present MTRR; then + ewarn "You don't have MTRR support enabled, the direct rendering will not work." + fi + if linux_chkconfig_builtin DRM; then + ewarn "You have DRM support enabled builtin, the direct rendering will not work." fi - ebegin "Checking for DRM support disabled" - ! linux_chkconfig_builtin DRM - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You have DRM support enabled builtin, the direct rendering" - ewarn "will not work." + + if ! linux_chkconfig_present AGP && ! linux_chkconfig_present PCIEPORTBUS ;then + ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering" + ewarn "could work only using the internal support." fi # Set up X11 implementation @@ -142,6 +126,8 @@ src_unpack() { rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel} + epatch ${FILESDIR}/${PN}-2.6.19.patch + if use acpi then sed -i \ @@ -158,28 +144,17 @@ src_unpack() { src_compile() { einfo "Building the DRM module..." - cd ${WORKDIR}/common/lib/modules/fglrx/build_mod ln -s \ ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \ || die "cannot find precompiled core" - if kernel_is 2 6 - then - set_arch_to_kernel - addwrite "/usr/src/${FK}" + export _POSIX2_VERSION="199209" + + if kernel_is 2 6; then cp 2.6.x/Makefile . - export _POSIX2_VERSION="199209" - if use_m ; - then - make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \ - modules || ewarn "DRM module not built" - else - make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \ - modules || ewarn "DRM module not built" - fi - set_arch_to_portage + convert_to_m Makefile + linux-mod_src_compile else - export _POSIX2_VERSION="199209" # That is the dirty way to avoid the id -u check sed -e 's:`id -u`:0:' \ -e "s:\`uname -r\`:${KV_FULL}:" \ @@ -200,7 +175,6 @@ pkg_preinst() { src_install() { local ATI_LIBGL_PATH="" - cd ${WORKDIR}/common/lib/modules/fglrx/build_mod linux-mod_src_install cd ${WORKDIR} diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch new file mode 100644 index 000000000000..160565a31a0d --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch @@ -0,0 +1,67 @@ +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c 2006-10-27 09:44:23.902749464 -0500 +@@ -61,7 +61,6 @@ + #include + #endif + #endif +-#include + #include + #include + #include +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-10-27 09:44:34.265174136 -0500 +@@ -99,9 +99,6 @@ + #endif + #endif + +-#include +- +- + #include + #include + #include +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h 2006-10-27 09:44:52.502401656 -0500 +@@ -38,7 +38,6 @@ + #define _DRM_H_ + + #if defined(__linux__) +-#include + #include /* For _IO* macros */ + #define DRM_IOCTL_NR(n) _IOC_NR(n) + #define DRM_IOC_VOID _IOC_NONE +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h 2006-10-27 09:45:03.912667032 -0500 +@@ -42,7 +42,6 @@ + * can build the DRM (part of PI DRI). 4/21/2000 S + B */ + #include + #endif /* __alpha__ */ +-#include + #include + #include + #include +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-10-27 09:45:47.463046368 -0500 +@@ -67,9 +67,6 @@ + * for example for CPU hot-plugging. I wonder why a desktop + * distribution would even include such a kernel patch. */ + #ifdef CONFIG_MEM_MIRROR +-/* Prevent linux/config.h from being included again in subsequent +- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ +-#include + #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules." + #warning "This will break page tracking when the fglrx kernel module is used." + #undef CONFIG_MEM_MIRROR +@@ -86,7 +83,6 @@ + #include /* for installing the patch wrapper */ + #include + +-#include + #include + #include + #include