Fix building on ia64 as reported by armin76.

Package-Manager: portage-2.1.3_rc8

4 files changed, 31 insertions, 12 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 91e7204de9a1..384afa446698 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xvid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.91 2007/07/13 00:27:09 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.92 2007/07/13 13:41:36 drac Exp $
+
+  13 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xvid-1.1.3-ia64-build.patch, xvid-1.1.3.ebuild:
+  Fix building on ia64 as reported by armin76.
 
   13 Jul 2007; Steve Dibb <beandog@gentoo.org> xvid-1.1.3.ebuild:
   amd64 stable, security bug 183145
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index e024d44f3eb3..32e4ab3b52fd 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -22,6 +22,10 @@ AUX xvid-1.1.0_beta2-altivec.patch 1070 RMD160 316da7461c58ddabec7d2907431fbb967
 MD5 80a43f67032aa35894fcb976e575c252 files/xvid-1.1.0_beta2-altivec.patch 1070
 RMD160 316da7461c58ddabec7d2907431fbb9675cea322 files/xvid-1.1.0_beta2-altivec.patch 1070
 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d files/xvid-1.1.0_beta2-altivec.patch 1070
+AUX xvid-1.1.3-ia64-build.patch 393 RMD160 2d4b9e76e7c8bcea8466e19c76458db378c12bb9 SHA1 410d1e61dacf4ec6e321abdc44e37e16a3a578d4 SHA256 2b95dc6c1e39b9a39b88284cba7f43580131a140467d7b7893624869098df067
+MD5 3384b8a68a7e3f4db4569464c5a1d5f7 files/xvid-1.1.3-ia64-build.patch 393
+RMD160 2d4b9e76e7c8bcea8466e19c76458db378c12bb9 files/xvid-1.1.3-ia64-build.patch 393
+SHA256 2b95dc6c1e39b9a39b88284cba7f43580131a140467d7b7893624869098df067 files/xvid-1.1.3-ia64-build.patch 393
 DIST xvid-1.1.0-noexec-stack.patch.bz2 3443 RMD160 3da4597854b67975e424614ac403397fa566f2d1 SHA1 41eba0bcda09741773dace31a4321005f6e35445 SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e
 DIST xvid-1.1.0-textrel-2.patch.bz2 24494 RMD160 5ba4a367fa6ece1de693100112fe2d328c0ae3bb SHA1 0f23b4e4333030ee5c370483a475b749aff7018a SHA256 32ea754d71ac82461cd3fdc9a0f5eacbf8e0d0b3441e9e602baa2cacb9861440
 DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f SHA1 0f5e9e15e96c6c2a1a6d7bea67e8abd5b41442fa SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa
@@ -58,14 +62,14 @@ EBUILD xvid-1.1.2.ebuild 1815 RMD160 a834e1b8fb5e48a8023d51d6f33731dc7e3469fa SH
 MD5 8ef826bb03c3236c6bee47e3da748dc1 xvid-1.1.2.ebuild 1815
 RMD160 a834e1b8fb5e48a8023d51d6f33731dc7e3469fa xvid-1.1.2.ebuild 1815
 SHA256 91fc7ba9c47e2cb5c1ad151a63c51946b97c00c4c6cb52ae004bf990e739576e xvid-1.1.2.ebuild 1815
