add gcc4 fixes, remove the NEC FC20X2JA driver patch from lcd4linux temporary

SVN-Revision: 3066
2024-10-07 11:41:21 +02:00 · 2006-01-29 20:02:22 +00:00 · 2006-01-29 20:02:22 +00:00 · dd8eae04cc
commit dd8eae04cc
parent 6d4eab2a9d
9 changed files with 278 additions and 440 deletions
--- a/openwrt/package/cyrus-sasl/patches/cyrus-sasl-2.1.20-gcc4.patch
+++ b/openwrt/package/cyrus-sasl/patches/cyrus-sasl-2.1.20-gcc4.patch
@ -0,0 +1,11 @@
+--- cyrus-sasl-2.1.20/lib/client.c~	2003-11-11 11:26:06.000000000 -0500
+++ cyrus-sasl-2.1.20/lib/client.c	2005-05-31 22:34:14.000000000 -0400
+@@ -61,7 +61,7 @@
+ 
+ static cmech_list_t *cmechlist; /* global var which holds the list */
+ 
+-static sasl_global_callbacks_t global_callbacks;
+sasl_global_callbacks_t global_callbacks;
+ 
+ static int _sasl_client_active = 0;
+ 
--- a/openwrt/package/ebtables/patches/ebtables-2.0.6-gcc4.patch
+++ b/openwrt/package/ebtables/patches/ebtables-2.0.6-gcc4.patch
@ -0,0 +1,116 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../ebtables/gcc4.patch
+# Copyright (C) 2004 - 2005 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+diff -Nur ebtables-v2.0.6.orig/extensions/ebt_ip.c ebtables-v2.0.6/extensions/ebt_ip.c
+--- ebtables-v2.0.6.orig/extensions/ebt_ip.c	2003-11-02 20:22:56.000000000 +0200
+++ ebtables-v2.0.6/extensions/ebt_ip.c	2005-11-01 18:48:56.000000000 +0200
+@@ -244,6 +244,7 @@
+ 	struct ebt_ip_info *ipinfo = (struct ebt_ip_info *)(*match)->data;
+ 	char *end;
+ 	long int i;
+	unsigned char j;
+ 
+ 	switch (c) {
+ 	case IP_SOURCE:
+@@ -313,7 +314,7 @@
+ 			ipinfo->invflags |= EBT_IP_PROTO;
+ 		if (optind > argc)
+ 			print_error("Missing IP protocol argument");
+-		(unsigned char) i = strtoul(argv[optind - 1], &end, 10);
+		j = strtoul(argv[optind - 1], &end, 10);
+ 		if (*end != '\0') {
+ 			struct protoent *pe;
+ 
+@@ -324,7 +325,7 @@
+ 				     argv[optind - 1]);
+ 			ipinfo->protocol = pe->p_proto;
+ 		} else {
+-			ipinfo->protocol = (unsigned char) i;
+			ipinfo->protocol = j;
+ 		}
+ 		ipinfo->bitmask |= EBT_IP_PROTO;
+ 		break;
+diff -Nur ebtables-v2.0.6.orig/extensions/ebt_limit.c ebtables-v2.0.6/extensions/ebt_limit.c
+--- ebtables-v2.0.6.orig/extensions/ebt_limit.c	2003-11-02 20:22:56.000000000 +0200
+++ ebtables-v2.0.6/extensions/ebt_limit.c	2005-11-01 18:48:56.000000000 +0200
+@@ -203,15 +203,15 @@
+ 
+ static struct ebt_u_match limit_match =
+ {
+-	.name		EBT_LIMIT_MATCH,
+-	.size		sizeof(struct ebt_limit_info),
+-	.help		print_help,
+-	.init		init,
+-	.parse		parse,
+-	.final_check	final_check,
+-	.print		print,
+-	.compare	compare,
+-	.extra_ops	opts,
+	.name	=	EBT_LIMIT_MATCH,
+	.size	=	sizeof(struct ebt_limit_info),
+	.help	=	print_help,
+	.init	=	init,
+	.parse	=	parse,
+	.final_check =	final_check,
+	.print	=	print,
+	.compare =	compare,
+	.extra_ops =	opts,
+ };
+ 
+ static void _init(void) __attribute((constructor));
+diff -Nur ebtables-v2.0.6.orig/extensions/ebt_vlan.c ebtables-v2.0.6/extensions/ebt_vlan.c
+--- ebtables-v2.0.6.orig/extensions/ebt_vlan.c	2003-11-02 20:22:56.000000000 +0200
+++ ebtables-v2.0.6/extensions/ebt_vlan.c	2005-11-01 18:48:56.000000000 +0200
+@@ -135,14 +135,16 @@
+ 	    (struct ebt_vlan_info *) (*match)->data;
+ 	char *end;
+ 	struct ebt_vlan_info local;
+	unsigned short id, encap;
+	unsigned char prio;
+ 
+ 	switch (c) {
+ 	case VLAN_ID:
+ 		check_option(flags, OPT_VLAN_ID);
+ 		CHECK_INV_FLAG(EBT_VLAN_ID);
+ 		CHECK_IF_MISSING_VALUE;
+-		(unsigned short) local.id =
+-		    strtoul(argv[optind - 1], &end, 10);
+		id = strtoul(argv[optind - 1], &end, 10);
+		local.id = (uint16_t) id;
+ 		CHECK_RANGE(local.id > 4094 || *end != '\0');
+ 		vlaninfo->id = local.id;
+ 		SET_BITMASK(EBT_VLAN_ID);
+@@ -152,8 +154,8 @@
+ 		check_option(flags, OPT_VLAN_PRIO);
+ 		CHECK_INV_FLAG(EBT_VLAN_PRIO);
+ 		CHECK_IF_MISSING_VALUE;
+-		(unsigned char) local.prio =
+-		    strtoul(argv[optind - 1], &end, 10);
+		prio = strtoul(argv[optind - 1], &end, 10);
+		local.prio = (uint8_t) prio;
+ 		CHECK_RANGE(local.prio >= 8 || *end != '\0');
+ 		vlaninfo->prio = local.prio;
+ 		SET_BITMASK(EBT_VLAN_PRIO);
+@@ -163,8 +165,8 @@
+ 		check_option(flags, OPT_VLAN_ENCAP);
+ 		CHECK_INV_FLAG(EBT_VLAN_ENCAP);
+ 		CHECK_IF_MISSING_VALUE;
+-		(unsigned short) local.encap =
+-		    strtoul(argv[optind - 1], &end, 16);
+		encap = strtoul(argv[optind - 1], &end, 16);
+		local.encap = (uint16_t) encap;
+ 		if (*end != '\0') {
+ 			ethent = getethertypebyname(argv[optind - 1]);
+ 			if (ethent == NULL)
--- a/openwrt/package/l2tpd/patches/04-gcc4.patch
+++ b/openwrt/package/l2tpd/patches/04-gcc4.patch
@ -0,0 +1,12 @@
+diff -urN ../tmp-orig/l2tpd-0.70-pre20031121/aaa.c ./aaa.c
+--- ../tmp-orig/l2tpd-0.70-pre20031121/aaa.c	2004-12-09 09:54:10.159417376 +0100
+++ ./aaa.c	2004-12-09 09:54:01.918670160 +0100
+@@ -27,7 +27,7 @@
+ 
+ /* FIXME: Accounting? */
+ 
+-static struct addr_ent *uaddr[ADDR_HASH_SIZE];
+struct addr_ent *uaddr[ADDR_HASH_SIZE];
+ 
+ void init_addr ()
+ {
--- a/openwrt/package/lcd4linux/Makefile
+++ b/openwrt/package/lcd4linux/Makefile
@ -3,15 +3,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lcd4linux
-PKG_VERSION:=0.10.0
+PKG_VERSION:=0.10.0+cvs20051015
 PKG_RELEASE:=1
-PKG_MD5SUM:=b7fb1c24b940482cd730cf212d1b5062
+PKG_MD5SUM:=5b5ac629be4bb5c29104fb8f6b7fa444

-PKG_SOURCE_URL:=@SF/lcd4linux
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/lcd4linux/
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_CAT:=zcat

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 include $(TOPDIR)/package/rules.mk
--- a/openwrt/package/lcd4linux/patches/130-nec_fc.patch
+++ b/openwrt/package/lcd4linux/patches/130-nec_fc.patch
--- a/openwrt/package/libupnp/patches/libupnp-1.2.1a-gcc4.patch
+++ b/openwrt/package/libupnp/patches/libupnp-1.2.1a-gcc4.patch
@ -0,0 +1,17 @@
+Index: libupnp-1.2.1a/ixml/src/element.c
+===================================================================
+--- libupnp-1.2.1a.orig/ixml/src/element.c
+++ libupnp-1.2.1a/ixml/src/element.c
+@@ -454,9 +454,9 @@ ixmlElement_removeAttributeNode( IN IXML
+             element->n.firstAttr = nextSib;
+         }
+ 
+-        ( IXML_Attr * ) attrNode->parentNode = NULL;
+-        ( IXML_Attr * ) attrNode->prevSibling = NULL;
+-        ( IXML_Attr * ) attrNode->nextSibling = NULL;
+        attrNode->parentNode = NULL;
+        attrNode->prevSibling = NULL;
+        attrNode->nextSibling = NULL;
+         *rtAttr = ( IXML_Attr * ) attrNode;
+         return IXML_SUCCESS;
+ 
--- a/openwrt/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch
+++ b/openwrt/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch
@ -0,0 +1,60 @@
+Submitted By: Steffen Knollmann <sknolli at astro.physik.uni-goettingen.de>
+Date: 2005-11-09
+Initial Package Version: 1.1.1
+Upstream Status: From Upstream
+Origin: msmith, courtesy of upstream SVN
+Description: Fixes an optimization problem with gcc-4.0.x that results in
+             dysfunctional library that will produce bigger encoded files
+             with a poor audio quality. Detailed description at:
+             http://trac.xiph.org/cgi-bin/trac.cgi/ticket/583
+
+$LastChangedBy: randy $
+$Date: 2005-11-18 08:12:42 -0700 (Fri, 18 Nov 2005) $
+
+
+--- libvorbis-1.1.1/lib/scales.h	(revision 9958)
+++ libvorbis-1.1.1/lib/scales.h	(revision 9959)
+@@ -26,20 +26,24 @@
+ #ifdef VORBIS_IEEE_FLOAT32
+ 
+ static float unitnorm(float x){
+-  ogg_uint32_t *ix=(ogg_uint32_t *)&x;
+-  *ix=(*ix&0x80000000UL)|(0x3f800000UL);
+-  return(x);
+-}
+-
+-static float FABS(float *x){
+-  ogg_uint32_t *ix=(ogg_uint32_t *)x;
+-  *ix&=0x7fffffffUL;
+-  return(*x);
+  union {
+    ogg_uint32_t i;
+    float f;
+  } ix;
+  ix.f = x;
+  ix.i = (ix.i & 0x80000000U) | (0x3f800000U);
+  return ix.f;
+ }
+ 
+ /* Segher was off (too high) by ~ .3 decibel.  Center the conversion correctly. */
+ static float todB(const float *x){
+-  return (float)((*(ogg_int32_t *)x)&0x7fffffff) * 7.17711438e-7f -764.6161886f;
+  union {
+    ogg_uint32_t i;
+    float f;
+  } ix;
+  ix.f = *x;
+  ix.i = ix.i&0x7fffffff;
+  return (float)(ix.i * 7.17711438e-7f -764.6161886f);
+ }
+ 
+ #define todB_nn(x) todB(x)
+@@ -51,8 +55,6 @@
+   return(1.f);
+ }
+ 
+-#define FABS(x) fabs(*(x))
+-
+ #define todB(x)   (*(x)==0?-400.f:log(*(x)**(x))*4.34294480f)
+ #define todB_nn(x)   (*(x)==0.f?-400.f:log(*(x))*8.6858896f)
+
--- a/openwrt/package/ulogd/patches/ulogd-1.23-gcc4.patch
+++ b/openwrt/package/ulogd/patches/ulogd-1.23-gcc4.patch
@ -0,0 +1,24 @@
+diff -ur ulogd-1.23/extensions/ulogd_SYSLOG.c ulogd-1.23-owrt/extensions/ulogd_SYSLOG.c
+--- ulogd-1.23/extensions/ulogd_SYSLOG.c	2005-02-12 22:17:41.000000000 +0100
+++ ulogd-1.23-owrt/extensions/ulogd_SYSLOG.c	2006-01-29 19:58:43.000000000 +0100
+@@ -136,7 +136,7 @@
+ 	.name = "syslog", 
+ 	.init = &syslog_init,
+ 	.fini = &syslog_fini,
+-	.output &_output_syslog
+	.output = &_output_syslog
+ };
+ 
+ 
+diff -ur ulogd-1.23/include/ulogd/ulogd.h ulogd-1.23-owrt/include/ulogd/ulogd.h
+--- ulogd-1.23/include/ulogd/ulogd.h	2004-04-25 00:40:54.000000000 +0200
+++ ulogd-1.23-owrt/include/ulogd/ulogd.h	2006-01-29 19:58:40.000000000 +0100
+@@ -56,8 +56,6 @@
+ #define ULOGD_ERROR	7	/* error condition, requires user action */
+ #define ULOGD_FATAL	8	/* fatal, program aborted */
+ 
+-extern FILE *logfile;
+-
+ typedef struct ulog_iret {
+ 	/* next interpreter return (key) in the global list */
+ 	struct ulog_iret *next;
--- a/openwrt/package/xinetd/patches/xinetd-2.3.13-gcc4-1.patch
+++ b/openwrt/package/xinetd/patches/xinetd-2.3.13-gcc4-1.patch
@ -0,0 +1,33 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-07
+Initial Package Version: 2.3.13
+Upstream Status:         Not submitted
+Origin:                  Fedora Development CVS
+Description:             Fixes compilation error if using GCC-4.x
+
+
+diff -Naur xinetd-2.3.13-orig/xinetd/service.c xinetd-2.3.13/xinetd/service.c
+--- xinetd-2.3.13-orig/xinetd/service.c	2003-11-16 12:44:10.000000000 +0000
+++ xinetd-2.3.13/xinetd/service.c	2005-08-07 18:37:33.395942648 +0000
+@@ -764,8 +764,8 @@
+                return FAILED;
+ 
+             if ( last == NULL ) {
+-               last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = 
+-		  SAIN( calloc( 1, sizeof(union xsockaddr) ) );
+               SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) );
+	       last = SAIN(SVC_LAST_DGRAM_ADDR(sp));
+             }
+ 
+             (void) time( &current_time ) ;
+@@ -791,8 +791,8 @@
+                return FAILED;
+ 
+ 	    if( last == NULL ) {
+-               last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = 
+-		  SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
+               SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) );
+               last = SAIN6( SVC_LAST_DGRAM_ADDR(sp) );
+             }
+ 
+             (void) time( &current_time ) ;