Hi, Please find attached the difference between version 2.0-0pre2.1 and 2.0-0pre2.2 of ecos.
Bye, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian GNU/Linux developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
diff -u ecos-2.0/debian/control ecos-2.0/debian/control --- ecos-2.0/debian/control +++ ecos-2.0/debian/control @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Masato Taruishi <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 3.0.0), dbs, cpio, tcl8.3-dev, tk8.3-dev, bzip2, docbook-to-man, libgtk1.2-dev, libwxgtk2.4-dev +Build-Depends: debhelper (>> 3.0.0), dbs, cpio, tcl8.3-dev, tk8.3-dev, bzip2, docbook-to-man, libgtk1.2-dev, libwxgtk2.4-dev, autotools-dev Standards-Version: 3.5.6 Package: ecos diff -u ecos-2.0/debian/rules ecos-2.0/debian/rules --- ecos-2.0/debian/rules +++ ecos-2.0/debian/rules @@ -39,6 +39,10 @@ # Add here commands to configure the package. debian/rules setup + + cp -f /usr/share/misc/config.{guess,sub} $(BUILD_TREE)/ecos-2.0/packages/services/gfx/mw/v2_0/src/jpeg-6b/ + cp -f /usr/share/misc/config.{guess,sub} $(BUILD_TREE)/ecos-2.0/acsupport/ + cp -f /usr/share/misc/config.{guess,sub} $(BUILD_TREE)/ecos-2.0/tools/acsupport install -d build cd build; sh ../$(BUILD_TREE)/ecos-2.0/configure --with-tcl-libdir=/usr/lib/tcl8.3 --with-tcl-incdir=/usr/include/tcl8.3 --with-tcl-version=8.3 --prefix=/usr diff -u ecos-2.0/debian/changelog ecos-2.0/debian/changelog --- ecos-2.0/debian/changelog +++ ecos-2.0/debian/changelog @@ -1,3 +1,13 @@ +ecos (2.0-0pre2.2) unstable; urgency=low + + * 0-day NMU (BSP). + * Added patches from Andreas Jochen to fix the build with gcc-4.0 (closes: + bug#280329, bug#285697). + * Update config.{guess,sub} at build time from autotools-dev (closes: + bug#304788). + + -- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 5 Aug 2005 17:19:52 +0200 + ecos (2.0-0pre2.1) unstable; urgency=medium * NMU with permission from maintainer. --- ecos-2.0.orig/debian/patches/020_gcc-3.4_fix +++ ecos-2.0/debian/patches/020_gcc-3.4_fix @@ -0,0 +1,21 @@ +diff -urN tmp/tools/src/tools/Utils/common/eCosSocket.h ecos-2.0/tools/src/tools/Utils/common/eCosSocket.h +--- tmp/tools/src/tools/Utils/common/eCosSocket.h 2000-09-19 05:53:51.000000000 +0000 ++++ ecos-2.0/tools/src/tools/Utils/common/eCosSocket.h 2004-11-03 19:29:51.822303912 +0000 +@@ -166,8 +166,6 @@ + + enum SSReadResult {SS_SOCKET_ERROR=-1,SS_SOCKET_READ=1,SS_SERIAL_ERROR=-2,SS_SERIAL_READ=2,SS_STOPPED=0}; + +-protected: +- + // Blocking read on one or other of the data sources: + // Result: -1 - socket error occurred + // 1 - data read from socket +@@ -176,6 +174,8 @@ + + static SSReadResult SSRead (CeCosSerial &serial,CeCosSocket &socket,void *pBuf,unsigned int nSize,unsigned int &nRead,bool *pbStop); + ++protected: ++ + Duration m_nDefaultTimeout; + Duration TimeoutDuration (Duration dTimeout); + // Set appropriate socket options (most importantly, non-blocking mode) --- ecos-2.0.orig/debian/patches/021_gcc4_fix +++ ecos-2.0/debian/patches/021_gcc4_fix @@ -0,0 +1,218 @@ +diff -urN tmp/tools/src/tools/Utils/common/eCosSerial.cpp ecos-2.0/tools/src/tools/Utils/common/eCosSerial.cpp +--- tmp/tools/src/tools/Utils/common/eCosSerial.cpp 2000-08-25 19:32:40.000000000 +0200 ++++ ecos-2.0/tools/src/tools/Utils/common/eCosSerial.cpp 2004-12-14 17:58:20.000000000 +0100 +@@ -343,7 +343,7 @@ + + bool CeCosSerial::Close() + { +- bool rc=m_pHandle && (-1!=close((int)m_pHandle)); ++ bool rc=m_pHandle && (-1!=close((long)m_pHandle)); + m_pHandle=0; + return rc; + } +@@ -430,7 +430,7 @@ + TRACE(_T("Changing configuration...\n")); + + // Get current settings. +- if (tcgetattr((int) m_pHandle, &buf)) { ++ if (tcgetattr((long) m_pHandle, &buf)) { + fprintf(stderr, _T("Error: tcgetattr\n")); + return false; + } +@@ -497,7 +497,7 @@ + } + + // Set the new settings +- if (tcsetattr((int) m_pHandle, TCSADRAIN, &buf)) { ++ if (tcsetattr((long) m_pHandle, TCSADRAIN, &buf)) { + fprintf(stderr, _T("Error: tcsetattr\n")); + return false; + } +@@ -506,7 +506,7 @@ + // error if _all_ settings fail. If just a few settings are not + // supported, the call returns true while the hardware is set to a + // combination of old and new settings. +- if (tcgetattr((int) m_pHandle, &buf_verify)) { ++ if (tcgetattr((long) m_pHandle, &buf_verify)) { + fprintf(stderr, _T("Error: tcgetattr\n")); + return false; + } +@@ -525,7 +525,7 @@ + + bool CeCosSerial::Flush (void) + { +- return 0==tcflush((int) m_pHandle, TCIOFLUSH); ++ return 0==tcflush((long) m_pHandle, TCIOFLUSH); + } + + bool CeCosSerial::Read (void *pBuf,unsigned int nSize,unsigned int &nRead) +@@ -533,7 +533,7 @@ + + if (!m_bBlockingReads) { + nRead = 0; +- int n = read((int)m_pHandle, pBuf, nSize); ++ int n = read((long)m_pHandle, pBuf, nSize); + if (-1 == n) { + if (EAGAIN == errno) + return true; +@@ -561,7 +561,7 @@ + + fd_set rfds; + FD_ZERO(&rfds); +- FD_SET((int)m_pHandle, &rfds); ++ FD_SET((long)m_pHandle, &rfds); + + // Start with total timeout. + struct timeval tv; +@@ -571,10 +571,10 @@ + unsigned char* pData = (unsigned char*) pBuf; + nRead = 0; + while (nSize) { +- switch(select((int)m_pHandle + 1, &rfds, NULL, NULL, &tv)) { ++ switch(select((long)m_pHandle + 1, &rfds, NULL, NULL, &tv)) { + case 1: + { +- int n = read((int)m_pHandle, pData, nSize); ++ int n = read((long)m_pHandle, pData, nSize); + if (-1 == n && EAGAIN != errno) { + ERROR(_T("Read failed: %d\n"), errno); + return false; // FAILED +@@ -611,7 +611,7 @@ + bool CeCosSerial::Write(void *pBuf,unsigned int nSize,unsigned int &nWritten) + { + bool rc; +- int n=write((int)m_pHandle,pBuf,nSize); ++ int n=write((long)m_pHandle,pBuf,nSize); + if(-1==n){ + nWritten=0; + if (errno == EAGAIN) +diff -urN tmp/tools/src/tools/Utils/common/eCosSocket.cpp ecos-2.0/tools/src/tools/Utils/common/eCosSocket.cpp +--- tmp/tools/src/tools/Utils/common/eCosSocket.cpp 2003-01-26 00:07:53.000000000 +0100 ++++ ecos-2.0/tools/src/tools/Utils/common/eCosSocket.cpp 2004-12-14 19:38:49.000000000 +0100 +@@ -99,7 +99,7 @@ + m_nSock(-1), + m_nClient(0) + { +- VTRACE(_T("Create socket instance %08x\n"),(unsigned int)this); ++ VTRACE(_T("Create socket instance %08lx\n"),(unsigned long)this); + } + + CeCosSocket::CeCosSocket (int sock /*result of previous call of Listen*/, bool *pbStop): +@@ -107,7 +107,7 @@ + m_nSock(-1), + m_nClient(0) + { +- VTRACE(_T("Create socket instance %08x\n"),(unsigned int)this); ++ VTRACE(_T("Create socket instance %08lx\n"),(unsigned long)this); + Accept(sock,pbStop); + } + +@@ -116,7 +116,7 @@ + m_nSock(-1), + m_nClient(0) + { +- VTRACE(_T("Create socket instance %08x\n"),(unsigned int)this); ++ VTRACE(_T("Create socket instance %08lx\n"),(unsigned long)this); + Connect(pszHostPort,dTimeout); + } + +@@ -315,7 +315,7 @@ + CeCosSocket::~CeCosSocket() + { + Close(); +- VTRACE(_T("Delete socket instance %08x\n"),(unsigned int)this); ++ VTRACE(_T("Delete socket instance %08lx\n"),(unsigned long)this); + } + + bool CeCosSocket::CloseSocket(int &sock) +diff -urN tmp/tools/src/tools/Utils/common/eCosTrace.cpp ecos-2.0/tools/src/tools/Utils/common/eCosTrace.cpp +--- tmp/tools/src/tools/Utils/common/eCosTrace.cpp 2000-04-18 23:51:56.000000000 +0200 ++++ ecos-2.0/tools/src/tools/Utils/common/eCosTrace.cpp 2004-12-14 20:28:49.000000000 +0100 +@@ -64,7 +64,7 @@ + fclose(OutInfo.f); + } + if(nVerbosity>=TRACE_LEVEL_TRACE){ +- _ftprintf(stderr,_T("Output -> %s (%08x)\n"),pszFilename,(unsigned int)f); ++ _ftprintf(stderr,_T("Output -> %s (%08lx)\n"),pszFilename,(unsigned long)f); + } + OutInfo.f=f; + OutInfo.strFilename=pszFilename; +diff -urN tmp/tools/src/tools/configtool/standalone/wxwin/packagesdlg.cpp ecos-2.0/tools/src/tools/configtool/standalone/wxwin/packagesdlg.cpp +--- tmp/tools/src/tools/configtool/standalone/wxwin/packagesdlg.cpp 2003-03-28 13:06:06.000000000 +0100 ++++ ecos-2.0/tools/src/tools/configtool/standalone/wxwin/packagesdlg.cpp 2004-12-14 22:39:19.193760064 +0100 +@@ -504,10 +504,10 @@ + + // Remove + int toDelete = from -> FindString(str); +- int itemIndex = -1; ++ long itemIndex = -1; + if (toDelete > -1) + { +- itemIndex = (int) from -> GetClientData(toDelete); ++ itemIndex = (long) from -> GetClientData(toDelete); + from -> Delete(toDelete); + } + +@@ -686,7 +686,7 @@ + wxString str = versionChoice->GetString(nIndex); + + // itemIndex is the index into the list of item names. It gets stored with all the listbox items. +- int itemIndex = (int) pListBox->GetClientData((*selected)[nIndex]); ++ long itemIndex = (long) pListBox->GetClientData((*selected)[nIndex]); + m_currentVersions[(size_t)itemIndex] = str; + } + } +@@ -985,7 +985,7 @@ + + // retrieve the dialog item array index for use in + // comparing current version strings +- const int nVersionIndex = (int) pListBox->GetClientData ((*selections)[nIndex]); ++ const long nVersionIndex = (long) pListBox->GetClientData ((*selections)[nIndex]); + + // retrieve the installed version array + +diff -urN tmp/tools/src/tools/configtool/standalone/wxwin/propertywin.cpp ecos-2.0/tools/src/tools/configtool/standalone/wxwin/propertywin.cpp +--- tmp/tools/src/tools/configtool/standalone/wxwin/propertywin.cpp 2001-06-02 00:16:30.000000000 +0200 ++++ ecos-2.0/tools/src/tools/configtool/standalone/wxwin/propertywin.cpp 2004-12-14 22:49:29.000000000 +0100 +@@ -274,7 +274,7 @@ + void *p; + p = (void*) map.Delete(strName); + +- p=(void *)((int)p+1); ++ p=(void *)((long)p+1); + map.Put(strName, (wxObject*) p); + + std::vector<std::string>::const_iterator argv_i; +@@ -289,7 +289,7 @@ + } + } + // the list control appears to display a maximum of 256 characters +- int nIndex=SetItem(strName, strPropertyArgs, GetItemCount(), (int)p); ++ int nIndex=SetItem(strName, strPropertyArgs, GetItemCount(), (long)p); + SetItemData(nIndex, (long) prop); + + // display the exclamation icon if the property is in a conflicts list +diff -urN tmp/tools/src/tools/ecostest/common/TestResource.cpp ecos-2.0/tools/src/tools/ecostest/common/TestResource.cpp +--- tmp/tools/src/tools/ecostest/common/TestResource.cpp 2000-04-18 23:51:58.000000000 +0200 ++++ ecos-2.0/tools/src/tools/ecostest/common/TestResource.cpp 2004-12-14 22:57:08.801155024 +0100 +@@ -60,7 +60,7 @@ + m_Target(target) + { + CeCosSocket::ParseHostPort(pszHostPort,m_strHost,m_nPort); +- VTRACE(_T("@@@ Created resource %08x %s\n"),(unsigned int)this,(LPCTSTR)Image()); ++ VTRACE(_T("@@@ Created resource %08lx %s\n"),(unsigned long)this,(LPCTSTR)Image()); + Chain(); + } + +diff -urN tmp/tools/src/tools/ecostest/common/eCosTestDownloadFilter.cpp ecos-2.0/tools/src/tools/ecostest/common/eCosTestDownloadFilter.cpp +--- tmp/tools/src/tools/ecostest/common/eCosTestDownloadFilter.cpp 2000-06-23 19:06:32.000000000 +0200 ++++ ecos-2.0/tools/src/tools/ecostest/common/eCosTestDownloadFilter.cpp 2004-12-14 20:27:41.000000000 +0100 +@@ -291,7 +291,7 @@ + + int resend = 1; + const unsigned char* write_ptr = (const unsigned char*) buf2.Data(); +- int write_len = (int)p-(int)buf2.Data(); ++ int write_len = (long)p - (long)buf2.Data(); + while (resend) + { + unsigned int __written;