Use swscaler only for newer ffmpeg versions.

Package-Manager: portage-2.1.3_rc9

3 files changed, 27 insertions, 10 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index ec076c94043d..8695570de33e 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.21 2007/07/05 11:34:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.22 2007/07/28 12:01:15 zzam Exp $
+
+  28 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-image-0.2.7-r1.ebuild:
+  Use swscaler only for newer ffmpeg versions.
 
 *vdr-image-0.2.7-r1 (05 Jul 2007)
 
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index 3a6adac260c8..a62d9150dcc3 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rc-addon.sh 672 RMD160 592ca37b35e4056b013585704ea2cf637e5dcae3 SHA1 769a5577a6849c77ac4bd32277aea5210996d393 SHA256 1d8a77095882d5b63ddeec7b422cd775b883b8ade3504a22e79d2e463f3eeb17
 MD5 5ecdbfeeef49b027318a9de181d7c234 files/rc-addon.sh 672
 RMD160 592ca37b35e4056b013585704ea2cf637e5dcae3 files/rc-addon.sh 672
@@ -33,18 +36,18 @@ EBUILD vdr-image-0.2.6-r1.ebuild 1439 RMD160 9c6c8265c2be23b74c6f72a28a814952d1c
 MD5 86a928cc75dccaf4e7b98ba13ffe6688 vdr-image-0.2.6-r1.ebuild 1439
 RMD160 9c6c8265c2be23b74c6f72a28a814952d1cd0be4 vdr-image-0.2.6-r1.ebuild 1439
 SHA256 329d5bb9e4218090751b61a200797fe2e1de80fda6965b629378f9af37b9f776 vdr-image-0.2.6-r1.ebuild 1439
-EBUILD vdr-image-0.2.7-r1.ebuild 1504 RMD160 521b8389ea8485090f37214ad91ed6ca442e9739 SHA1 79bac5935a2c5faaf4e7bef62e7b7c50e0eda3cd SHA256 d9d4bed407f3890dc432c479652ba96b3664c30192102b1109d3ab17e83e556a
-MD5 31289d18269cfd6f94fc4212d8577a67 vdr-image-0.2.7-r1.ebuild 1504
-RMD160 521b8389ea8485090f37214ad91ed6ca442e9739 vdr-image-0.2.7-r1.ebuild 1504
-SHA256 d9d4bed407f3890dc432c479652ba96b3664c30192102b1109d3ab17e83e556a vdr-image-0.2.7-r1.ebuild 1504
+EBUILD vdr-image-0.2.7-r1.ebuild 1634 RMD160 d0cce010fe3f456e330a2c923225b0b802f73ef0 SHA1 16a81b0bfcbf38e3e7e6c2bfb4c2160635d9b37c SHA256 9ce53454890a5cacdb6d65c01ccbe62c1f82441554c3be067adf8c55000993b7
+MD5 a9b5f94bf0622986edac815446c059ee vdr-image-0.2.7-r1.ebuild 1634
+RMD160 d0cce010fe3f456e330a2c923225b0b802f73ef0 vdr-image-0.2.7-r1.ebuild 1634
+SHA256 9ce53454890a5cacdb6d65c01ccbe62c1f82441554c3be067adf8c55000993b7 vdr-image-0.2.7-r1.ebuild 1634
 EBUILD vdr-image-0.2.7.ebuild 1436 RMD160 0fb68169acf8be87fe2c009e0d109ba3809a2c6b SHA1 5c94dc34ada604a194e4332ae8be09d357cedc4b SHA256 ea15a37631c407fdde13d972818558259e96ad47b42928404da144475f2c21d8
 MD5 a7ae4d125304b06c8a06647ae89ec0f6 vdr-image-0.2.7.ebuild 1436
 RMD160 0fb68169acf8be87fe2c009e0d109ba3809a2c6b vdr-image-0.2.7.ebuild 1436
 SHA256 ea15a37631c407fdde13d972818558259e96ad47b42928404da144475f2c21d8 vdr-image-0.2.7.ebuild 1436
-MISC ChangeLog 3567 RMD160 1d1034c1232b1a28e737c84ec50784d5a5301ef7 SHA1 97135a1896b7f6a6e057f16fba50056ae15c4877 SHA256 833cafb44d198c94becd2b9672182ea2e6a83a87e6de1fb8be50180212728b01
-MD5 97d7176b1885f6fb072ccf85ac944949 ChangeLog 3567
-RMD160 1d1034c1232b1a28e737c84ec50784d5a5301ef7 ChangeLog 3567
-SHA256 833cafb44d198c94becd2b9672182ea2e6a83a87e6de1fb8be50180212728b01 ChangeLog 3567
+MISC ChangeLog 3697 RMD160 ddc438567a198b7599853d075785a1d007f5fe31 SHA1 3438972bf3ec9a379d798c00afdd843937ad9f0b SHA256 93bede31a6e7927a9f2e0b1fe90591307ca26c5bb2eaf6813b6edf77a72af1ba
+MD5 96b05bbf3474a64824713917f1a44899 ChangeLog 3697
+RMD160 ddc438567a198b7599853d075785a1d007f5fe31 ChangeLog 3697
+SHA256 93bede31a6e7927a9f2e0b1fe90591307ca26c5bb2eaf6813b6edf77a72af1ba ChangeLog 3697
 MISC metadata.xml 435 RMD160 502170f1dbcc66a3742ba91c1790d2e46d7ef6a1 SHA1 e8df8ce5ac5a7cfae27a1e2808d7ae682a89ed0c SHA256 2339bf531037284f03317b33d6fcf743c6ffe74bd48c916e2db2e34c569f6bee
 MD5 e91fd7575712195350f0172a918df8df metadata.xml 435
 RMD160 502170f1dbcc66a3742ba91c1790d2e46d7ef6a1 metadata.xml 435
@@ -61,3 +64,10 @@ SHA256 92225e59b91a0f53f0422c32f95626dca43caaad59b9a2d3324b83d5fa55146d files/di
 MD5 c7be08b7787c423929f4b5376a1d6005 files/digest-vdr-image-0.2.7-r1 247
 RMD160 a1f33a6d615163a913f287fc9ca2305b7134b222 files/digest-vdr-image-0.2.7-r1 247
 SHA256 92225e59b91a0f53f0422c32f95626dca43caaad59b9a2d3324b83d5fa55146d files/digest-vdr-image-0.2.7-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGqzAXt2vP6XvVdOcRAsPUAJ45xgdrTQMlu/pe5zqTiXiNUGJL/gCg31vp
+7ZGJ0/4wRXQ3s0FlMFtjkwg=
+=LtCV
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild b/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
index 7575a43963f3..5f0768f3c325 100644
--- a/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild,v 1.2 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild,v 1.3 2007/07/28 12:01:15 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -33,6 +33,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
+	if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then
+		VDRPLUGIN_MAKE_TARGET="${VDRPLUGIN_MAKE_TARGET} WITHOUT_SWSCALER=1"
+	fi
 }
 
 src_install() {