From cf7ce806b64246e71ed2551a06b732bea068be5e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 22 Mar 2006 11:22:19 +0000 Subject: non x86 arch fixes (Portage version: 2.1_pre5-r4) --- sys-apps/fwcrv/ChangeLog | 8 +++-- sys-apps/fwcrv/files/fwcrv-0.1.0-endian.patch | 47 +++++++++++++++++++++++++++ sys-apps/fwcrv/fwcrv-0.1.0.ebuild | 12 +++++-- 3 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 sys-apps/fwcrv/files/fwcrv-0.1.0-endian.patch (limited to 'sys-apps') diff --git a/sys-apps/fwcrv/ChangeLog b/sys-apps/fwcrv/ChangeLog index 4da887011638..17324853eb33 100644 --- a/sys-apps/fwcrv/ChangeLog +++ b/sys-apps/fwcrv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/fwcrv -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/ChangeLog,v 1.3 2005/09/26 04:34:40 robbat2 Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/ChangeLog,v 1.4 2006/03/22 11:22:19 lu_zero Exp $ + + 22 Mar 2006; Luca Barbato + +files/fwcrv-0.1.0-endian.patch, fwcrv-0.1.0.ebuild: + Fixed for big endian and char sign/unsign arches. 26 Sep 2005; Robin H. Johnson fwcrv-0.1.0.ebuild: Stable on x86, 260 days in ~x86. diff --git a/sys-apps/fwcrv/files/fwcrv-0.1.0-endian.patch b/sys-apps/fwcrv/files/fwcrv-0.1.0-endian.patch new file mode 100644 index 000000000000..565a15736d9b --- /dev/null +++ b/sys-apps/fwcrv/files/fwcrv-0.1.0-endian.patch @@ -0,0 +1,47 @@ +diff -ruN src/functions.c /tmp/src/functions.c +--- src/functions.c 2002-11-14 23:46:11.000000000 +0100 ++++ src.new/functions.c 2006-03-22 11:51:03.000000000 +0100 +@@ -59,7 +59,7 @@ + byte ParseCommandLineOptions( int ArgCount, char *ArgValue[], byte *Mode, byte *ReadLength ) + { + int i; +- char *ArgString; ++ unsigned char *ArgString; + byte Node_ID; + + Node_ID = 0; // Default Node_ID used is 0 +diff -ruN src/functions.h /tmp/src/functions.h +--- src/functions.h 2001-06-21 01:11:43.000000000 +0200 ++++ src.new/functions.h 2006-03-22 11:47:48.000000000 +0100 +@@ -16,18 +16,29 @@ + * byte2 = bits 08-15 (on ix86, bits 16-23) + * byte3 = bits 00-07 (on ix86, bits 24-31) + * *****************************************************************************************************/ ++ ++#if __BYTE_ORDER == __BIG_ENDIAN ++ ++#define QBYTE3( q ) ( (byte) ( q >> 24 ) ) ++#define QBYTE2( q ) ( (byte) ( q >> 16 ) ) ++#define QBYTE1( q ) ( (byte) ( q >> 8 ) ) ++#define QBYTE0( q ) ( (byte) q ) ++ ++#else ++ + #define QBYTE0( q ) ( (byte) ( q >> 24 ) ) + #define QBYTE1( q ) ( (byte) ( q >> 16 ) ) + #define QBYTE2( q ) ( (byte) ( q >> 8 ) ) + #define QBYTE3( q ) ( (byte) q ) + ++#endif ++ + /* Macro pour inverser les octets a l'interieur d'un quadlet */ + #define QSWAP( q ) ( ( q << 24 ) & 0xFF000000 ) + \ + ( ( q << 8 ) & 0x00FF0000 ) + \ + ( ( q >> 8 ) & 0x0000FF00 ) + \ + ( ( q >> 24 ) & 0x000000FF ) + +- + /* ****************************************************************************************************** + * ParseCommandLineOptions + * Initialisation of the different options passed as arguments on the command line + diff --git a/sys-apps/fwcrv/fwcrv-0.1.0.ebuild b/sys-apps/fwcrv/fwcrv-0.1.0.ebuild index 19fad1b2cdea..12e7e7f47529 100644 --- a/sys-apps/fwcrv/fwcrv-0.1.0.ebuild +++ b/sys-apps/fwcrv/fwcrv-0.1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/fwcrv-0.1.0.ebuild,v 1.2 2005/09/26 04:34:40 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/fwcrv-0.1.0.ebuild,v 1.3 2006/03/22 11:22:19 lu_zero Exp $ inherit eutils @@ -9,10 +9,16 @@ HOMEPAGE="http://www.hugovil.com/en/fwcrv/" SRC_URI="http://www.hugovil.com/repository/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86" +KEYWORDS="x86 ~ppc" IUSE="" DEPEND="sys-libs/libraw1394" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-endian.patch +} + src_compile() { econf || die "econf failed" emake || die "emake failed" -- cgit v1.2.3-65-gdbad