From: Marien Zwart Date: Fri, 30 Mar 2007 15:46:11 +0000 (+0000) Subject: Fix compilation with a 2.6.19 kernel (bug #172727). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bce784ea83ffc2cecd9b34ad45885e124048c673;p=gentoo.git Fix compilation with a 2.6.19 kernel (bug #172727). Package-Manager: portage-2.1.2.3 --- 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 + +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/Manifest b/x11-drivers/ati-drivers/Manifest index b5f47e6e4e65..cd070f7c5d58 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -17,10 +17,14 @@ AUX ati-drivers-8.28.8-linux-2.6.18.patch 720 RMD160 9daffb130acedeb1e926146bdf1 MD5 2494cd76022a981516d17367cbd3f9d1 files/ati-drivers-8.28.8-linux-2.6.18.patch 720 RMD160 9daffb130acedeb1e926146bdf101bc68e35b0d5 files/ati-drivers-8.28.8-linux-2.6.18.patch 720 SHA256 cd1ceac64e9abb0310972294ac61703b859873709c0b1a766d5bf115067122e3 files/ati-drivers-8.28.8-linux-2.6.18.patch 720 -AUX ati-drivers-8.35.5-2.6.20.patch 1064 RMD160 db2a9e060e63f6b0447ab0774488cb0c8b315cb0 SHA1 5f5b48d3c53c9704a01b8623dbb6570602a9227a SHA256 ead5bd1fd4e933937a468efb0b7296f31d0154a0ff17bd67ac1ef710bbd505e7 -MD5 6feb0e396b0ce94b12e9bf2ef2d25a4d files/ati-drivers-8.35.5-2.6.20.patch 1064 -RMD160 db2a9e060e63f6b0447ab0774488cb0c8b315cb0 files/ati-drivers-8.35.5-2.6.20.patch 1064 -SHA256 ead5bd1fd4e933937a468efb0b7296f31d0154a0ff17bd67ac1ef710bbd505e7 files/ati-drivers-8.35.5-2.6.20.patch 1064 +AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01 +MD5 b71070a5208649bd6c4947666b09d415 files/ati-drivers-8.35.5-2.6.19.patch 913 +RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 files/ati-drivers-8.35.5-2.6.19.patch 913 +SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01 files/ati-drivers-8.35.5-2.6.19.patch 913 +AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6 +MD5 dc209a9ba1054cb4f9a76dcfeb91aa10 files/ati-drivers-8.35.5-2.6.20.patch 333 +RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd files/ati-drivers-8.35.5-2.6.20.patch 333 +SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6 files/ati-drivers-8.35.5-2.6.20.patch 333 AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208 MD5 5d8df2d4fd1038207d93f85a419fe7d0 files/ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 files/ati-powermode-opt-path.patch 826 @@ -86,14 +90,14 @@ EBUILD ati-drivers-8.34.8.ebuild 13064 RMD160 8b0a16487e7563f615427d481ad444abf5 MD5 5e0767bf502222c3fd757d36bf7e7073 ati-drivers-8.34.8.ebuild 13064 RMD160 8b0a16487e7563f615427d481ad444abf5bcd689 ati-drivers-8.34.8.ebuild 13064 SHA256 835ee074a4e93dd929d78f1281c5ed6faf1c50de4b930dfa8a31d329c0228295 ati-drivers-8.34.8.ebuild 13064 -EBUILD ati-drivers-8.35.5.ebuild 13546 RMD160 cb979c3531580f546bf9a34731a5dd9e4de283db SHA1 6406d6058d28ff53c9e565af955d0e0008dc45a4 SHA256 99fb2fb338d220d872cac90af9b91340c7674268d7cfa3ea943ebe761083e48a -MD5 bb61ef66359ce19c279c58df820eda1c ati-drivers-8.35.5.ebuild 13546 -RMD160 cb979c3531580f546bf9a34731a5dd9e4de283db ati-drivers-8.35.5.ebuild 13546 -SHA256 99fb2fb338d220d872cac90af9b91340c7674268d7cfa3ea943ebe761083e48a ati-drivers-8.35.5.ebuild 13546 -MISC ChangeLog 36609 RMD160 c35dd71c338ed5175c0a8848c115207b50d30fc1 SHA1 7a2faae5947aae95a2a6a28afadbe54872a1874f SHA256 1845d094e4fc7c4467cd869d02da149e1874a00990cf2c4b332af9f625991598 -MD5 a670a1a7f080e6ce613357a1ac566065 ChangeLog 36609 -RMD160 c35dd71c338ed5175c0a8848c115207b50d30fc1 ChangeLog 36609 -SHA256 1845d094e4fc7c4467cd869d02da149e1874a00990cf2c4b332af9f625991598 ChangeLog 36609 +EBUILD ati-drivers-8.35.5.ebuild 13637 RMD160 409342e19000b16acb5afae36f3b52f9408d67e6 SHA1 4e2c2fc386b3e4d7f8c48f7abff306765b886d8b SHA256 3b9a316507e0d3d3c3413454bdbe882f6c4a4dd609039256533f607b492abdb2 +MD5 33843b6a5f9d09348a5e130aeca3f6d6 ati-drivers-8.35.5.ebuild 13637 +RMD160 409342e19000b16acb5afae36f3b52f9408d67e6 ati-drivers-8.35.5.ebuild 13637 +SHA256 3b9a316507e0d3d3c3413454bdbe882f6c4a4dd609039256533f607b492abdb2 ati-drivers-8.35.5.ebuild 13637 +MISC ChangeLog 36823 RMD160 34aaa7e05f6e4c9b25e77bac3e871e6d5d139aee SHA1 7ef98273f3b6a77ecf4af39a05f1a65c226b3439 SHA256 0c198cb2cbe2d69cef04f38a41e74c9ace716e6e2b7f0419edb3b97a454fbd2d +MD5 741f6a74ac039f84eca974f896e48653 ChangeLog 36823 +RMD160 34aaa7e05f6e4c9b25e77bac3e871e6d5d139aee ChangeLog 36823 +SHA256 0c198cb2cbe2d69cef04f38a41e74c9ace716e6e2b7f0419edb3b97a454fbd2d ChangeLog 36823 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494 @@ -134,7 +138,7 @@ SHA256 659a782745be00b18560605815672be5383db3e4cbe267c299c2777048421f67 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGDEWLUElL7eJpfEQRAqirAJ0X/PDHrDi0t8rFWODhISTmrsFp0ACfVnsD -3abTXhr1IfCAtMtxLT16+WU= -=503b +iD8DBQFGDTEAUElL7eJpfEQRAlEpAJ9k6CkRH9h+vH82P2a2xerBWA8WKgCgo7Mb +kSxVoVIHQu8RP5HPF20RTps= +=9oWR -----END PGP SIGNATURE----- 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 // 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