diff options
| author |   Marien Zwart <marienz@gentoo.org> | 2007-03-30 15:46:11 +0000 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2007-03-30 15:46:11 +0000 |
| commit | 30e3782a095be295e2d3d88f052f05f7ac19a928 (patch) | |
| tree | c68dd9996256a56a4c72d121d67b8fb8c5ec15bb /x11-drivers/ati-drivers | |
| parent | clean up (diff) | |
| download | gentoo-2-30e3782a095be295e2d3d88f052f05f7ac19a928.tar.gz gentoo-2-30e3782a095be295e2d3d88f052f05f7ac19a928.tar.bz2 gentoo-2-30e3782a095be295e2d3d88f052f05f7ac19a928.zip | |
Fix compilation with a 2.6.19 kernel (bug #172727).
(Portage version: 2.1.2.3)
Diffstat (limited to 'x11-drivers/ati-drivers')
4 files changed, 44 insertions, 34 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 1b2f899b3d4d..55555fd678c0 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,11 @@ # 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.70 2007/03/29 23:01:33 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.71 2007/03/30 15:46:11 marienz Exp $ + + 30 Mar 2007; Marien Zwart <marienz@gentoo.org> + +files/ati-drivers-8.35.5-2.6.19.patch, + files/ati-drivers-8.35.5-2.6.20.patch, ati-drivers-8.35.5.ebuild: + Fix compilation with a 2.6.19 kernel (bug #172727). *ati-drivers-8.35.5 (29 Mar 2007) diff --git a/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild index 15cd916a7a45..dfc766c4bf67 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.35.5.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.35.5.ebuild,v 1.1 2007/03/29 23:01:33 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild,v 1.2 2007/03/30 15:46:11 marienz Exp $ IUSE="acpi qt3" @@ -113,7 +113,10 @@ src_unpack() { "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ || die "bin rm failed" - # This patch is conditional because it contains an api change. + # These patches are conditional because they contain api changes. + if kernel_is ge 2 6 19; then + epatch "${FILESDIR}"/ati-drivers-${PV}-2.6.19.patch + fi if kernel_is ge 2 6 20; then epatch "${FILESDIR}"/ati-drivers-2.6.20.patch epatch "${FILESDIR}"/ati-drivers-${PV}-2.6.20.patch diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch new file mode 100644 index 000000000000..665d8d602921 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch @@ -0,0 +1,33 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 +@@ -5055,7 +5057,6 @@ + */ + unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache) + { +- unsigned int ret = 0; + kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache; + + DBG_ENTER("0x%08X", hSlabCache); +@@ -5069,18 +5070,11 @@ + + DBG_TRACE("destroying slab object '%s'", slabcache_obj->name); + +- if (kmem_cache_destroy(slabcache_obj->cache) == 0) +- { +- ret = 1; +- slabcache_obj->cache = NULL; +- } +- else +- { +- DBG_ERROR("destroying failed"); +- } ++ kmem_cache_destroy(slabcache_obj->cache); ++ slabcache_obj->cache = NULL; + +- DBG_LEAVE("%d", ret); +- return ret; ++ DBG_LEAVE("1"); ++ return 1; + } + + /** \brief Allocate an entry in a Slab Cache diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch index 553577a06507..c830d386dc28 100644 --- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch @@ -9,34 +9,3 @@ #include <linux/kmod.h> // To enable DBG_* macros set this variable to nonzero -@@ -5055,7 +5057,6 @@ - */ - unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache) - { -- unsigned int ret = 0; - kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache; - - DBG_ENTER("0x%08X", hSlabCache); -@@ -5069,18 +5070,11 @@ - - DBG_TRACE("destroying slab object '%s'", slabcache_obj->name); - -- if (kmem_cache_destroy(slabcache_obj->cache) == 0) -- { -- ret = 1; -- slabcache_obj->cache = NULL; -- } -- else -- { -- DBG_ERROR("destroying failed"); -- } -+ kmem_cache_destroy(slabcache_obj->cache); -+ slabcache_obj->cache = NULL; - -- DBG_LEAVE("%d", ret); -- return ret; -+ DBG_LEAVE("1"); -+ return 1; - } - - /** \brief Allocate an entry in a Slab Cache |