Fix build against newer ffmpeg / libav, bug 369515

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog
index 18ae43ee62e08251915f4a1366960830de758d5c..15f91aafe418c228a65cd5ae141b5a58d2f4759b 100644 (file)
--- a/kde-base/ffmpegthumbs/ChangeLog
+++ b/kde-base/ffmpegthumbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ffmpegthumbs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.25 2011/08/12 19:19:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.26 2011/08/12 21:05:15 dilfridge Exp $
+
+  12 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  ffmpegthumbs-4.6.5.ebuild, +files/ffmpegthumbs-4.6.5-libav07.patch:
+  Fix build against newer ffmpeg / libav, bug 369515
 
   12 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -ffmpegthumbs-4.6.4.ebuild:

diff --git a/kde-base/ffmpegthumbs/Manifest b/kde-base/ffmpegthumbs/Manifest
index 6b243942565d01bf1345e5624dd932fc425e5289..b30ce695df811d6bdde285e89c6464b794b93d90 100644 (file)
--- a/kde-base/ffmpegthumbs/Manifest
+++ b/kde-base/ffmpegthumbs/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX ffmpegthumbs-4.6.5-libav07.patch 636 RMD160 4763cf09e76b12df0edc960c229dd63eb6e11404 SHA1 cbb0d215df08d94bdf0cc0beb221568925c01212 SHA256 993515c4d109284b3fa68a3b02bbdfd1b215ba4c7d775af82f57bf76c44b6f79
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.6.5.tar.bz2 1611493 RMD160 70ca60910f21e464f49e4e106918fbcc1407b0c7 SHA1 081bead5ee758d169f3119c138424929b001d04f SHA256 7ab9afb233538e7065758b32cd13f52fee2b68306f4be3dead729f3ba93c9c58
 DIST kdemultimedia-4.7.0.tar.bz2 1626962 RMD160 fb73c684c3cb1a73104b073640905a5213849fa5 SHA1 3ad5f6e806a0e8ea9f7c88697d6f605a112a9d21 SHA256 c5cd53aaa1e245f40b902850bf25fd7f0db117ef411c7fb8481b93fbccdba32c
 EBUILD ffmpegthumbs-4.6.3.ebuild 463 RMD160 9160243e04ca6648a82abd9cc1cea00743c17b8c SHA1 9bd223558fc39d01ecfae20b44ef63d99eb85cd1 SHA256 e7f5cafdd3ae1bb7120cfbcc7755009622a8661dabb9f1e40a86e60a08874385
-EBUILD ffmpegthumbs-4.6.5.ebuild 467 RMD160 2f1c1de1dc2402a1acefc061cdfe237540540dbe SHA1 0ef88ee3afc128a48ae819b6444e0e5e1188b55a SHA256 320a82e6cab0af6fd4c78ca615de47a2e4397d1c0968e728ca0c9843efd18312
+EBUILD ffmpegthumbs-4.6.5.ebuild 521 RMD160 0856605ead15f9bf95e3ba2babaae2f0809d1244 SHA1 e8109196c388f61c3b2dcd8f646ccb7f78e73a9c SHA256 715e132536e5ee0fe1d96f67bf71176a496a7dde10db15a51e2ac15be71dc8f4
 EBUILD ffmpegthumbs-4.7.0.ebuild 466 RMD160 26a5a3012c37d885f076d667b4da802964cb24b9 SHA1 5b17a628e77188ef1129da29e589738fecb9eb86 SHA256 1ef670e4754d2a422760a71569810f1ca3cfa8eade14e28efd557558566b8422
