summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2005-12-16 23:10:42 +0000
committerLuca Barbato <lu_zero@gentoo.org>2005-12-16 23:10:42 +0000
commit95cd32d995d4eda2db82e2bfa7bb5833c104a45f (patch)
tree98b624e903b77d770fcb58e20829fc53b5f79959 /media-video/ffmpeg
parentadded ~mips keyword, bug 115539, bite me repoman (diff)
downloadhistorical-95cd32d995d4eda2db82e2bfa7bb5833c104a45f.tar.gz
historical-95cd32d995d4eda2db82e2bfa7bb5833c104a45f.tar.bz2
historical-95cd32d995d4eda2db82e2bfa7bb5833c104a45f.zip
Patch fixed
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest4
-rw-r--r--media-video/ffmpeg/files/ffmpeg-soname-symlink.patch24
3 files changed, 31 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 507cd27508f9..5dd9759aa84b 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.103 2005/12/16 15:43:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.104 2005/12/16 23:10:41 lu_zero Exp $
+
+ 16 Dec 2005; Luca Barbato <lu_zero@gentoo.org>
+ files/ffmpeg-soname-symlink.patch:
+ Fix in the patch
*ffmpeg-0.4.9_p20051216 (16 Dec 2005)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 29a2264ea04e..8bc58f6be5f1 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,4 @@
-MD5 fea73858067f19c8a0e42a341c9813a5 ChangeLog 15998
+MD5 903f1d3f00f968de4399a69aa0b68377 ChangeLog 16104
MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
MD5 bb5094085c4fff51dc773d7735117475 ffmpeg-0.4.9_p20050226-r3.ebuild 4393
MD5 ff615b7d4ca2c8355c1d0a358271e2d8 ffmpeg-0.4.9_p20050226-r5.ebuild 4543
@@ -21,7 +21,7 @@ MD5 96c7f1f67e0299ad71b9c0fad55c3960 files/ffmpeg-configure.patch 585
MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
-MD5 2b2d84507217840b479f06a390c19b90 files/ffmpeg-soname-symlink.patch 4598
+MD5 87d74a163bdacf54915c362c86fa5fd4 files/ffmpeg-soname-symlink.patch 5164
MD5 02a1298f3a982efa3dc25f1746e3dccc files/ffmpeg-unknown-options.patch 414
MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
diff --git a/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch b/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
index 36d164197350..4a8347f5ae2d 100644
--- a/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
+++ b/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
@@ -5,6 +5,30 @@ retrieving revision 1.219
diff -u -r1.219 configure
--- configure 11 Dec 2005 00:45:33 -0000 1.219
+++ configure 13 Dec 2005 16:16:02 -0000
+@@ -215,12 +215,12 @@
+ dlfcn="no"
+ dlopen="no"
+ mpegaudio_hp="yes"
+-SHFLAGS='-shared -Wl,-soname,$@.$(LIBVERSION)'
++SHFLAGS='-shared -Wl,-soname,$@.$(LIBMAJOR)'
+ netserver="no"
+ need_inet_aton="no"
+ ffserver="yes"
+ ffplay="yes"
+-LIBOBJFLAGS=""
++LIBOBJFLAGS='$(PIC)'
+ LDFLAGS=-Wl,--warn-common
+ FFSLDFLAGS=-Wl,-E
+ LDCONFIG="ldconfig"
+@@ -228,6 +228,8 @@
+ LIBSUF=".a"
+ SLIBPREF="lib"
+ SLIBSUF=".so"
++SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
++SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
+ EXESUF=""
+ BUILDSUF=""
+ amr_nb="no"
@@ -228,6 +228,8 @@
LIBSUF=".a"
SLIBPREF="lib"