diff options
author | 2006-12-11 22:44:56 +0000 | |
---|---|---|
committer | 2006-12-11 22:44:56 +0000 | |
commit | d842b952347055c4db0dc8e0e19cad2a2586ccb9 (patch) | |
tree | dace8004f056cd61ef6d10c56a3b7287bb58fae3 /app-misc | |
parent | dev-libs/serdisplib: Initial version of serdisplib. Thanks to Erik Wasser for... (diff) | |
download | jokey-d842b952347055c4db0dc8e0e19cad2a2586ccb9.tar.gz jokey-d842b952347055c4db0dc8e0e19cad2a2586ccb9.tar.bz2 jokey-d842b952347055c4db0dc8e0e19cad2a2586ccb9.zip |
Fixed compile bug with Kernel 2.6.19, added new serdisplib dependency, changed patch to work in tree CVS
svn path=/trunk/; revision=92
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/lcd4linux/Manifest | 20 | ||||
-rw-r--r-- | app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch | 34 | ||||
-rw-r--r-- | app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch | 13 | ||||
-rw-r--r-- | app-misc/lcd4linux/lcd4linux-0.10.0.ebuild | 11 |
4 files changed, 32 insertions, 46 deletions
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest index 2cd60f5..54b8c15 100644 --- a/app-misc/lcd4linux/Manifest +++ b/app-misc/lcd4linux/Manifest @@ -1,12 +1,16 @@ -AUX lcd4linux-0.10.0-gcc4-compat.patch 2340 RMD160 950c6136274023768254a2c4f99eb81ad3151052 SHA1 458de2a09d4a7d0e4caa7a88d6af43d2cc6b3e8d SHA256 0d895a2e0e1b79936047763f5b44c532034e17249a7d2ad599fde8d60bec75d3 -MD5 14eda3a02aa51ce2db5e016cc565a7a3 files/lcd4linux-0.10.0-gcc4-compat.patch 2340 -RMD160 950c6136274023768254a2c4f99eb81ad3151052 files/lcd4linux-0.10.0-gcc4-compat.patch 2340 -SHA256 0d895a2e0e1b79936047763f5b44c532034e17249a7d2ad599fde8d60bec75d3 files/lcd4linux-0.10.0-gcc4-compat.patch 2340 +AUX lcd4linux-0.10.0-gcc4-compat.patch 1062 RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e SHA1 00486e55acb1c7e8bf223ec812cd41f90463f5fe SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a +MD5 ee1bd63f943879b8a0d38273fc12922d files/lcd4linux-0.10.0-gcc4-compat.patch 1062 +RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e files/lcd4linux-0.10.0-gcc4-compat.patch 1062 +SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a files/lcd4linux-0.10.0-gcc4-compat.patch 1062 +AUX lcd4linux-0.10.0-kernel2.6.19.patch 412 RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea SHA1 fc50cc9e2a20beb18a43aa37959cb84566595ca7 SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48 +MD5 caf89e4008f3326f1b5528e2ca4752fb files/lcd4linux-0.10.0-kernel2.6.19.patch 412 +RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea files/lcd4linux-0.10.0-kernel2.6.19.patch 412 +SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48 files/lcd4linux-0.10.0-kernel2.6.19.patch 412 DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909 -EBUILD lcd4linux-0.10.0.ebuild 2860 RMD160 9000e2422ed9b1cb2c69c5b53d9cf78dfcb2574b SHA1 67d8edcd3a92d42f20c04fe0e740681f8c24a701 SHA256 cb4c0e46d5d322a4e2284a1fe3ff7234b0c10677a0a6523d2f9b30c8daa83495 -MD5 fe42a836ba0a86165098c0093c25f4c9 lcd4linux-0.10.0.ebuild 2860 -RMD160 9000e2422ed9b1cb2c69c5b53d9cf78dfcb2574b lcd4linux-0.10.0.ebuild 2860 -SHA256 cb4c0e46d5d322a4e2284a1fe3ff7234b0c10677a0a6523d2f9b30c8daa83495 lcd4linux-0.10.0.ebuild 2860 +EBUILD lcd4linux-0.10.0.ebuild 3004 RMD160 b354c31ac64ea27381f46a2cd9fa43d61c463a42 SHA1 5d409a40d900f311828a5dfcf1ee4a2ecf9b3326 SHA256 29130adbae0c7c68cbc8ec283a4b1d6c1515f418f3a10b8cc0176e60680a6baf +MD5 cdee33b4b4a0a5ec8ebe8c7efc53f9eb lcd4linux-0.10.0.ebuild 3004 +RMD160 b354c31ac64ea27381f46a2cd9fa43d61c463a42 lcd4linux-0.10.0.ebuild 3004 +SHA256 29130adbae0c7c68cbc8ec283a4b1d6c1515f418f3a10b8cc0176e60680a6baf lcd4linux-0.10.0.ebuild 3004 MD5 0b746369033d8d0fffea2ec67f83ad4e files/digest-lcd4linux-0.10.0 250 RMD160 018c8b34815a32a9902122a5e67b6acbc2e3e41a files/digest-lcd4linux-0.10.0 250 SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/digest-lcd4linux-0.10.0 250 diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch index f5e3f6c..1149ae6 100644 --- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch +++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch @@ -3,23 +3,6 @@ Patch from upstream SVN --- /trunk/drv_SimpleLCD.c (revision 547) +++ /trunk/drv_SimpleLCD.c (revision 581) -@@ -1,3 +1,3 @@ --/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $ -+/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $ - * - * driver for a simple serial terminal. -@@ -23,4 +23,7 @@ - * - * $Log: lcd4linux-0.10.0-gcc4-compat.patch,v $ - * Revision 1.1 2006/12/06 11:31:16 jokey - * Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update - * (Portage version: 2.1.2_rc2-r5) - * -+ * Revision 1.5 2005/07/06 04:40:18 reinelt -+ * GCC-4 fixes -+ * - * Revision 1.4 2005/05/08 04:32:44 reinelt - * CodingStyle added and applied @@ -199,4 +202,5 @@ { int rows = -1, cols = -1; @@ -42,23 +25,6 @@ Index: /trunk/lcd4linux_i2c.h =================================================================== --- /trunk/lcd4linux_i2c.h (revision 562) +++ /trunk/lcd4linux_i2c.h (revision 581) -@@ -1,3 +1,3 @@ --/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $ -+/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $ - * - * user space i2c sturctures and defines, taken from the official kernel i2c -@@ -33,4 +33,7 @@ - * - * $Log: lcd4linux-0.10.0-gcc4-compat.patch,v $ - * Revision 1.1 2006/12/06 11:31:16 jokey - * Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update - * (Portage version: 2.1.2_rc2-r5) - * -+ * Revision 1.3 2005/07/06 04:40:18 reinelt -+ * GCC-4 fixes -+ * - * Revision 1.2 2005/06/01 12:09:13 reinelt - * removed ^M from lcd4linux_i2c.h; indent.sh run @@ -79,5 +82,5 @@ /* Transfer num messages. */ diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch new file mode 100644 index 0000000..9738014 --- /dev/null +++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch @@ -0,0 +1,13 @@ +patch by Guillaume Lecerf <foxcore@gmail.com> +see http://sourceforge.net/mailarchive/message.php?msg_id=37594448 + +--- lcd4linux-0.10.0.orig/plugin_wireless.c 2006-12-04 18:11:41.000000000 +0100 ++++ lcd4linux-0.10.0/plugin_wireless.c 2006-12-04 18:12:01.000000000 +0100 +@@ -92,6 +92,7 @@ + + #include <sys/ioctl.h> + #include <net/if_arp.h> ++#include <linux/if.h> + #include <linux/wireless.h> + #include <math.h> + diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild index f6318cb..4d686e0 100644 --- a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild +++ b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild @@ -12,12 +12,13 @@ LICENSE="GPL-2" SLOT="0" # contains x86 asm, upstream is working on a portable version KEYWORDS="~x86" -IUSE="kde png X usb mysql python" +IUSE="kde png serdisp X usb mysql python" DEPEND="png? ( media-libs/libpng media-libs/gd ) X? ( x11-libs/libX11 ) usb? ( dev-libs/libusb ) + serdisp? ( dev-libs/serdisplib ) mysql? ( virtual/mysql )" # python? ( dev-lang/python ) # mpd is needed soon @@ -32,6 +33,7 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/${P}-kernel2.6.19.patch" epatch "${FILESDIR}/${P}-gcc4-compat.patch" } @@ -61,9 +63,10 @@ src_compile() { einfo "Active drivers (overridden): ${myd}" else myd="all" - use usb || myd="${myd},!USBLCD" - use png || myd="${myd},!PNG" - use X || myd="${myd},!X11" + use serdisp || myd="${myd},!serdisplib" + use usb || myd="${myd},!USBLCD" + use png || myd="${myd},!PNG" + use X || myd="${myd},!X11" einfo "Active drivers: ${myd}" fi |