diff options
author | Michele Noberasco <s4t4n@gentoo.org> | 2006-08-23 13:30:26 +0000 |
---|---|---|
committer | Michele Noberasco <s4t4n@gentoo.org> | 2006-08-23 13:30:26 +0000 |
commit | 85a6319451e9d85deb849c3b28cdc0c5891696a5 (patch) | |
tree | 24cbf0e456585ab3e7fdcc1488108e47b6ea88a1 /app-laptop/smcinit | |
parent | Version bump, with patch fo fix filenames issues. Wiped out previous version.... (diff) | |
download | historical-85a6319451e9d85deb849c3b28cdc0c5891696a5.tar.gz historical-85a6319451e9d85deb849c3b28cdc0c5891696a5.tar.bz2 historical-85a6319451e9d85deb849c3b28cdc0c5891696a5.zip |
Applied patch to fix bug #117368...
Package-Manager: portage-2.1-r2
Diffstat (limited to 'app-laptop/smcinit')
-rw-r--r-- | app-laptop/smcinit/ChangeLog | 7 | ||||
-rw-r--r-- | app-laptop/smcinit/Manifest | 30 | ||||
-rw-r--r-- | app-laptop/smcinit/files/digest-smcinit-0.4 | 2 | ||||
-rw-r--r-- | app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch | 98 | ||||
-rw-r--r-- | app-laptop/smcinit/smcinit-0.4.ebuild | 19 |
5 files changed, 147 insertions, 9 deletions
diff --git a/app-laptop/smcinit/ChangeLog b/app-laptop/smcinit/ChangeLog index 3a4a87d94cac..84496fd78777 100644 --- a/app-laptop/smcinit/ChangeLog +++ b/app-laptop/smcinit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-laptop/smcinit # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/ChangeLog,v 1.3 2005/01/01 14:48:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/ChangeLog,v 1.4 2006/08/23 13:30:26 s4t4n Exp $ + + 23 Aug 2006; Michele Noberasco <s4t4n@gentoo.org> smcinit-0.4.ebuild: + Applied patch to fix long standing bug #117368. Since it the issue is + about package compilation, I applied the patch to current version instead + of creating a new revision. Hence, the package is back into ~arch. 24 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> smcinit-0.4.ebuild: Stable for x86. diff --git a/app-laptop/smcinit/Manifest b/app-laptop/smcinit/Manifest index 34b932c914ff..5f4c943113f1 100644 --- a/app-laptop/smcinit/Manifest +++ b/app-laptop/smcinit/Manifest @@ -1,6 +1,28 @@ -MD5 8f7ec347b0c095e12a6f564cac709149 ChangeLog 437 -MD5 43d8098cf6b1c18339b5f3934dcdf9c4 metadata.xml 253 -MD5 3864ab4aa8cfbd7622c71cf7581c700d smcinit-0.4.ebuild 1151 -MD5 1072e90faa308622db9c695519cf5e9e files/digest-smcinit-0.4 64 +AUX smcinit-0.4-pciutils-2.2.0.patch 3332 RMD160 a7a6e88cdd2910fab771ad78da53cc5ab6502c0b SHA1 6a55c3b8c16cc69d1e9c9c58d91a04106bbee737 SHA256 a1298b66a3f82bda755fd5cb54be6be47766d449fb0aa20523e93352fa84d511 +MD5 70a868df0d71a5ff037542e52af92595 files/smcinit-0.4-pciutils-2.2.0.patch 3332 +RMD160 a7a6e88cdd2910fab771ad78da53cc5ab6502c0b files/smcinit-0.4-pciutils-2.2.0.patch 3332 +SHA256 a1298b66a3f82bda755fd5cb54be6be47766d449fb0aa20523e93352fa84d511 files/smcinit-0.4-pciutils-2.2.0.patch 3332 +AUX smcinit.conf 192 RMD160 60a36a6442d46f2f5daf9e2f6a5815771d41265c SHA1 22f26ea64ee2f21c3781ea46e463eddbe82b1519 SHA256 1cdfac229b1ad3a5d3224f625f81fe0c2f08390992ff84bc77ce98116bb66217 MD5 3254e176790847fc2528b4713e625a82 files/smcinit.conf 192 +RMD160 60a36a6442d46f2f5daf9e2f6a5815771d41265c files/smcinit.conf 192 +SHA256 1cdfac229b1ad3a5d3224f625f81fe0c2f08390992ff84bc77ce98116bb66217 files/smcinit.conf 192 +AUX smcinit.initscript 693 RMD160 c21f3a396a7316d81117da1f4554659945548051 SHA1 f4a61250141877abeaaba926ac7f1fcb2a3b80ac SHA256 2f24cb951736351c221c2c01005eb71950ac55c03a76a00d4f8afbd49650e249 MD5 78b68ef7f4de4826ce614b19fa2228e5 files/smcinit.initscript 693 +RMD160 c21f3a396a7316d81117da1f4554659945548051 files/smcinit.initscript 693 +SHA256 2f24cb951736351c221c2c01005eb71950ac55c03a76a00d4f8afbd49650e249 files/smcinit.initscript 693 +DIST smcinit-0.4-1.tar.gz 32343 RMD160 184289babfbadc1bd93daefa37fb0db1654bac4e SHA1 e777844050d904db1e25081b1cf5e694f579ba60 SHA256 403b4c1e5fedf113f97f6ce0beccac43b6e17c53a8e04d159022138b33810032 +EBUILD smcinit-0.4.ebuild 1324 RMD160 bdc627cdf8170bd16db6c782ca53e166ef9646ea SHA1 b539c15813134c8188d6a013ce79a0cb7722e70f SHA256 19340bf0a09ccb3a331c7c9bce4c676eff7fe308961a5dd52b1ccc13ab5a009e +MD5 ad8c7503bf326fc30e0eff093ebafbdd smcinit-0.4.ebuild 1324 +RMD160 bdc627cdf8170bd16db6c782ca53e166ef9646ea smcinit-0.4.ebuild 1324 +SHA256 19340bf0a09ccb3a331c7c9bce4c676eff7fe308961a5dd52b1ccc13ab5a009e smcinit-0.4.ebuild 1324 +MISC ChangeLog 722 RMD160 3738808693e2490569e397342ca3a46073a2ae36 SHA1 04c3c64c5ab8d327e03d45980c6d1c9dd11f1b47 SHA256 4771d523069130d5a453090580670a34a7a195ddcb987a68b964138a675ff333 +MD5 250dc998afb615b5a060711e5d925596 ChangeLog 722 +RMD160 3738808693e2490569e397342ca3a46073a2ae36 ChangeLog 722 +SHA256 4771d523069130d5a453090580670a34a7a195ddcb987a68b964138a675ff333 ChangeLog 722 +MISC metadata.xml 253 RMD160 335a23cb4d2aea71dee602c0ca2c3115a75ae848 SHA1 14b9340fa03a497144331e26d79bbed3ac7b60de SHA256 6e3e64388cc45be370a002b6ac4f0d7b403b16a749388e991ca9a434883b816d +MD5 43d8098cf6b1c18339b5f3934dcdf9c4 metadata.xml 253 +RMD160 335a23cb4d2aea71dee602c0ca2c3115a75ae848 metadata.xml 253 +SHA256 6e3e64388cc45be370a002b6ac4f0d7b403b16a749388e991ca9a434883b816d metadata.xml 253 +MD5 5a669e980f6abd3a35ddd3fc8df9480b files/digest-smcinit-0.4 238 +RMD160 7e1e46978b871261a3d3634f8f58ca2144f63736 files/digest-smcinit-0.4 238 +SHA256 48c43cc7fffdbd44b194d1d8c77d84dfd0767bc8e2bd649b59e2b697050b83e3 files/digest-smcinit-0.4 238 diff --git a/app-laptop/smcinit/files/digest-smcinit-0.4 b/app-laptop/smcinit/files/digest-smcinit-0.4 index 9f224b041d86..66d9d1e2dd50 100644 --- a/app-laptop/smcinit/files/digest-smcinit-0.4 +++ b/app-laptop/smcinit/files/digest-smcinit-0.4 @@ -1 +1,3 @@ MD5 a1f1107d6bfd3a6f75c8da268e1c809e smcinit-0.4-1.tar.gz 32343 +RMD160 184289babfbadc1bd93daefa37fb0db1654bac4e smcinit-0.4-1.tar.gz 32343 +SHA256 403b4c1e5fedf113f97f6ce0beccac43b6e17c53a8e04d159022138b33810032 smcinit-0.4-1.tar.gz 32343 diff --git a/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch b/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch new file mode 100644 index 000000000000..52d6086d4d3f --- /dev/null +++ b/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch @@ -0,0 +1,98 @@ +diff -uprN smcinit-0.4-1/smcinit.c smcinit-0.4-1-r1/smcinit.c +--- smcinit-0.4-1/smcinit.c 2004-04-20 21:56:41.000000000 +0200 ++++ smcinit-0.4-1-r1/smcinit.c 2006-01-01 18:37:40.000000000 +0100 +@@ -173,7 +173,7 @@ int set_smc(int sir_io, int fir_io, int + /* setpci.c */ + struct pci_access *acc; + struct pci_dev *dev; +- word twobyte; ++ u16 twobyte; + int i = 0; + int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma; + +@@ -188,7 +188,7 @@ int set_smc(int sir_io, int fir_io, int + } + acc = pci_alloc(); + pci_init(acc); +- dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC); /* 5100 also dev 1f */ ++ dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC); /* 5100 also dev 1f */ + twobyte = pci_read_word(dev, VID); + if (twobyte != 0x8086) { + fprintf(stderr, "%s IO hub vendor %x not intel (0x8086)\n", PROGNAME, twobyte); +diff -uprN smcinit-0.4-1/tosh1800-smcinit.c smcinit-0.4-1-r1/tosh1800-smcinit.c +--- smcinit-0.4-1/tosh1800-smcinit.c 2004-04-20 21:56:41.000000000 +0200 ++++ smcinit-0.4-1-r1/tosh1800-smcinit.c 2006-01-01 18:37:40.000000000 +0100 +@@ -75,8 +75,8 @@ static int _debug = 0; + */ + struct port_decoding_access_info { + int port; +- byte reg; +- byte or_mask; ++ u8 reg; ++ u8 or_mask; + }; + + struct port_decoding_access_info ali1533_ports[] = { +@@ -122,7 +122,7 @@ configure_47N227_smc_ircc(int revision, + + struct smc_chip_model { + char *name; +- byte version_id; ++ u8 version_id; + int (*config_function) (int revision, int cfgbase, int sirbase, + int firbase, int dma, int irq); + }; +@@ -279,7 +279,7 @@ static int find_ali1533_port_access_info + static int print_ali1533_port_status(struct pci_dev *dev) + { + struct port_decoding_access_info *p; +- byte onebyte; ++ u8 onebyte; + int i; + + DEBUG("printing port status"); +@@ -305,7 +305,7 @@ static int print_ali1533_port_status(str + static int set_ali1533_port(struct pci_dev *dev, int port, int decode) + { + struct port_decoding_access_info info; +- byte previousval, onebyte, and_mask; ++ u8 previousval, onebyte, and_mask; + int retval; + + DEBUG_VAL("looking for port", port); +@@ -427,7 +427,7 @@ static int configure_ali1533_smc_ports_d + + static int configure_47N227_smc_ircc(int revision, int cfgbase, int sirbase, int firbase, int dma, int irq) + { +- byte onebyte; ++ u8 onebyte; + int retval; + + /* claudiuc: revision is not used yet */ +@@ -526,7 +526,7 @@ static struct smc_chip_model *find_smc_c + static int + configure_smc_ircc(int cfgbase, int sirbase, int firbase, int dma, int irq) + { +- byte version_id, revision_id; ++ u8 version_id, revision_id; + struct smc_chip_model *chip_model; + int retval; + +diff -uprN smcinit-0.4-1/tosh2450-smcinit.c smcinit-0.4-1-r1/tosh2450-smcinit.c +--- smcinit-0.4-1/tosh2450-smcinit.c 2004-04-20 21:56:41.000000000 +0200 ++++ smcinit-0.4-1-r1/tosh2450-smcinit.c 2006-01-01 18:37:40.000000000 +0100 +@@ -58,12 +58,12 @@ int main() + /* setpci.c */ + struct pci_access *acc; + struct pci_dev *dev; +- word twobyte; ++ u16 twobyte; + + acc = pci_alloc(); + pci_init(acc); + +- dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC); ++ dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC); + + twobyte = pci_read_word(dev,VID); + if (twobyte != INTEL_VID){ diff --git a/app-laptop/smcinit/smcinit-0.4.ebuild b/app-laptop/smcinit/smcinit-0.4.ebuild index 4ffe7c26e2c2..8bb78ea60f66 100644 --- a/app-laptop/smcinit/smcinit-0.4.ebuild +++ b/app-laptop/smcinit/smcinit-0.4.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/smcinit-0.4.ebuild,v 1.3 2005/01/01 14:48:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/smcinit-0.4.ebuild,v 1.4 2006/08/23 13:30:26 s4t4n Exp $ + +inherit eutils IUSE="" @@ -13,12 +15,21 @@ SRC_URI="mirror://sourceforge/irda/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86" +KEYWORDS="~x86" -DEPEND=">=sys-apps/pciutils-2.1.11-r1" +DEPEND=">=sys-apps/pciutils-2.2.0-r1" S=${WORKDIR}/${MY_P} +src_unpack() +{ + unpack ${A} + cd ${S} + + #Patch for bug #117368 - compilation issues with new pciutils versions... + epatch ${FILESDIR}/${P}-pciutils-2.2.0.patch +} + src_compile() { econf || die "Configuration failed" |