diff options
author | 2013-03-02 11:30:53 +0000 | |
---|---|---|
committer | 2013-03-02 11:30:53 +0000 | |
commit | 68cbf49c839c75082ed0355adc7f04d960136a9e (patch) | |
tree | e9bbd5ec4d61a7584759622d619d80c3d0f178b3 /x11-drivers/nvidia-drivers | |
parent | Version bump. (diff) | |
download | historical-68cbf49c839c75082ed0355adc7f04d960136a9e.tar.gz historical-68cbf49c839c75082ed0355adc7f04d960136a9e.tar.bz2 historical-68cbf49c839c75082ed0355adc7f04d960136a9e.zip |
Fix missing -I flag to get headers from arch/x86/include/uapi in use with Linux 3.8.x wrt #447566, Comment #38
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'x11-drivers/nvidia-drivers')
4 files changed, 31 insertions, 14 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index f36ea74afd93..77156caa0ebf 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.425 2013/02/24 06:45:39 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.426 2013/03/02 11:30:39 ssuominen Exp $ + + 02 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> + nvidia-drivers-313.18.ebuild, +files/nvidia-drivers-313.18-linux-3.8+.patch: + Fix missing -I flag to get headers from arch/x86/include/uapi in use with + Linux 3.8.x wrt #447566, Comment #38 24 Feb 2013; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-310.32.ebuild: stable on amd64 and x86 for stability fixes and new X.org Video ABI support diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 50c079ef0358..8917ccacfc19 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -13,6 +13,7 @@ AUX nvidia-blacklist-vga-pmu-registers-256-304.diff 1713 SHA256 674a51e77beb3e07 AUX nvidia-drivers-190.53-2.6.33.patch 2893 SHA256 68f5cdf4489fb6bc480319e4bda6e6481beb189cf37920b939b8f7bbf77aed1f SHA512 e6d4b1735c49b64f6b6f5a55273fe052913dfa775d1d3e6a76316e6d78dead566ebf4e695a30cd1e4fb25eb3e22572fcef2817fa4ea7f24dfdf5aea8b4db7ea8 WHIRLPOOL 09383431cce49789982827ee47016377623b124a7af8def45acb5c3bfb74839e09d46ca37e6331649983f4c3427a1d2f854fdd83023527addd8cadeef8327d01 AUX nvidia-drivers-313.18-builddir-config.patch 1450 SHA256 28872397c455457fc4757c5309864ef00e737b719e607cb723b5e678bedc9807 SHA512 e554b1a5f776e6078bea6e30ccb1375b30c247e9e674609d4d20fbd7250b2fe6014bf69ab9404985c91cbfb41b9803dceda5d00f735a0bdfe0e506591f60e659 WHIRLPOOL 2fe5b0cdb022b04420b31177d2a23d92cf42ee8ad5faed7bf0ff3b85815032555ba1ccba1e124609ed63d49d0c90390bb7d70c87c8b5003ff32802836ce989d2 AUX nvidia-drivers-313.18-linux-3.7+.patch 990 SHA256 1ef3c4f6016189117a1dc7c1ef4949376fd762f29d6cb07bd3016dc01b483bcd SHA512 0eb41c71b0c96314022e2a6ae7fbed15b9247de087032e78e8e623137127cdbab4c79d454c7cab00ae5e0710fe48909df607d56592813e005eb2124cc2c1374f WHIRLPOOL 496a92c9b10c1bd7f1c797f57213d5033460329377ce759f25ecd90e900bc3277abf4aabaac73a6d7bcb5c563925919638d7f1a092d7b80c34de437a87deb354 +AUX nvidia-drivers-313.18-linux-3.8+.patch 461 SHA256 a22245e4a44d0aeb36a95519e80efd24416b7a927852b23dd23e514849d9e076 SHA512 07f266cb3af92ace0e2c92f2d23bf716067c83c5b9da24d8670de5a8228b998b28380f01eca84c27a6e7a8d6c296db62182b90c71e29939022b083341e21d612 WHIRLPOOL 6cb29e35bd86160a62b26b0a2976b6557c717d196407ad32f186269001dd6a3786906bced5a739385e3010ef3142a1c1ff1ea3648ccb6ffe2e5932323f03995d AUX nvidia-drivers-pax-const.patch 833 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 SHA512 6ef94db71cab2dd47273eaed1857209d03ef648d268c7645f3ca4caf6b894590e42a8e716e4354f2eed656e7d55a4c1774b1e6a4be215fbf59fc9d0b1a5762a0 WHIRLPOOL 1b2d737ee7ccee831c85bd8af9605c0633fd025bb209e6d76c13f49a5664aa490bd5b6ce48855e541fe87380cd7b723162e1965b803e1ed630f239bf4dbd0d19 AUX nvidia-drivers-pax-usercopy.patch 2350 SHA256 56980f43db38d582bc6a9bfd881973fce6e3e056b77ce4f4005bdcf79526a863 SHA512 54a1354ba008d014a608044610027b4d808120f8e77cc7d5ac855c3dcf4f487b0a4c0870ae4e727db0643cb56ee21513b803976e9a30c6838adf2f5414232804 WHIRLPOOL 78ac54bfe52cc3b6dfa28e17020991dfb7056984d667b0fefa41d23372b03e1a8e6d66c74e1dee234733d5b2b36e2c0813f507a89716ae2d8f1f6db917fdf01d AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b @@ -40,20 +41,18 @@ DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbd EBUILD nvidia-drivers-173.14.36.ebuild 17020 SHA256 3bdaeaf69a7bd777c5e062bdc9e6f19a67189398ca161a6e13c7972106815c2d SHA512 092f2c9c66f36e852a7d018cc5518d99848724bbe5746e80f54523d88ef9c43e76015be1057f8291be8ae23c37e7685ace500493da16a43ff242c3482afaf397 WHIRLPOOL c75054dd963be8cff7fd69ded60024de479f42434dd42a171351d02c0e410eb91d3d57063e430c864afbc557e8e4f5ca608d683965483f315775fdaab71996ba EBUILD nvidia-drivers-304.64.ebuild 13035 SHA256 3c338701ba52886dd1e13d0a8c2ae4ce053376ec386bf8097be36235a646ea38 SHA512 24cd82820957ad6d4072691d15d6c35e726e560cf6467ee0cec5328fae3964ef6faca92f3daee56362dd9de43b59ab72667321b3b43e0cc38e9b5d99a072dfae WHIRLPOOL 99480728d6f23f11f6962f4a3caf2c34fe6cc62dd3398129e94b62ad3f69b964e89df7c9ea80c3826026e2528df9c1b8183997e1b357f38116f249890bf0ffb7 EBUILD nvidia-drivers-310.32.ebuild 12625 SHA256 56a05f369817a67a74732df7ae40c9c456682e1b5393ebc3b0d302d4bcff8b35 SHA512 bf12a13355fc49460473862d99b9b6f68205f2c882c27ec3c378b525e456683c5683798b1879189dcf41542edab1dc5e562417c8e663448f4f26ee9dcf8bccf9 WHIRLPOOL 813e9c28934dd411625098d3e61b45b1d1f46ae2f22b12167de748cd669bda23f7cb3a6cd8300eb7d453b3c68414d3d9165d5705e1b9c1897949506d0311fab2 -EBUILD nvidia-drivers-313.18.ebuild 12745 SHA256 b856bb34e2bb0b97a5da5fac410f035ec53aceb7c060c7fa8514f6fcc938f077 SHA512 0d80c7484f7cd0017018fddf87eae2980c69a118d0b4516250b4b56deaf92a2c84b88f5a903410697d96c67355cfe4aac441f4ac032d534e1f5117a55e4d5ff1 WHIRLPOOL 9c4a3ab78871f355b1f63244c8f3bb494ea108437c28243c5eb0b068aaa8e3ef8535e9a6d90a8a628e3a3ac80158262c6cf8920c0f6c76047f2059cfc44f3e96 +EBUILD nvidia-drivers-313.18.ebuild 12752 SHA256 11848a1381f0e03c7b3f1977551f5d84be2055292b48392b824e0a069b9c8588 SHA512 b672ac0b2924ee3b8921e7264068a4693da9410c7cb744dc652d72a00f91d59cc3a8aca2181863acae41efe01d1500b77fd48c2f827b5c762b67bf9605843e25 WHIRLPOOL 433c428ebacd7f76422c4b4da5d81a17a686cccf2e5f09c4be3991393f0b70392dfb99bcf401a8d3afd13cd85ef043c9cb8e63cc68db849c972389762a4a9c33 EBUILD nvidia-drivers-96.43.23.ebuild 15637 SHA256 dc902bb0800a810e52f14988c98a57f052964fb53609caa5177d4cf69f2b38d0 SHA512 72404ae09ae56feccf828e50aff58a782474c6f87858e458fd1830ad442d4bdffa1f3fa1a6d390ed7ec877b9115a15c584d2cf96ec3e8ae087eb4534fb92b230 WHIRLPOOL 2658603a31c3565dd7c35cba6876a35b9a7ffa9782cdd9fa227f6f39432c1d97a0584ef8a0b45fb4f73201a5b733bf17cbf75c798e92a8127692c31ce42b4575 -MISC ChangeLog 89054 SHA256 7c1313e4e66572001a36581ba07b658e3f4ad51217e9a1bedf225ce111855c06 SHA512 c71c278b542178fcb52d7ad48edc4fb5fbeabaf13fc944c3605512e5b15c4db9f7f4552c09e450239a128bce383c26d8d1b234a8a18b9387ae2293bcf4086402 WHIRLPOOL 42624d662f3553cbd369ad92a1e7e4154a8e64237a7d06bc81cdc644b15e1767851b67c77088480f27d9b871118f1ec20cc88fe1aa8942cc8f0b32adb81ce82e +MISC ChangeLog 89306 SHA256 d32ae958bd48168bffe9770cb3b97a4e6b862daf5ccfe6979334c856fde67d20 SHA512 e410d031c51674cc413dbfc8ec82aa754a3739c99ba3026b00eb0b70dfe23334162294d5b22d87b7f9a5222fc37efc943fd344c4c780ec82fce2cdccd9f4b054 WHIRLPOOL 80e1bfc1a57c650b53d0710e9f320ed623b64b3b14418aac094134a5f0e93d36f71d399566890468e1a7d92e562c1b11670a1931eb42311dbe9ed3f62538f5b4 MISC metadata.xml 808 SHA256 fd6081b9530e8e43eb50dce60e649ac1621293a310156ddc297454217056569d SHA512 efe41a3e1c1b09e4ea4faf12031cdf047f25e18a936634a987fd35a0ec2c80efd9eec59695c60b7959326c68145e3068f5909c4e60f9c8077f01d56a6d8e8cc8 WHIRLPOOL 455b439dfa6b98efc152990b9155b8eed5786b3ee6afd3b14f7ec3650390891185f35c84cf2b57a54da899014b9245ae38bc7e1613be1fad80f2a3401f420c3a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQF8BAEBCABmBQJRKbccXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE -N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvW8EIAI0znUVOCc177rkR6v8/1Fd8 -Ftct+xyAEXaXeHKWP3UGfE9icx035sCCX8PWS9bh9wLEz7zhT7dW2c99C3C8J4va -IN5dzzO5GJiRfYABPvWPyuea/e8ab/wJSwDUMX0T4fCbe5neWE9voJpZamXMiAI6 -kaY+wJNKXT+TfJiJsu1Cw3yt19Lj5/4y+v7AD0cHF+G3l2BgWfNlHSaJZZ5DkQ2h -u33Nh6qecl8mpHSAgW+GdRZrbF7HMcLH4bbAS0G9Z61OGA9Q5a2+uimwLM2H1g4o -XokFMYmaLgM3to1cfjNbOaj/lWiFWoBDghLW4dXRSz2zYsnJpLQERiznlQQsaKc= -=a1xE +iQEcBAEBCAAGBQJRMeKRAAoJEEdUh39IaPFNOPAH/jgE00mEV6a8llFiguHgpM6Y +fNWRt64EgvKmo7x6e9KPeQcKvLRpulUnsVvlhVuchYB3FFdIHFtn8wVDCT5sOKFL +YBZ2eJQhPFs/USvD9sETXFxfWnqZfC2LcC8VX+5KnxmtiK3MMj/DBRXWcmsMXnrI +7/A2a6oww7L6rx47ybUhC57TM/r4rqAgNH4uTRZTYBe221/dgKbXULzCiWEvjCR5 +xMX/uVv7kAd8ylOsxSNnWJIMJOnLtMQE9zLGU3FChSC1CoVuxH9jdZM63d4qqZRT +ia4GstOZbdbB+4+KJX1qk5M30t3jI5kl45UeVka6elCaW1OPFCldT8GPePJaNrk= +=XrNS -----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.8+.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.8+.patch new file mode 100644 index 000000000000..80298c8ecf59 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.8+.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/447566 + +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -160,6 +160,7 @@ build_cflags() { + + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then + CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" ++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi" + CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated" + CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi" + elif [ "$ARCH" = "arm" ]; then +-- diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild index f32385bcd74d..2067966cb282 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild,v 1.4 2013/02/22 00:37:02 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild,v 1.5 2013/03/02 11:30:39 ssuominen Exp $ EAPI=5 @@ -157,7 +157,7 @@ src_prepare() { fi epatch "${FILESDIR}"/${PN}-313.18-builddir-config.patch - epatch "${FILESDIR}"/${PN}-313.18-linux-3.7+.patch #447566 + epatch "${FILESDIR}"/${PN}-313.18-linux-3.{7,8}+.patch #447566 # Allow user patches so they can support RC kernels and whatever else epatch_user |