Added patch for amd64

Package-Manager: portage-2.0.51-r13

4 files changed, 79 insertions, 7 deletions

diff --git a/media-libs/libemf/ChangeLog b/media-libs/libemf/ChangeLog
index e3901979bd60..332a58cebb01 100644
--- a/media-libs/libemf/ChangeLog
+++ b/media-libs/libemf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libemf
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/ChangeLog,v 1.5 2004/06/24 23:08:21 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/ChangeLog,v 1.6 2005/02/01 14:47:49 phosphan Exp $
+
+  01 Feb 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/libEMF-1.0-amd64.patch, libemf-1.0.ebuild:
+  Adding patch for amd64, see bug #9167 (patch source: PLD)
 
   24 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> libemf-1.0.ebuild:
   Added missing "inherit eutils"
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index 58c521797ec8..f0ec58119c44 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,5 +1,6 @@
-MD5 c719a8884855a4b36c41b6a0036a662b libemf-1.0.ebuild 821
-MD5 b6102116b1f91c041ed787c56697cc26 ChangeLog 794
+MD5 d8aab4deefba4357c0912ac108b8b736 libemf-1.0.ebuild 827
+MD5 6cd5ec1762cc9bd63371935651dcb05e ChangeLog 960
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 da0b56d85ef634877fc9be4d56503463 files/libEMF-1.0-amd64.patch 2362
 MD5 3b1d4fe080501e571622229464654b95 files/libEMF-1.0-gcc3.patch 2429
 MD5 5dd26ee62faddde9ae039b314d8e0850 files/digest-libemf-1.0 62
diff --git a/media-libs/libemf/files/libEMF-1.0-amd64.patch b/media-libs/libemf/files/libEMF-1.0-amd64.patch
new file mode 100644
index 000000000000..f3279568baa1
--- /dev/null
+++ b/media-libs/libemf/files/libEMF-1.0-amd64.patch
@@ -0,0 +1,66 @@
+diff -dur libEMF-1.0.orig/include/wine/winnt.h libEMF-1.0/include/wine/winnt.h
+--- libEMF-1.0.orig/include/wine/winnt.h	2002-01-29 05:31:53.000000000 +0100
++++ libEMF-1.0/include/wine/winnt.h	2004-01-22 14:22:35.382239593 +0100
+@@ -45,6 +45,10 @@
+ # undef WORDS_BIGENDIAN
+ # undef BITFIELDS_BIGENDIAN
+ # undef ALLOW_UNALIGNED_ACCESS
++#elif defined(__x86_64__)
++# undef  WORDS_BIGENDIAN
++# undef  BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
+ #elif !defined(RC_INVOKED)
+ # error Unknown CPU architecture!
+ #endif
+@@ -211,7 +215,7 @@
+ typedef unsigned short  WORD,       *PWORD,    *LPWORD;
+ typedef int             INT,        *PINT,     *LPINT;
+ typedef unsigned int    UINT,       *PUINT,    *LPUINT;
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__x86_64__)
+ typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
+ typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
+ #else /* defined( __alpha__ ) */
+@@ -257,7 +261,7 @@
+ typedef BYTE            BOOLEAN,    *PBOOLEAN;
+ typedef char            CHAR,       *PCHAR;
+ typedef short           SHORT,      *PSHORT;
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__x86_64__)
+ typedef long            LONG,       *PLONG,    *LPLONG;
+ #else /* defined( __alpha__ ) */
+ typedef int             LONG,       *PLONG,    *LPLONG;
+@@ -1045,6 +1049,11 @@
+ 
+ #endif  /* __sparc__ */
+ 
++#if defined(__x86_64__)
++#define CONTEXT_FULL 1
++typedef struct _CONTEXT CONTEXT;
++#endif
++
+ #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
+ #error You need to define a CONTEXT for your CPU
+ #endif
+diff -dur libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h
+--- libEMF-1.0.orig/libemf/libemf.h	2002-01-29 05:54:27.000000000 +0100
++++ libEMF-1.0/libemf/libemf.h	2004-01-22 14:23:14.315813724 +0100
+@@ -332,7 +332,7 @@
+ 	fread( &dword, sizeof(DWORD), 1, fp_ );
+       return *this;
+     }
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__x86_64__)
+     /*!
+      * Output a long int to the stream (swabbed).
+      * \param long long int to output.
+@@ -402,7 +402,7 @@
+ 	fread( &int_, sizeof(INT), 1, fp_ );
+       return *this;
+     }
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__x86_64__)
+     /*!
+      * Output a (long) unsigned int to the stream (swabbed).
+      * \param uint (long) unsigned int to output.
+Only in libEMF-1.0/libemf: libemf.h~
diff --git a/media-libs/libemf/libemf-1.0.ebuild b/media-libs/libemf/libemf-1.0.ebuild
index 578ccd8dbd54..90335bd15694 100644
--- a/media-libs/libemf/libemf-1.0.ebuild
+++ b/media-libs/libemf/libemf-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/libemf-1.0.ebuild,v 1.8 2004/06/24 23:08:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/libemf-1.0.ebuild,v 1.9 2005/02/01 14:47:49 phosphan Exp $
 
 inherit eutils gcc
 
@@ -20,7 +20,8 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	[ $(gcc-major-version) -ge 3 ] && epatch ${FILESDIR}/${MY_P}-gcc3.patch
+	epatch ${FILESDIR}/${MY_P}-gcc3.patch
+	epatch ${FILESDIR}/${MY_P}-amd64.patch
 }
 
 src_compile() {