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
commitfa5342ee0dcd50c56bd4045d6600fcb2280da7d2 (patch)
tree904b33a54397a53b3eddc331bdcb2d6a461ad794 /media-libs/x264
parentkoffice version bump (diff)
downloadhistorical-fa5342ee0dcd50c56bd4045d6600fcb2280da7d2.tar.gz
historical-fa5342ee0dcd50c56bd4045d6600fcb2280da7d2.tar.bz2
historical-fa5342ee0dcd50c56bd4045d6600fcb2280da7d2.zip
Do not feed configure script with an unknown --enable-pthread option, bug #356147 by Marcin Mirosław <bug@mejor.pl>
Package-Manager: portage-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/Manifest14
-rw-r--r--media-libs/x264/x264-0.0.20101029.ebuild4
3 files changed, 19 insertions, 5 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/Manifest b/media-libs/x264/Manifest
index d39b2d79842e..5d211d82addd 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX x264-altivec.patch 2529 RMD160 a898058a653d55a65ddd070285b649b8569b3215 SHA1 849970574883c079b8b63cdb0922018c32d43532 SHA256 e36a5fe0ff284e0cf7ee1ddeec06f2f083ff1d740e9317d82a3f83dc23a924e6
AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
AUX x264-onlylib-20100605.patch 1078 RMD160 a40e8e298cef462b2c1a393d56184c84a901eb28 SHA1 085e8c16226ad9bb1cfb7efe6065cd80a7c2f358 SHA256 557c818204143440b982bae758103898078d014d145176267329d368b2b44fa4
DIST x264-snapshot-20100605-2245.tar.bz2 422713 RMD160 379b728d53b642bb5ac6d82765325f4c2bbcec00 SHA1 d923e2168d9e4e3f339bfa1588b8d5d748a9a1ba SHA256 29d01cf362770658caea4aa7c9a62319053b113d25d0cbbd4e5b0a697284d692
DIST x264-snapshot-20101029-2245.tar.bz2 449078 RMD160 65691ea49254ac769a1dde5c03bbe190d7758390 SHA1 3153e901b69acbfcade2af9a59b52d357166ece0 SHA256 d6d1ac9450e2e345d6a4bf7e62a9b03256b10da8e4d62c829ba683a7566711f3
EBUILD x264-0.0.20100605.ebuild 1502 RMD160 70f9d093035eac1511eac5f3ef001f88e17f0fec SHA1 fdadbfcd76a3e60198ba6d1ed09bea59a5b8b2d3 SHA256 bd8e77d53bfe9cddea913da054704d046676fbc47e6c6826a8746ebbf3d951b1
-EBUILD x264-0.0.20101029.ebuild 1552 RMD160 b73ba8ce32891414fa68a0460d6f7e1df49c55ee SHA1 39d41716ac4ea2c0af64cb30bbdbf586236dca0b SHA256 d559b7d3547cc6c07ddd35af522b7b5675646e5784b522f852e69c09fdacbaed
-MISC ChangeLog 6793 RMD160 d4aa60f00539e89597aa6ce0511e8c5abca823f2 SHA1 fb80aea4f601a091924d4ac0bd873699dd15c710 SHA256 10c4359da81ddd196afa8bcf77872ac7738a2853309cd875963e99059564c154
+EBUILD x264-0.0.20101029.ebuild 1563 RMD160 ba1d7f7a2a22b57f5b77c5b72c9a77fc3d1d071f SHA1 de8a05e549b5633d7694ce249639a7aa5027b932 SHA256 56bb1399d2ea33336c65a7a643937557953a4b48c148ef5844f0119cc2ff4580
+MISC ChangeLog 6991 RMD160 6046e1e06cc52c14144e37cbbaaef5aa35d20b9f SHA1 c37158b1dfc58f605642a69a6e0a87caed7924fd SHA256 b2370dcc1beaf1870f1b50c57d042b08e4ea15bd6353bc1fa0aad24a5b526046
MISC metadata.xml 335 RMD160 782d171712950050c9e34479cedef18983e566e9 SHA1 68e8b7034a5abef5f25463e194936c8d4a837f72 SHA256 18b919bb52e6713ae3919ba49f66caa659304337339e6d317e95d04a6384d23c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1mUCoACgkQvFcC4BYPU0okMwCgpgM9GN1RK/x2praxEa4Xmk37
+JecAoIXhIQvl4Mz//b8N9QAzoCYjk9ph
+=zoGT
+-----END PGP SIGNATURE-----
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}" \