Author: malat-guest Date: 2011-11-05 21:33:55 +0000 (Sat, 05 Nov 2011) New Revision: 8434
Modified: trunk/packages/vxl/trunk/debian/changelog trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch Log: more on alpha comp issues. Modified: trunk/packages/vxl/trunk/debian/changelog =================================================================== --- trunk/packages/vxl/trunk/debian/changelog 2011-11-05 21:30:58 UTC (rev 8433) +++ trunk/packages/vxl/trunk/debian/changelog 2011-11-05 21:33:55 UTC (rev 8434) @@ -1,3 +1,9 @@ +vxl (1.14.0-12) UNRELEASED; urgency=low + + * Another attempt at fixing alpha building + + -- Mathieu Malaterre <[email protected]> Sat, 05 Nov 2011 22:33:35 +0100 + vxl (1.14.0-11) unstable; urgency=low * Fix another compilation issue on alpha Modified: trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch 2011-11-05 21:30:58 UTC (rev 8433) +++ trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch 2011-11-05 21:33:55 UTC (rev 8434) @@ -1,7 +1,7 @@ Index: vxl-1.14.0/v3p/Qv/QvDict.cxx =================================================================== --- vxl-1.14.0.orig/v3p/Qv/QvDict.cxx 2003-10-15 20:23:46.000000000 +0200 -+++ vxl-1.14.0/v3p/Qv/QvDict.cxx 2011-10-16 18:30:08.000000000 +0200 ++++ vxl-1.14.0/v3p/Qv/QvDict.cxx 2011-10-25 18:04:46.000000000 +0200 @@ -9,7 +9,7 @@ # endif #else @@ -11,10 +11,36 @@ # elif defined(__CYGWIN__) # include <sys/types.h> /* for intptr_t on Cygwin */ # elif defined(__BORLANDC__) +Index: vxl-1.14.0/core/vil/vil_stream_url.cxx +=================================================================== +--- vxl-1.14.0.orig/core/vil/vil_stream_url.cxx 2011-11-05 22:18:48.000000000 +0100 ++++ vxl-1.14.0/core/vil/vil_stream_url.cxx 2011-11-05 22:18:58.000000000 +0100 +@@ -25,7 +25,7 @@ + # include <sys/socket.h> + # include <netinet/in.h> // htons() + # ifdef __alpha +-# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] ++//# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] + # endif + # define SOCKET int + #elif defined (VCL_WIN32) && !defined(__CYGWIN__) +Index: vxl-1.14.0/core/vil1/vil1_stream_url.cxx +=================================================================== +--- vxl-1.14.0.orig/core/vil1/vil1_stream_url.cxx 2011-11-05 22:19:40.000000000 +0100 ++++ vxl-1.14.0/core/vil1/vil1_stream_url.cxx 2011-11-05 22:19:51.000000000 +0100 +@@ -24,7 +24,7 @@ + # include <sys/socket.h> + # include <netinet/in.h> // htons() + # ifdef __alpha +-# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] ++//# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] + # endif + # define SOCKET int + #elif defined (VCL_WIN32) && !defined(__CYGWIN__) Index: vxl-1.14.0/core/vul/vul_url.cxx =================================================================== ---- vxl-1.14.0.orig/core/vul/vul_url.cxx 2011-10-16 18:30:24.000000000 +0200 -+++ vxl-1.14.0/core/vul/vul_url.cxx 2011-10-16 18:30:34.000000000 +0200 +--- vxl-1.14.0.orig/core/vul/vul_url.cxx 2011-11-05 22:19:20.000000000 +0100 ++++ vxl-1.14.0/core/vul/vul_url.cxx 2011-11-05 22:19:30.000000000 +0100 @@ -27,7 +27,7 @@ # include <sys/socket.h> # include <netinet/in.h> // htons() _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
