From: Mike Frysinger Date: Tue, 20 Jun 2006 19:48:50 +0000 (+0000) Subject: Fix building with linux-2.6.17 #137234 by Ivan Yosifov. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44aa4a0171b69b3dea1466b86d44f903d62d4827;p=gentoo.git Fix building with linux-2.6.17 #137234 by Ivan Yosifov. Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 65ca42320252..b66b192e03f5 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.68 2006/06/04 09:50:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.69 2006/06/20 19:48:50 vapier Exp $ + + 20 Jun 2006; Mike Frysinger + files/svgalib-1.9.24-linux2.6.patch: + Fix building with linux-2.6.17 #137234 by Ivan Yosifov. 04 Jun 2006; Mike Frysinger +files/svgalib-1.9.24-all_devices.patch, svgalib-1.9.24.ebuild: diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index e294fabc077e..a63d191aa071 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX svgalib-1.9.19-dont-touch-ld.conf.patch 839 RMD160 d50daaa39423a6fc7b689752866f4cc29907fb03 SHA1 0a38cba929b1d4aca141ff97f630de6ea202a00f SHA256 95bb36a50d841c4cbfbc73560045ee8bf7dd784c9f0975ca1a9f3dc6616fd8ce MD5 22d45025a562c43872e5750a05dfa9df files/svgalib-1.9.19-dont-touch-ld.conf.patch 839 RMD160 d50daaa39423a6fc7b689752866f4cc29907fb03 files/svgalib-1.9.19-dont-touch-ld.conf.patch 839 @@ -22,10 +25,10 @@ AUX svgalib-1.9.24-all_devices.patch 386 RMD160 6750760283139e8cb247e6e1908a1d45 MD5 019300d0c270a3ee49fee6ab848b3a8f files/svgalib-1.9.24-all_devices.patch 386 RMD160 6750760283139e8cb247e6e1908a1d4582c272f6 files/svgalib-1.9.24-all_devices.patch 386 SHA256 62fc518361db69912ad21e24231d328060d4cec510f112f2e140841c70a00e5b files/svgalib-1.9.24-all_devices.patch 386 -AUX svgalib-1.9.24-linux2.6.patch 4107 RMD160 aa7df6a5badf5a184b88e29f4a61f90077162b5a SHA1 017e585ed67dff32de14a1045f7c2e1a86e7d4b2 SHA256 4085278e0a97bc08361644ad9cf84d92634f771ec5c2c2d380c47aaf894f6ea1 -MD5 815d1aa06e761db0217455f75c2193b8 files/svgalib-1.9.24-linux2.6.patch 4107 -RMD160 aa7df6a5badf5a184b88e29f4a61f90077162b5a files/svgalib-1.9.24-linux2.6.patch 4107 -SHA256 4085278e0a97bc08361644ad9cf84d92634f771ec5c2c2d380c47aaf894f6ea1 files/svgalib-1.9.24-linux2.6.patch 4107 +AUX svgalib-1.9.24-linux2.6.patch 4553 RMD160 16b3470b24595e781530cb0cafe0fc9f71511e90 SHA1 68a84e75301a24350ca504066bf2167f8b01cf49 SHA256 b17f37e1d5292dbe78d7c69d56931d7a496574de4e6cde8b4c7e8eca018678fd +MD5 5bb3810d9312da4bfdebd50a07038b10 files/svgalib-1.9.24-linux2.6.patch 4553 +RMD160 16b3470b24595e781530cb0cafe0fc9f71511e90 files/svgalib-1.9.24-linux2.6.patch 4553 +SHA256 b17f37e1d5292dbe78d7c69d56931d7a496574de4e6cde8b4c7e8eca018678fd files/svgalib-1.9.24-linux2.6.patch 4553 AUX svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b SHA1 c587ce84dff7f0e8f222660c004256b3b867d00a SHA256 3aa888f06d84d3ad49b9714986e43cad845082a1b2f6e06baa4637967920414a MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b files/svgalib.devfs 219 @@ -53,10 +56,10 @@ EBUILD svgalib-1.9.24.ebuild 4575 RMD160 8657b34aadc3578b1247bbc02203c13416fcdda MD5 35d7cfd6d4ec4a1159aeb62b2a0ae71d svgalib-1.9.24.ebuild 4575 RMD160 8657b34aadc3578b1247bbc02203c13416fcdda8 svgalib-1.9.24.ebuild 4575 SHA256 19205e1a5a6abd3907a9654845b712f74b9ff69b26a5dbeabe9a66001583c6fb svgalib-1.9.24.ebuild 4575 -MISC ChangeLog 12130 RMD160 c82b7f9aa11f03f7b7bf9a5898616a4261e2cc79 SHA1 8736a46475a39ba5874a78f6e92452d05263f792 SHA256 fef37b13a955499b9ad9c30e932a16b81240019e431f3c015121b315bf0720e7 -MD5 cdbbae8b75026f77732ea8c6985d1797 ChangeLog 12130 -RMD160 c82b7f9aa11f03f7b7bf9a5898616a4261e2cc79 ChangeLog 12130 -SHA256 fef37b13a955499b9ad9c30e932a16b81240019e431f3c015121b315bf0720e7 ChangeLog 12130 +MISC ChangeLog 12278 RMD160 eedabea8db46f3b7a2cf236c8061235e98d169f4 SHA1 54a1eb3fbbf55183566bafd9bdfcc67408cf36ce SHA256 140de38daa4a81f79044415e571b54d00661d7a8da86fa189def0314b78d5495 +MD5 b991c10687c1595af3f5056ddf8a076a ChangeLog 12278 +RMD160 eedabea8db46f3b7a2cf236c8061235e98d169f4 ChangeLog 12278 +SHA256 140de38daa4a81f79044415e571b54d00661d7a8da86fa189def0314b78d5495 ChangeLog 12278 MISC metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 SHA1 c273b6ce5b51e9d5690e54ae84982d9c2cf617d2 SHA256 08bfae407186f5088cd2b118396e784d8eaf7ab82ecc162cf8a73ff9cabcf717 MD5 69845288d94413820ea3441dc9e60b24 metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 metadata.xml 303 @@ -70,3 +73,10 @@ SHA256 21e4e7d135a165cf44a7e19100b6bd7ffd63a1e818e3ba150e984c36f6b67202 files/di MD5 2fade38f6280418b878fc9ec6425b611 files/digest-svgalib-1.9.24 244 RMD160 cb17655aaf1caf0ec167a2faaf38fb1e9ced5e83 files/digest-svgalib-1.9.24 244 SHA256 e9aeec91a16ef008173ec45162e2680a29fdabee914c2a516acc1da133a98c86 files/digest-svgalib-1.9.24 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEmFJTamhnQswr0vIRAiaQAJ0ZNC8QwMmgsAd4FZF/6IculY3J1QCZAWWo +N7q0gcq67hvJiu3a5nx47XU= +=cKQp +-----END PGP SIGNATURE----- diff --git a/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch index 6e07283ab646..4dfd6b3864c3 100644 --- a/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch @@ -2,6 +2,7 @@ - touch up the Makefile to let the ebuild handle the module details - fix support with io remap stuff in newer kernels - dont include headers that dont exist in 2.4.x kernels + - use module_param() for 2.6.x and MODULE_PARM() for all others --- svgalib/kernel/svgalib_helper/Makefile +++ svgalib/kernel/svgalib_helper/Makefile @@ -121,3 +122,21 @@ #define __KERNEL_SYSCALLS__ #include +@@ -770,10 +770,15 @@ + + } + ++#ifdef KERNEL_2_6 ++module_param(debug, int, 0); ++module_param(all_devices, int, 0); ++#else + MODULE_PARM(debug, "i"); +-MODULE_PARM_DESC(debug, "Debug output level."); +- + MODULE_PARM(all_devices, "i"); ++#endif ++ ++MODULE_PARM_DESC(debug, "Debug output level."); + MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class."); + +