-EBUILD xvid-1.1.3.ebuild 1827 RMD160 b3716925022b7251bde99ad109cf21e3b98dacbc SHA1 249decdb7b1948fecce20ed0480a52d883109b28 SHA256 6363dbbc1a554e09b995c3e88aae7f2a163311d5d675fc39b0f6ad8c6cfa385c
-MD5 4861d506bf89e8f75a3fdfa071b327c0 xvid-1.1.3.ebuild 1827
-RMD160 b3716925022b7251bde99ad109cf21e3b98dacbc xvid-1.1.3.ebuild 1827
-SHA256 6363dbbc1a554e09b995c3e88aae7f2a163311d5d675fc39b0f6ad8c6cfa385c xvid-1.1.3.ebuild 1827
-MISC ChangeLog 11618 RMD160 7407704913f33a753e69dec758897dce05456a69 SHA1 87c14736e6384d67a81f257c1e77210f7f521692 SHA256 93a7216f578d4f6d2c9822ae49f43ce3c019267b122bccbd800308ad52a50d2e
-MD5 3f340ddb3b5b103ad92e3959dcb578c7 ChangeLog 11618
-RMD160 7407704913f33a753e69dec758897dce05456a69 ChangeLog 11618
-SHA256 93a7216f578d4f6d2c9822ae49f43ce3c019267b122bccbd800308ad52a50d2e ChangeLog 11618
+EBUILD xvid-1.1.3.ebuild 1866 RMD160 3d20a7f0c61b3a9c8e10d2cf571afa8de980a2b2 SHA1 9fccb5f8cd967509ef17285e8b391c8b6d74bfa6 SHA256 bf1ef789c54bd12ab237fd17e6c0348ccba761948bf86592feb2eb9542092db2
+MD5 c0e2f10e8af2df230cdb08e732231690 xvid-1.1.3.ebuild 1866
+RMD160 3d20a7f0c61b3a9c8e10d2cf571afa8de980a2b2 xvid-1.1.3.ebuild 1866
+SHA256 bf1ef789c54bd12ab237fd17e6c0348ccba761948bf86592feb2eb9542092db2 xvid-1.1.3.ebuild 1866
+MISC ChangeLog 11769 RMD160 18821b755e37c75a6c1951d28518d6dfa85f5ef8 SHA1 56e7130e6420525530a067e100d4d88c81c5de5a SHA256 628a5772e167f3121576d37a27a12ae773da4611f33f25316c153aaa95d4f6db
+MD5 248c0af1f65d9733992900789c783713 ChangeLog 11769
+RMD160 18821b755e37c75a6c1951d28518d6dfa85f5ef8 ChangeLog 11769
+SHA256 628a5772e167f3121576d37a27a12ae773da4611f33f25316c153aaa95d4f6db ChangeLog 11769
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
diff --git a/media-libs/xvid/files/xvid-1.1.3-ia64-build.patch b/media-libs/xvid/files/xvid-1.1.3-ia64-build.patch
new file mode 100644
index 000000000000..18e87d91e9a8
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.1.3-ia64-build.patch
@@ -0,0 +1,12 @@
+diff -ur xvidcore-1.1.3.orig/src/quant/quant.h xvidcore-1.1.3/src/quant/quant.h
+--- xvidcore-1.1.3.orig/src/quant/quant.h	2006-07-10 18:05:30.000000000 +0300
++++ xvidcore-1.1.3/src/quant/quant.h	2007-07-13 15:15:10.000000000 +0300
+@@ -91,7 +91,7 @@
+ #endif
+ 
+ #ifdef ARCH_IS_IA64
+-quant_intraFunc dequant_h263_intra_ia64
++quant_intraFunc dequant_h263_intra_ia64;
+ #endif
+ 
+ #ifdef ARCH_IS_PPC
diff --git a/media-libs/xvid/xvid-1.1.3.ebuild b/media-libs/xvid/xvid-1.1.3.ebuild
index 52aa13eed4ff..dd3d00f8310d 100644
--- a/media-libs/xvid/xvid-1.1.3.ebuild
+++ b/media-libs/xvid/xvid-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.3.ebuild,v 1.7 2007/07/13 00:27:09 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.3.ebuild,v 1.8 2007/07/13 13:41:36 drac Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -28,12 +28,11 @@ S="${WORKDIR}"/${MY_P}/build/generic
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${WORKDIR}"/${MY_P}
 	epatch "${FILESDIR}"/${PN}-1.1.0_beta2-altivec.patch
 	epatch "${WORKDIR}"/${PN}-1.1.2-noexec-stack.patch
 	epatch "${FILESDIR}"/${PN}-1.1.0-3dnow-2.patch
-
+	epatch "${FILESDIR}"/${P}-ia64-build.patch
 	cd "${S}"
 	eautoreconf
 }