Adding amd64 keyword - #33523

4 files changed, 76 insertions, 6 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 52e2d49a0d4d..0f51c2bdf526 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.15 2003/11/23 13:36:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.16 2003/12/12 19:24:27 aliz Exp $
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> libquicktime-0.9.2.ebuild:
+  Added amd64 keyword. Patch for amd64 contributed by E. Papegaaij <e.papegaaij@student.utwente.nl> in
+  #33523.
 
   23 Nov 2003; Aron Griffis <agriffis@gentoo.org> libquicktime-0.9.2.ebuild:
   Stable on alpha
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 5d0fd34f1f85..8dad2a9fbdc8 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,5 +1,6 @@
-MD5 9af9a26eead313af8d3c2e958936eacb ChangeLog 2513
+MD5 d7a5211e738e1a87222c01e3d147be05 libquicktime-0.9.2.ebuild 1564
 MD5 cc1dce5eaa7a737492ba4b29834dc73c libquicktime-0.9.2_pre1.ebuild 1552
-MD5 568abc31778f53a9a01cad0a2ef7181d libquicktime-0.9.2.ebuild 1510
-MD5 a21827ef08966b853edaad08db2f0b17 files/digest-libquicktime-0.9.2_pre1 150
+MD5 da468263efe929f3c7f2db6836d40e76 ChangeLog 2698
 MD5 abf06ed2bfc6e4b130b44e3818ec0c99 files/digest-libquicktime-0.9.2 70
+MD5 7431f4892f67adb233bef504876078db files/libquicktime-0.9.2-amd64.patch 2861
+MD5 a21827ef08966b853edaad08db2f0b17 files/digest-libquicktime-0.9.2_pre1 150
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.2-amd64.patch b/media-libs/libquicktime/files/libquicktime-0.9.2-amd64.patch
new file mode 100644
index 000000000000..a3c469ae7a1b
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-0.9.2-amd64.patch
@@ -0,0 +1,63 @@
+diff -ruN libquicktime-0.9.2/plugins/rtjpeg/Makefile.am libquicktime-0.9.2-amd64-v2/plugins/rtjpeg/Makefile.am
+--- libquicktime-0.9.2/plugins/rtjpeg/Makefile.am	2002-06-03 22:04:22.000000000 +0200
++++ libquicktime-0.9.2-amd64-v2/plugins/rtjpeg/Makefile.am	2003-11-15 17:51:58.286346488 +0100
+@@ -1,5 +1,5 @@
+ CFLAGS = @CFLAGS@
+-CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS += -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ pkglib_LTLIBRARIES = lqt_rtjpeg.la
+ 
+@@ -12,4 +12,4 @@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/
+ 
+ RTjpeg.lo:	RTjpeg.c RTjpeg.h
+-	gcc @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
++	gcc -fPIC @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
+diff -ruN libquicktime-0.9.2/plugins/rtjpeg/Makefile.in libquicktime-0.9.2-amd64-v2/plugins/rtjpeg/Makefile.in
+--- libquicktime-0.9.2/plugins/rtjpeg/Makefile.in	2003-09-06 19:15:42.000000000 +0200
++++ libquicktime-0.9.2-amd64-v2/plugins/rtjpeg/Makefile.in	2003-11-15 17:51:58.299344512 +0100
+@@ -127,7 +127,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-CFLAGS = @CFLAGS@ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS = @CFLAGS@ -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ pkglib_LTLIBRARIES = lqt_rtjpeg.la
+ 
+@@ -397,7 +397,7 @@
+ 
+ 
+ RTjpeg.lo:	RTjpeg.c RTjpeg.h
+-	gcc @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
++	gcc -fPIC @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -ruN libquicktime-0.9.2/plugins/rtjpeg/mmx.h libquicktime-0.9.2-amd64-v2/plugins/rtjpeg/mmx.h
+--- libquicktime-0.9.2/plugins/rtjpeg/mmx.h	2002-06-03 22:04:22.000000000 +0200
++++ libquicktime-0.9.2-amd64-v2/plugins/rtjpeg/mmx.h	2003-11-15 17:54:13.566780736 +0100
+@@ -44,14 +44,14 @@
+ 	 they be truncated by the compiler)
+ */
+ typedef	union {
+-	long long		q;	/* Quadword (64-bit) value */
+-	unsigned long long	uq;	/* Unsigned Quadword */
+-	int			d[2];	/* 2 Doubleword (32-bit) values */
+-	unsigned int		ud[2];	/* 2 Unsigned Doubleword */
+-	short			w[4];	/* 4 Word (16-bit) values */
+-	unsigned short		uw[4];	/* 4 Unsigned Word */
+-	char			b[8];	/* 8 Byte (8-bit) values */
+-	unsigned char		ub[8];	/* 8 Unsigned Byte */
++	int64_t			q;	/* Quadword (64-bit) value */
++	uint64_t		uq;	/* Unsigned Quadword */
++	int32_t			d[2];	/* 2 Doubleword (32-bit) values */
++	uint32_t		ud[2];	/* 2 Unsigned Doubleword */
++	int16_t			w[4];	/* 4 Word (16-bit) values */
++	uint16_t		uw[4];	/* 4 Unsigned Word */
++	int8_t			b[8];	/* 8 Byte (8-bit) values */
++	uint8_t			ub[8];	/* 8 Unsigned Byte */
+ 	float			s[2];	/* Single-precision (32-bit) value */
+ } __attribute__ ((aligned (8))) mmx_t;	/* On an 8-byte (64-bit) boundary */
+ 
diff --git a/media-libs/libquicktime/libquicktime-0.9.2.ebuild b/media-libs/libquicktime/libquicktime-0.9.2.ebuild
index 5c6aa677200b..5667695fe393 100644
--- a/media-libs/libquicktime/libquicktime-0.9.2.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.2.ebuild,v 1.4 2003/11/23 13:36:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.2.ebuild,v 1.5 2003/12/12 19:24:27 aliz Exp $
 
 inherit libtool eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 alpha ~ppc"
+KEYWORDS="~x86 alpha ~ppc ~amd64"
 
 IUSE="oggvorbis png jpeg gtk"
 
@@ -36,6 +36,8 @@ src_unpack() {
 		         { print }' cflags="$CFLAGS" \
 					 <configure.ac.old >configure.ac || die
 	fi
+
+	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
 }
 
 src_compile() {