summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2006-08-30 17:53:19 +0000
committerLuca Barbato <lu_zero@gentoo.org>2006-08-30 17:53:19 +0000
commit20719d6c050bf52fd317c153589b9503e35b1e00 (patch)
treec2f3ab8ef4522c6245ef0ddc6354ee266041b028 /media-video/ffmpeg
parentproxy commit for Mark Loeser to fix linguas related stuff with cream (diff)
downloadhistorical-20719d6c050bf52fd317c153589b9503e35b1e00.tar.gz
historical-20719d6c050bf52fd317c153589b9503e35b1e00.tar.bz2
historical-20719d6c050bf52fd317c153589b9503e35b1e00.zip
Minor fixes
Package-Manager: portage-2.1.1_rc1
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest16
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild6
3 files changed, 17 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f03ed85094db..0749e3ce2c94 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.153 2006/08/17 14:34:56 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.154 2006/08/30 17:53:19 lu_zero Exp $
+
+ 30 Aug 2006; Luca Barbato <lu_zero@gentoo.org>
+ ffmpeg-0.4.9_p20060816.ebuild:
+ Fix multilib-strict and support EXTRA_ECONF
17 Aug 2006; Luca Barbato <lu_zero@gentoo.org>
ffmpeg-0.4.9_p20060816.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5d1adbef5ea5..c404077f9c62 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -70,14 +70,14 @@ EBUILD ffmpeg-0.4.9_p20060530.ebuild 7480 RMD160 8b5c660b382c03a0a55afddde34be2c
MD5 d68e9a78b5c36844f7688528f413a1a0 ffmpeg-0.4.9_p20060530.ebuild 7480
RMD160 8b5c660b382c03a0a55afddde34be2ca7cf8ce5e ffmpeg-0.4.9_p20060530.ebuild 7480
SHA256 7279ee05c78a299207fe2fdc3ce33a423ab7459d705403b786160783d6e924f3 ffmpeg-0.4.9_p20060530.ebuild 7480
-EBUILD ffmpeg-0.4.9_p20060816.ebuild 5385 RMD160 0762c91d08d0e192d4057a11dcc627cc26cba06c SHA1 10dcf80f8a98d416eed47e655d7982fcb821aa69 SHA256 9635fd584761913472b1afdc3b6618ccd67d6cc0b0c77398a1542918fc0b96dd
-MD5 9397c0e15d3f1d07761e3170a14e1010 ffmpeg-0.4.9_p20060816.ebuild 5385
-RMD160 0762c91d08d0e192d4057a11dcc627cc26cba06c ffmpeg-0.4.9_p20060816.ebuild 5385
-SHA256 9635fd584761913472b1afdc3b6618ccd67d6cc0b0c77398a1542918fc0b96dd ffmpeg-0.4.9_p20060816.ebuild 5385
-MISC ChangeLog 23244 RMD160 dfe989729e38d6938fca43ad19b8175093442e99 SHA1 93fa8b5b26dae94fdbb666aab4d41ef9d96daf92 SHA256 9fa233e8bba4b19f9435698c6b2f65b870170c1b46bd9e2fdd30c9219875ae1c
-MD5 b98260f385c72e5fd080648528b4e5b9 ChangeLog 23244
-RMD160 dfe989729e38d6938fca43ad19b8175093442e99 ChangeLog 23244
-SHA256 9fa233e8bba4b19f9435698c6b2f65b870170c1b46bd9e2fdd30c9219875ae1c ChangeLog 23244
+EBUILD ffmpeg-0.4.9_p20060816.ebuild 5465 RMD160 f9327ca15d862239dbd576be84db05a260151763 SHA1 7e89fddf69e8ddf66a0fcaeea92e02a364b845a1 SHA256 82abcd177e37a244430cd4abe7ca7230a0886d5b08bfd8386b6af18bc83e82ba
+MD5 dc5c138a809d42b322c3e230688d125d ffmpeg-0.4.9_p20060816.ebuild 5465
+RMD160 f9327ca15d862239dbd576be84db05a260151763 ffmpeg-0.4.9_p20060816.ebuild 5465
+SHA256 82abcd177e37a244430cd4abe7ca7230a0886d5b08bfd8386b6af18bc83e82ba ffmpeg-0.4.9_p20060816.ebuild 5465
+MISC ChangeLog 23373 RMD160 504c385351d40e09a9559b9d64a69e05edca5b9f SHA1 8b613d5f694709bda6c68df913f0372f78682b71 SHA256 91750fb71092ddd715d6d41d50b233f29d2950778ca2125b3bf43bf49b187fa9
+MD5 be19628ff4788227b70747f11601ff1e ChangeLog 23373
+RMD160 504c385351d40e09a9559b9d64a69e05edca5b9f ChangeLog 23373
+SHA256 91750fb71092ddd715d6d41d50b233f29d2950778ca2125b3bf43bf49b187fa9 ChangeLog 23373
MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
index 93b065611376..931159869ffb 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild,v 1.2 2006/08/17 14:34:56 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild,v 1.3 2006/08/30 17:53:19 lu_zero Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -86,7 +86,7 @@ src_unpack() {
src_compile() {
replace-flags -O0 -O2
- local myconf=""
+ local myconf="${EXTRA_ECONF}"
#disable mmx accelerated code if not requested, or if PIC is required
# as the provided asm decidedly is not PIC.
@@ -143,6 +143,8 @@ src_compile() {
cd ${S}
./configure \
--prefix=/usr \
+ --libdir=/usr/$(get_libdir) \
+ --shlibdir=/usr/$(get_libdir) \
--mandir=/usr/share/man \
--enable-static --enable-shared \
"--cc=$(tc-getCC)" \