Revision: 5311 Author: pebender Date: Sun Aug 16 12:46:41 2009 Log: - Patched system/lirc to compile against latest 2.6.31 kernel.
http://code.google.com/p/minimyth/source/detail?r=5311 Added: /trunk/gar-minimyth/script/system/lirc/files/lirc-20090806Z-lirc_i2c_fix.patch Modified: /trunk/gar-minimyth/script/system/lirc/Makefile /trunk/gar-minimyth/script/system/lirc/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/system/lirc/files/lirc-20090806Z-lirc_i2c_fix.patch Sun Aug 16 12:46:41 2009 @@ -0,0 +1,45 @@ +diff -Naur lirc-20090806Z-old/drivers/lirc_i2c/lirc_i2c.c lirc-20090806Z-new/drivers/lirc_i2c/lirc_i2c.c +--- lirc-20090806Z-old/drivers/lirc_i2c/lirc_i2c.c 2009-08-04 17:31:10.000000000 -0700 ++++ lirc-20090806Z-new/drivers/lirc_i2c/lirc_i2c.c 2009-08-16 11:50:42.000000000 -0700 +@@ -380,6 +380,20 @@ + static int ir_remove(struct i2c_client *client); + static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) ++static struct i2c_client client_template = { ++ .name = "unset", ++ .driver = &driver ++}; ++#else ++static const struct i2c_device_id ir_receiver_id[] = { ++ /* Generic entry for any IR receiver */ ++ { "ir_video", 0 }, ++ /* IR device specific entries could be added here */ ++ { } ++}; ++#endif ++ + static struct i2c_driver driver = { + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) + .name = "i2c ir driver", +@@ -403,20 +417,6 @@ + }; + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) +-static struct i2c_client client_template = { +- .name = "unset", +- .driver = &driver +-}; +-#else +-static const struct i2c_device_id ir_receiver_id[] = { +- /* Generic entry for any IR receiver */ +- { "ir_video", 0 }, +- /* IR device specific entries could be added here */ +- { } +-}; +-#endif +- +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + static int ir_attach(struct i2c_adapter *adap, int addr, + unsigned short flags, int kind) + #else ======================================= --- /trunk/gar-minimyth/script/system/lirc/Makefile Thu Aug 6 10:50:00 2009 +++ /trunk/gar-minimyth/script/system/lirc/Makefile Sun Aug 16 12:46:41 2009 @@ -5,7 +5,7 @@ #MASTER_SITES = http://www.lirc.org/software/snapshots/ MASTER_SITES = cvs://anonym...@$(GARNAME).cvs.sourceforge.net:/cvsroot/$(GARNAME)/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = $(DISTNAME)-no_python.patch $(DISTNAME)-remove_smp_unsafe_drivers.patch $(DISTNAME)-input_map.patch.gar +PATCHFILES = $(DISTNAME)-lirc_i2c_fix.patch $(DISTNAME)-no_python.patch $(DISTNAME)-remove_smp_unsafe_drivers.patch $(DISTNAME)-input_map.patch.gar LICENSE = GPL2 DESCRIPTION = ======================================= --- /trunk/gar-minimyth/script/system/lirc/checksums Thu Aug 6 10:50:00 2009 +++ /trunk/gar-minimyth/script/system/lirc/checksums Sun Aug 16 12:46:41 2009 @@ -1,3 +1,4 @@ +b5f9cd47d646d0f7667321e61f186614 download/lirc-20090806Z-lirc_i2c_fix.patch eb07b2bdd0d253415a3ded573ea708a0 download/lirc-20090806Z-no_python.patch f172b1d3491d6753110c624a4301212c download/lirc-20090806Z-remove_smp_unsafe_drivers.patch 7669f3866c4a205cf1301c976b910233 download/lirc-20090806Z-input_map.patch.gar --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
