summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-04-24 09:09:45 +0000
committerMike Frysinger <vapier@gentoo.org>2005-04-24 09:09:45 +0000
commitb8c6de1c488264cc6c416e194aa4ec6ec740cab9 (patch)
treecdf52fe5b5c8e92e11baeb6511d9b1a834be362b /media-libs/xvid
parents390 lovin (diff)
downloadgentoo-2-b8c6de1c488264cc6c416e194aa4ec6ec740cab9.tar.gz
gentoo-2-b8c6de1c488264cc6c416e194aa4ec6ec740cab9.tar.bz2
gentoo-2-b8c6de1c488264cc6c416e194aa4ec6ec740cab9.zip
fix building with ia64 and mark hppa/ia64 stable
(Portage version: 2.0.51.20)
Diffstat (limited to 'media-libs/xvid')
-rw-r--r--media-libs/xvid/files/xvid-1.0-ia64.patch14
-rw-r--r--media-libs/xvid/xvid-1.0.2.ebuild9
-rw-r--r--media-libs/xvid/xvid-1.0.3.ebuild18
3 files changed, 29 insertions, 12 deletions
diff --git a/media-libs/xvid/files/xvid-1.0-ia64.patch b/media-libs/xvid/files/xvid-1.0-ia64.patch
new file mode 100644
index 000000000000..58a19dfb9e74
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.0-ia64.patch
@@ -0,0 +1,14 @@
+Fix compile on ia64
+
+--- src/quant/quant.h
++++ src/quant/quant.h
+@@ -91,7 +91,8 @@
+ #endif
+
+ #ifdef ARCH_IS_IA64
+-quanth263_intraFunc dequant_intra_ia64;
++quant_intraFunc dequant_intra_ia64;
++quant_intraFunc dequant_h263_intra_ia64;
+ #endif
+
+ #ifdef ARCH_IS_PPC
diff --git a/media-libs/xvid/xvid-1.0.2.ebuild b/media-libs/xvid/xvid-1.0.2.ebuild
index e9f7df021ca9..4fc4af555ea0 100644
--- a/media-libs/xvid/xvid-1.0.2.ebuild
+++ b/media-libs/xvid/xvid-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.2.ebuild,v 1.14 2005/04/19 20:11:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.2.ebuild,v 1.15 2005/04/24 09:09:45 vapier Exp $
inherit eutils
@@ -11,11 +11,11 @@ SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ~ia64 ppc64 ~mips arm"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="doc"
-DEPEND="virtual/libc
- x86? ( >=dev-lang/nasm-0.98.36 )"
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )"
+RDEPEND=""
S="${WORKDIR}/${MY_P}/build/generic"
@@ -24,6 +24,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${PV}-DESTDIR.patch
cd ${S}/../..
+ epatch "${FILESDIR}"/${PN}-1.0-ia64.patch
epatch ${FILESDIR}/${PN}-1.0.1-64bit-clean.patch
}
diff --git a/media-libs/xvid/xvid-1.0.3.ebuild b/media-libs/xvid/xvid-1.0.3.ebuild
index 809178756479..b516aaac6b25 100644
--- a/media-libs/xvid/xvid-1.0.3.ebuild
+++ b/media-libs/xvid/xvid-1.0.3.ebuild
@@ -1,32 +1,34 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.3.ebuild,v 1.4 2005/04/19 20:11:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.3.ebuild,v 1.5 2005/04/24 09:09:45 vapier Exp $
inherit eutils
MY_P=${PN}core-${PV/_rc/-rc}
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution."
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
HOMEPAGE="http://www.xvid.org/"
SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc64 ~ppc"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"
-DEPEND="virtual/libc
- x86? ( >=dev-lang/nasm-0.98.36 )"
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )"
+RDEPEND=""
S="${WORKDIR}/${MY_P}/build/generic"
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PV}-DESTDIR.patch
+ cd "${S}"
+ epatch "${FILESDIR}"/${PV}-DESTDIR.patch
+ cd "${S}"/../..
+ epatch "${FILESDIR}"/${PN}-1.0-ia64.patch
}
src_install() {
- make install DESTDIR=${D} || die
+ make install DESTDIR="${D}" || die
cd ${S}/../../
dodoc AUTHORS ChangeLog README TODO doc/*