summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-02-24 12:33:41 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-02-24 12:33:41 +0000
commit31edde417a84cc2eff834ed8c38c6f7abb0b249b (patch)
tree29747f59507fa09f2415200c25acf4927a0f016d /media-libs/x264
parentkoffice version bump (diff)
downloadgentoo-2-31edde417a84cc2eff834ed8c38c6f7abb0b249b.tar.gz
gentoo-2-31edde417a84cc2eff834ed8c38c6f7abb0b249b.tar.bz2
gentoo-2-31edde417a84cc2eff834ed8c38c6f7abb0b249b.zip
Do not feed configure script with an unknown --enable-pthread option, bug #356147 by Marcin Mirosław <bug@mejor.pl>
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/x264')
-rw-r--r--media-libs/x264/ChangeLog6
-rw-r--r--media-libs/x264/x264-0.0.20101029.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 1d23e4d98b48..52eb23616b32 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.46 2011/01/26 15:50:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.47 2011/02/24 12:33:41 aballier Exp $
+
+ 24 Feb 2011; Alexis Ballier <aballier@gentoo.org> x264-0.0.20101029.ebuild:
+ Do not feed configure script with an unknown --enable-pthread option, bug
+ #356147 by Marcin Mirosław <bug@mejor.pl>
26 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
+files/x264-altivec.patch, x264-0.0.20101029.ebuild:
diff --git a/media-libs/x264/x264-0.0.20101029.ebuild b/media-libs/x264/x264-0.0.20101029.ebuild
index 40c86ceb97af..1626a299156d 100644
--- a/media-libs/x264/x264-0.0.20101029.ebuild
+++ b/media-libs/x264/x264-0.0.20101029.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20101029.ebuild,v 1.4 2011/01/26 15:50:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20101029.ebuild,v 1.5 2011/02/24 12:33:41 aballier Exp $
EAPI=2
inherit eutils multilib toolchain-funcs versionator
@@ -46,7 +46,7 @@ src_configure() {
--disable-lavf \
--disable-swscale \
--disable-gpac \
- $(use_enable threads pthread) \
+ $(use threads || echo "--disable-pthread") \
--enable-pic \
--enable-shared \
--extra-asflags="${ASFLAGS}" \