Fix building with FFmpeg >= 0.9 wrt #395793 by Helmut Jarausch

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index fa92bcf9a3cd3842361d17e2b00d64fdf9742182..8fe9eb01a75527f3ee9517092f8fd06ea3c63c1b 100644 (file)
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/dvdstyler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.51 2011/12/22 21:27:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.52 2011/12/23 11:01:42 ssuominen Exp $
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> dvdstyler-2.1.ebuild:
+  Fix building with FFmpeg >= 0.9 wrt #395793 by Helmut Jarausch
 
   22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   -dvdstyler-2.0_rc1.ebuild, -dvdstyler-2.0_rc2.ebuild:

diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 0c218bf13c82e6efa7606857fef34a3d686d29c3..8dcdfe7ac35299d7852f26aa401e09cbf13ad88a 100644 (file)
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST DVDStyler-2.1.tar.bz2 3832722 RMD160 1fa2648a4b9509ce3baea916bb2d775bdb0d6449 SHA1 7b152001a687ba2f15bac1c75514dde2a31e78c8 SHA256 2d2d237a5991b94147a5ed09323244004d617926fd26bf27f5c179bad62ec3cd
-EBUILD dvdstyler-2.1.ebuild 1515 RMD160 344b80a2be9943d4e24d80808444b0619673ec55 SHA1 229e967f72297aa2f3721b68a4aba682b3456be5 SHA256 9bdb182a6ea289e37726a93213d11ef40cddbbfb6a89da2b7e0556fca8dc7f1c
-MISC ChangeLog 9617 RMD160 6e7fb5b71ed0aa76fb1ce6038951c840080c54ad SHA1 1603f03794b4f3a16af751e0ca878235958a6ef1 SHA256 1622664daa0e8f1c853c3deafd74d770bfbbfa4252970a1b8fcdb786bf86eb95
+EBUILD dvdstyler-2.1.ebuild 1654 RMD160 9b0ff81594c0e0648ebfa1e161d18564fae91a1a SHA1 e19f8c6eaafd390bb2e6527b93f23ab817506f91 SHA256 947a8d3c9456f2eb8f381117aa5bb30a39fba01255d8359792e4b09b28960406
+MISC ChangeLog 9759 RMD160 490210b2db4f88df6a8edc0d266a3ead92d4e079 SHA1 846ef93e07b320ed7106730f386473d062c93afa SHA256 9e3e234220749364c33d878ce4671a6ba201f8c13cb275a0df99ccf80d1ec68f
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO86CCAAoJEEdUh39IaPFN1WoIAJF2QjVx4FBEmH1gdSdjziRF
-/Kr+4juVWXX2lX8oOjWWJ57AIU3wJBaIprszxM6rQg5E3UZGpKgcIgUOHEcI2Dzx
-zBw5auAu4EgrS6YuxZ70SNANXHeFf77nYRcQ8It4AWGdZAypTVtf4wIMw63bq79o
-DME7HFFboBPeQkZCXHO8FBTJqa9cbuCbJbR7xQcnTb/I/YLXd793cMi+QK86uHUj
-EdewYHBUqOLv7izJ1J6By1MaEP2dYmB38pZniAmONYeGbHFfw+xWSw3Ue6AT3J8A
-EIgZVxLPMWD0hXyXofOp+7BWrh4NKmQIaZpcqPmnoXPH6+NjcyHygEBe8jFRzsg=
-=jGE/
+iQEcBAEBAgAGBQJO9F9dAAoJEEdUh39IaPFNIgIH/0Mu5ZmztPPKrAizHT0K6EKj
+Q17mb/fMJ8bxrckEkmUYW7H5JTH6bY1vAd+duhQh4K8J+jHWcHMq4dPwa2coRMo5
++FocO/60/D+JusyvZBXOVrKj2L39gwcLs3SuhijhPkfDgpF1dWnj4WG+T6uMk2id
+yKxFSkMu/ndbVVv63SfpbwDsTOcmFQQYEu9SC7kMA2yD4N2pzWXzDBk78O8MjLPg
+D94rk6eNlnd4lrTUoUbYbSDgm+5jKuTkJb/EyLGyg6qk/RLYb3MGu0nUcbfNuNDz
+QuLLq2xNUvPrn0fABeSki/ek842Poi3wgkI8BYP+wR3A/8HmfAyUFcY24YJEm+c=
+=4nRk
 -----END PGP SIGNATURE-----

diff --git a/media-video/dvdstyler/dvdstyler-2.1.ebuild b/media-video/dvdstyler/dvdstyler-2.1.ebuild
index c1a6edc7cb64818efb482a422dd54e1b771691ca..6f86c120ea1a020dccba0b3e408d03a2f27bb8c1 100644 (file)
--- a/media-video/dvdstyler/dvdstyler-2.1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-2.1.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-video/dvdstyler/dvdstyler-2.1.ebuild,v 1.2 2011/12/22 21:27:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-2.1.ebuild,v 1.3 2011/12/23 11:01:42 ssuominen Exp $
 
 EAPI=4
 
@@ -46,6 +46,10 @@ src_prepare() {
        sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
 
        sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die #367863
+
+       if has_version ">=media-video/ffmpeg-0.9"; then
+               sed -i -e '/^#i/s:vsink_buffer:buffersink:' src/mediatrc_ffmpeg.cpp || die #395793
+       fi
 }
 
 src_configure() {