From: Matthias Schwarzott Date: Wed, 21 Jun 2006 16:15:40 +0000 (+0000) Subject: Make it compile with Kernel 2.6.17, solving Bug #137409. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=330a0c9d6bc346342c546e1262552d9bf416609d;p=gentoo.git Make it compile with Kernel 2.6.17, solving Bug #137409. Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index 8736bf7b5716..9888849ac0af 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/lirc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.90 2006/06/07 05:38:46 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.91 2006/06/21 16:15:40 zzam Exp $ + + 21 Jun 2006; Matthias Schwarzott + +files/lirc-0.8.0-kernel-2.6.17.diff, lirc-0.8.0.ebuild, + lirc-0.8.0-r1.ebuild: + Make it compile with Kernel 2.6.17, solving Bug #137409. 07 Jun 2006; Markus Rothe lirc-0.8.0-r1.ebuild: Added ~ppc64; bug #131306 diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest index d550d617e06a..ef130fac74b6 100644 --- a/app-misc/lirc/Manifest +++ b/app-misc/lirc/Manifest @@ -1,17 +1,83 @@ -MD5 93e1ac339a03613f41d8ab501c617633 ChangeLog 13480 -MD5 bfecfbeecdd08e81210869ceb2a5eaf0 files/digest-lirc-0.7.0-r1 756 -MD5 81b607d1f2d95840cd2e98bf732d1a86 files/digest-lirc-0.7.2 235 -MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0 235 -MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r1 235 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX lirc-0.8.0-imon-pad2keys.patch 8304 RMD160 0634e8a61bb26d01b8ab860d33873842d320b7b9 SHA1 24c0d2f687250e489d0d9d8d649e7d340fb71a55 SHA256 ea6e28ca5af7226410d9ccf544bf476593fafed88aa38dffabd71bf9b843038d MD5 d8a7ab1e0afcc759b946010dfe76d2a0 files/lirc-0.8.0-imon-pad2keys.patch 8304 +RMD160 0634e8a61bb26d01b8ab860d33873842d320b7b9 files/lirc-0.8.0-imon-pad2keys.patch 8304 +SHA256 ea6e28ca5af7226410d9ccf544bf476593fafed88aa38dffabd71bf9b843038d files/lirc-0.8.0-imon-pad2keys.patch 8304 +AUX lirc-0.8.0-kernel-2.6.16.diff 5356 RMD160 c09a2476bf1914b2673cfb73a2ca127b5af20ed3 SHA1 0fdabbd70e3aaca995847f456320037e9220f324 SHA256 47fe2f6220b6cdf38cd34d89d0eedabda302bcea644d0e007588a6d3d136446e MD5 ffd478e500c79b4be37d4f46641ec2a6 files/lirc-0.8.0-kernel-2.6.16.diff 5356 +RMD160 c09a2476bf1914b2673cfb73a2ca127b5af20ed3 files/lirc-0.8.0-kernel-2.6.16.diff 5356 +SHA256 47fe2f6220b6cdf38cd34d89d0eedabda302bcea644d0e007588a6d3d136446e files/lirc-0.8.0-kernel-2.6.16.diff 5356 +AUX lirc-0.8.0-kernel-2.6.17.diff 1366 RMD160 3abd480bcdce6e2c2f08ecff7fff4ae34b90b0f7 SHA1 5ec5988cc6dd9c5d51a701924a0add90f110af7f SHA256 f74901c68fd93c218a8d2b8525e7c54b7f048b92d242444bf5a07dde2fd893c8 +MD5 108098963624de91a2282a9f278c8c9d files/lirc-0.8.0-kernel-2.6.17.diff 1366 +RMD160 3abd480bcdce6e2c2f08ecff7fff4ae34b90b0f7 files/lirc-0.8.0-kernel-2.6.17.diff 1366 +SHA256 f74901c68fd93c218a8d2b8525e7c54b7f048b92d242444bf5a07dde2fd893c8 files/lirc-0.8.0-kernel-2.6.17.diff 1366 +AUX lirc-0.8.0pre4-xbox-remote.diff 7632 RMD160 5eb2095df76136270e827c686671c94304d4820d SHA1 6c158eb3b95c7237e657726dbe3db2fc19a87b88 SHA256 0cd73451b1310ca6abd377d4098e7bb6f18555d176cf11aab992766f6e3fc0ec MD5 2a27a2540f0a87847d932f1651cd2e86 files/lirc-0.8.0pre4-xbox-remote.diff 7632 +RMD160 5eb2095df76136270e827c686671c94304d4820d files/lirc-0.8.0pre4-xbox-remote.diff 7632 +SHA256 0cd73451b1310ca6abd377d4098e7bb6f18555d176cf11aab992766f6e3fc0ec files/lirc-0.8.0pre4-xbox-remote.diff 7632 +AUX lircd 450 RMD160 73cf3057f420632e90e80eeb30e79cdbb3390b5d SHA1 e43d500a672bf89b7dc5e6bdedc9ed8e90dac3b3 SHA256 a9d6d2cc0abd0efe3267c1477fac012378e63e26aa021cfce7a0e25b27f196df MD5 ab341c2bcfd5c4f94560dc256e32a70c files/lircd 450 +RMD160 73cf3057f420632e90e80eeb30e79cdbb3390b5d files/lircd 450 +SHA256 a9d6d2cc0abd0efe3267c1477fac012378e63e26aa021cfce7a0e25b27f196df files/lircd 450 +AUX lircd.conf 67 RMD160 9d6e579362e19b1ea2b04acd9b80e25bbfd3ba63 SHA1 81e3cdd5aa0c1d39cfe8986a3a0832ae8da251c8 SHA256 5bfdf541edea0df7a4c2d7d0ce1aec8b0122313645e0b0b7297b97e4ef4fad0e MD5 47d0c4ff9caf25dee3e01edea851c9c6 files/lircd.conf 67 +RMD160 9d6e579362e19b1ea2b04acd9b80e25bbfd3ba63 files/lircd.conf 67 +SHA256 5bfdf541edea0df7a4c2d7d0ce1aec8b0122313645e0b0b7297b97e4ef4fad0e files/lircd.conf 67 +AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7 MD5 54581835f791fe37a1285926c6d21b12 files/lircmd 466 +RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c files/lircmd 466 +SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7 files/lircmd 466 +AUX xbox-lircd.conf 784 RMD160 844b08d504f5afb996f900d3d225cc855fbf4884 SHA1 65c3b9c295bc8ab8f80077dd3a40b599d1a60ce3 SHA256 03979bd658ed4a5705c358a1278b1565dd10463ab6eb14fa8d25b3d98e645008 MD5 ee2b49c33fb3b2a65122cfc698d9e100 files/xbox-lircd.conf 784 +RMD160 844b08d504f5afb996f900d3d225cc855fbf4884 files/xbox-lircd.conf 784 +SHA256 03979bd658ed4a5705c358a1278b1565dd10463ab6eb14fa8d25b3d98e645008 files/xbox-lircd.conf 784 +DIST lirc-0.7.0-streamzap.patch.bz2 16868 RMD160 2a05ec128f0ef5364c335d1ab21f679c49bd7e4a SHA1 6578b8787623dc0267b4a90a5d63f89b1a2f5bb0 SHA256 6fff5f929018b78cb7e48244abbc2bcc914a78068d3f8ab008df7f8b9c251d90 +DIST lirc-0.7.0-xbox.patch.bz2 10512 RMD160 15ef2e36e781342903bdf6a2bee12e9175ed4a04 SHA1 1a534a6078d27a59a627211473f7b7ea505a9c21 SHA256 67ad1730a7c9c988835e39a2f85ee84c7ffa9ddc5bb174c182287a29521f01c6 +DIST lirc-0.7.0.tar.bz2 464270 RMD160 9ad6467766125642ea862c35900898ba824cea03 SHA1 8eecd1cb42e5e995d5df42ab598a3d2a3b7ab1e0 SHA256 236c1593d9da7c0af544dd456e426bd321f1261c08fa5768cb7290267a7b31bc +DIST lirc-0.7.2.tar.bz2 496627 RMD160 be686c26c1c407e161771a0267c23f81e4d7cbe4 SHA1 e494bc37f77f135549dcaa87ca4fe86ee43c84cf SHA256 d47f87019631fad8e7c774ea60341bcd62aa371e4828edb7a35866fc948fa56f +DIST lirc-0.8.0.tar.bz2 514359 RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c SHA1 e4016a038eb4fdc7a1a3b3ff599621e2b41d4b7c SHA256 cc8d7fb41a045278680ea530cffaf05181977f41244b9f0ed64075cd7630b5d2 +EBUILD lirc-0.7.0-r1.ebuild 4631 RMD160 98c340740f689ccc403ee1268dc0a6910e44bc54 SHA1 7f2ecbec27009cbdca5d5e6efd557bab3681a415 SHA256 680c97bb28088630f5895704c8e389968a4c7362afb99db69e4167c4b047dbbc MD5 40b73820fc026110d4fac87eb1aed53d lirc-0.7.0-r1.ebuild 4631 +RMD160 98c340740f689ccc403ee1268dc0a6910e44bc54 lirc-0.7.0-r1.ebuild 4631 +SHA256 680c97bb28088630f5895704c8e389968a4c7362afb99db69e4167c4b047dbbc lirc-0.7.0-r1.ebuild 4631 +EBUILD lirc-0.7.2.ebuild 4472 RMD160 c9fef11718083b8cb2358a224b506e027ae34dc2 SHA1 7623805370101c63a3fd1ae1f92c2a50a3093cfd SHA256 a4edfe95537b344e988525e50ef64c918299618ab8b150b7690c537f28482bd1 MD5 cb4d1fc7278b7357a6ca6aee2b1adc1c lirc-0.7.2.ebuild 4472 -MD5 f722a50daae23a2393f568aea90836c4 lirc-0.8.0-r1.ebuild 6702 -MD5 4a33acb90d00d9ea6d84d615956153bf lirc-0.8.0.ebuild 4591 +RMD160 c9fef11718083b8cb2358a224b506e027ae34dc2 lirc-0.7.2.ebuild 4472 +SHA256 a4edfe95537b344e988525e50ef64c918299618ab8b150b7690c537f28482bd1 lirc-0.7.2.ebuild 4472 +EBUILD lirc-0.8.0-r1.ebuild 6743 RMD160 72aab41678810d192dd4cf629f3efec63c0e6a44 SHA1 d389986890fd65be4b067fdc2ae39214a251f895 SHA256 e56dca78e635acb65b90b4732f5df208b23002ba4bde394e7c3f894c294617be +MD5 4db38d253454d6ce049d0c2db751eaf0 lirc-0.8.0-r1.ebuild 6743 +RMD160 72aab41678810d192dd4cf629f3efec63c0e6a44 lirc-0.8.0-r1.ebuild 6743 +SHA256 e56dca78e635acb65b90b4732f5df208b23002ba4bde394e7c3f894c294617be lirc-0.8.0-r1.ebuild 6743 +EBUILD lirc-0.8.0.ebuild 4635 RMD160 09ac19f3e6bf39258c47a17add50703cc9d33ace SHA1 441fb323f3006ebba674e809463d5fd10f564ee5 SHA256 f334393e6c5df0955a3e78e2972ba233c22a387c751a24625381e424ef45907c +MD5 496ea6a6bebb3997af467d508086e3a9 lirc-0.8.0.ebuild 4635 +RMD160 09ac19f3e6bf39258c47a17add50703cc9d33ace lirc-0.8.0.ebuild 4635 +SHA256 f334393e6c5df0955a3e78e2972ba233c22a387c751a24625381e424ef45907c lirc-0.8.0.ebuild 4635 +MISC ChangeLog 13673 RMD160 927dad49488a0280fd792f1466c2bf40cba3a191 SHA1 a2c6065327a3efb4ca605d5638f57f81ca8b9b80 SHA256 f4a1ac8909e0710ba627d93bd3e271b80dfb762244266975b3a535df614cf68c +MD5 bbaaa6df0032e8fa41dafb0b6630fe26 ChangeLog 13673 +RMD160 927dad49488a0280fd792f1466c2bf40cba3a191 ChangeLog 13673 +SHA256 f4a1ac8909e0710ba627d93bd3e271b80dfb762244266975b3a535df614cf68c ChangeLog 13673 +MISC metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 SHA1 9fdd5da8466c39d7ff3b40412c4dfa77dd2446b7 SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32 MD5 abf8a9c4b96bc3bb50f04a48349dae34 metadata.xml 252 +RMD160 e1c170c221f61fa9787a04feac90fab777639d88 metadata.xml 252 +SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32 metadata.xml 252 +MD5 bfecfbeecdd08e81210869ceb2a5eaf0 files/digest-lirc-0.7.0-r1 756 +RMD160 a3242a5d948afbc357ab821fc493b918ecf3e4ae files/digest-lirc-0.7.0-r1 756 +SHA256 305b754b43fc7e728f0542be6183597407ff2d649a8865f90437912fe7bb2c66 files/digest-lirc-0.7.0-r1 756 +MD5 81b607d1f2d95840cd2e98bf732d1a86 files/digest-lirc-0.7.2 235 +RMD160 083c26fffb9bd32a76e93cce0f1aa432032cb28d files/digest-lirc-0.7.2 235 +SHA256 33a577aba2efcf46d48cf5addef58dc1406cadcb675c1197578a233522fe220c files/digest-lirc-0.7.2 235 +MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0 235 +RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0 235 +SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0 235 +MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r1 235 +RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r1 235 +SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r1 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEmXC3ZfSl1Kp5KmoRAjiGAJ9qWmb/4NRKseQPDIXx+KWGf/Hw9ACg4NqH +VkcR5oNgfTx4EPY/x87HpCs= +=XGEg +-----END PGP SIGNATURE----- diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff new file mode 100644 index 000000000000..c14728214213 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff @@ -0,0 +1,29 @@ +diff -ru lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c lirc-0.8.0-kernel-2.6.17/drivers/lirc_gpio/lirc_gpio.c +--- lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c 2006-01-01 14:43:46.000000000 +0100 ++++ lirc-0.8.0-kernel-2.6.17/drivers/lirc_gpio/lirc_gpio.c 2006-06-21 17:20:32.000000000 +0200 +@@ -48,9 +48,12 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) + #include "../drivers/char/bttv.h" + #include "../drivers/char/bttvp.h" +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) + #include "../drivers/media/video/bttv.h" + #include "../drivers/media/video/bttvp.h" ++#else ++#include "../drivers/media/video/bt8xx/bttv.h" ++#include "../drivers/media/video/bt8xx/bttvp.h" + #endif + + #if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45) +diff -ru lirc-0.8.0/drivers/Makefile.common lirc-0.8.0-kernel-2.6.17/drivers/Makefile.common +--- lirc-0.8.0/drivers/Makefile.common 2005-12-27 13:59:01.000000000 +0100 ++++ lirc-0.8.0-kernel-2.6.17/drivers/Makefile.common 2006-06-21 17:47:14.000000000 +0200 +@@ -10,7 +10,7 @@ + KBUILD_VERBOSE = 1 + LIRC_EXTRA_CFLAGS = -DIRCTL_DEV_MAJOR=$(lirc_major) -DEXPORT_SYMTAB $(DEFS) \ + $(DEFAULT_INCLUDES) -I$(LIRC_DEVDIR)/../.. \ +- -I$(KERNEL_LOCATION)/include/ ++ -I$(KERNEL_LOCATION)/include/ -Idrivers/media/video + export LIRC_EXTRA_CFLAGS KERNEL_LOCATION module_DATA + + $(module_DATA): $(automake_dummy_SOURCES) $(top_srcdir)/config.h ../lirc.h diff --git a/app-misc/lirc/lirc-0.8.0-r1.ebuild b/app-misc/lirc/lirc-0.8.0-r1.ebuild index 32a3d8a1866c..7565a5901a94 100644 --- a/app-misc/lirc/lirc-0.8.0-r1.ebuild +++ b/app-misc/lirc/lirc-0.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r1.ebuild,v 1.2 2006/06/07 05:38:46 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r1.ebuild,v 1.3 2006/06/21 16:15:40 zzam Exp $ inherit eutils linux-mod flag-o-matic autotools @@ -209,6 +209,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-kernel-2.6.16.diff + epatch ${FILESDIR}/${P}-kernel-2.6.17.diff use lirc_devices_xboxusb && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch diff --git a/app-misc/lirc/lirc-0.8.0.ebuild b/app-misc/lirc/lirc-0.8.0.ebuild index c0d5e27d5bf3..f8259ad0d753 100644 --- a/app-misc/lirc/lirc-0.8.0.ebuild +++ b/app-misc/lirc/lirc-0.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0.ebuild,v 1.8 2006/05/31 18:52:09 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0.ebuild,v 1.9 2006/06/21 16:15:40 zzam Exp $ inherit eutils linux-mod flag-o-matic autotools @@ -86,6 +86,7 @@ src_unpack() { cd ${S} #epatch ${FILESDIR}/lirc-0.7.0-xbox.patch.bz2 epatch ${FILESDIR}/${P}-kernel-2.6.16.diff + epatch ${FILESDIR}/${P}-kernel-2.6.17.diff filter-flags -Wl,-O1 sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in