summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-13 07:50:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-13 07:50:50 +0000
commita28a766f94566db82b6d613f3fbb18b192902637 (patch)
tree58ef6bd18b6f05e99be5c32da02d32d9856a805c /media-libs/xvid
parentVersion bump (diff)
downloadgentoo-2-a28a766f94566db82b6d613f3fbb18b192902637.tar.gz
gentoo-2-a28a766f94566db82b6d613f3fbb18b192902637.tar.bz2
gentoo-2-a28a766f94566db82b6d613f3fbb18b192902637.zip
Fix yasm 1.0.0 detection wrt #314897 by Davide Pesavento.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xvid')
-rw-r--r--media-libs/xvid/ChangeLog5
-rw-r--r--media-libs/xvid/xvid-1.2.2-r2.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index ddd6e1bc6c78..47e9654bccaa 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/xvid
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.114 2010/02/21 10:15:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.115 2010/04/13 07:50:50 ssuominen Exp $
+
+ 13 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> xvid-1.2.2-r2.ebuild:
+ Fix yasm 1.0.0 detection wrt #314897 by Davide Pesavento.
*xvid-1.2.2-r2 (21 Feb 2010)
diff --git a/media-libs/xvid/xvid-1.2.2-r2.ebuild b/media-libs/xvid/xvid-1.2.2-r2.ebuild
index 08ecafd153f9..9467908e67cf 100644
--- a/media-libs/xvid/xvid-1.2.2-r2.ebuild
+++ b/media-libs/xvid/xvid-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.1 2010/02/21 10:15:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.2 2010/04/13 07:50:50 ssuominen Exp $
EAPI=2
inherit eutils multilib
@@ -31,6 +31,10 @@ S=${WORKDIR}/${MY_PN}/build/generic
src_prepare() {
cd "${WORKDIR}"
epatch "${FILESDIR}"/${P}-noexecstack.patch
+
+ sed -i \
+ -e '/^minimum_yasm_minor_version/s:=.*:=0:' \
+ "${S}"/configure || die
}
src_configure() {