-MISC ChangeLog 3579 RMD160 730b5ee02c221f838ec2bbd8922ec0c8ff68fe23 SHA1 c5eea18df6ea8a08cde4f51900fbfb7bfde4dafa SHA256 3160d9a2c4bb5f911335e27fb3f492cd01f73b38ba0b212404fab41e2361da74
+MISC ChangeLog 3760 RMD160 2a1e8bac97f962816144b4a5fc9b988ce2eb2ee9 SHA1 265276dbb84df73d68d3523a9c4650e2c7fa169c SHA256 7f35c8bbee2a6416722f5eaeeb1f7bc2439d71648e1ed5fb1a55d70df3a07e45
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJORX0gAAoJENwGBM22xffeb7QP/1SAipwCORkkQ193MkBZCN/k
-GDYcuLUdmNqiWqoUS/g0unHBMw2NTTmLHLfbeuD5N21Z9DdMSVA8OSMuOcBm5fB2
-N8I/VO/bRgfDQ0sqAB5C+b04d1CmWvNnE+uH/cpdgNH6acZBX1I7HQ4ndl7BCxBC
-usvGC/Q2/RlKU4Q6cn/Gtp02i97djxZ1umfsvkT+w0rzQh3jAfLERohKE3F8cvsW
-pHCu9qkrtJXYTago9pvhIvluBWkF6Vngk2Hs2Crnh2jHlhvveva6O8E1mMrZFI/E
-SOkux8RjKSahU3IFGOZ5KshpZnajnijAPBLSmFKhEs0ZWPdbdVJwvZ/7yb7P4VVk
-jBnFVWJd5BRQbc2olFiYMxolNnuPVM2emasHDphTaaLW+gq9WGfojtTn3jeNUmxC
-btum/KT1WYWjP5T4KHX36rF2J6GHYbLpZsXOBcYEjTkkJ/iymJqZAgLdvdKQMS6j
-dg5npDcS7dC0X2ClAAsAh8AZF1E/U/40WspNlwIaYGeWdiJb4j0glAZGu2pz66Je
-NcTZ+cpuEz9wNhhLv4+dlldh2b2zAX2atVxIY0/8SikTe3EFo64RY3U7S89COauJ
-00J/CeIqzZ2Gcnuraeb3czZ7RRRdF+DNLFdAXgmfvkCK8ya/IXVRGMVK3kg/5BLO
-BJqtCveRTTYPmZ3f1npk
-=HuMD
+iQIcBAEBCgAGBQJORZWaAAoJENwGBM22xffeyjUP/j5s6kq0ycWfoK/QeUS6AF99
+C2qJNon89CLpY3zh6GwEVi2Qey7Ehba5KKAv1PWFNi3RonmMklObKOQi/4rbMZ9f
+NoZCPIbtLNO2TnKDMmQ2049KUsvNj1b+cq2v/ZCTHStLH9/fzchAxMsNHXRKZ8JV
+rpGfUcQLD1XQLBHBI3EBxPGA0xjNiD/BnlF2OWR+WZGZFVXTEe7pHyZSZ3HPbezC
+kid1bwAQYTxe3NRLeJyo7iejQTN6yhyvIsmGRou+qwSkXP3LqNxQdZHmX6KSWlIc
++faeoMHSPJ/yHIQcnLy1nUNfhlvlFq9rx7p2FUW/7IaMtLVbTmfLuF1kUl/Q/q2P
+oIu821Y/OLTQ7pYUus/L6j8TOoLK7OY0L2ZXZd9bU141NVArXsA9w6RrFjfN0EdN
+y7TPshjyfFSw0UKUc6KDILXvebBTgmvkdw8TBEjZBnGhkOZ9HLatUHEu05NvNOZ1
+nvLYtn3pKBg7C9C6oS6Y0czpd7NG9I6SCCmJQn5MCF/+4l/pcrjLgyhQJ0KQ4RCS
+RC8NjXV1UxPQF/qXBm4B2sRV5ygJxIs+0qcdN+SeGqbjlpsHUz0pIBFkLWj6YQjT
+SzRKsmImio5f477VNTt/LqL4yLWm+vxy2K3KcU/3Mhz1BaWgQNnTY+HO4/CXYDZ6
+waQAMUtqXtRA6/zCjKJL
+=Xm+b
 -----END PGP SIGNATURE-----

diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.6.5.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.6.5.ebuild
index 594cdb418a26587e79c406dfb8865b798ed331dc..cd452dea836f732268faf228943b43919458582f 100644 (file)
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.6.5.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.6.5.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/kde-base/ffmpegthumbs/ffmpegthumbs-4.6.5.ebuild,v 1.2 2011/08/09 17:12:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.6.5.ebuild,v 1.3 2011/08/12 21:05:15 dilfridge Exp $
 
 EAPI=4
 
@@ -15,3 +15,5 @@ DEPEND="
        virtual/ffmpeg
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.5-libav07.patch" )

diff --git a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.6.5-libav07.patch b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.6.5-libav07.patch
new file mode 100644 (file)
index 0000000..931de16
--- /dev/null
+++ b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.6.5-libav07.patch
@@ -0,0 +1,11 @@
+--- branches/KDE/4.7/kdemultimedia/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp     2011/07/02 08:19:20     1239063
++++ branches/KDE/4.7/kdemultimedia/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp     2011/07/02 08:23:18     1239064
+@@ -122,7 +122,7 @@
+ void MovieDecoder::initializeVideo()
+ {
+     for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) {
+-        if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) {
++        if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+             m_pVideoStream = m_pFormatContext->streams[i];
+             m_VideoStream = i;
+             break;