Add mandriva patch to build with ffmpeg-0.11 spotted by Hanno Boeck <hanno@gentoo.org> wrt bug #417877.

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

4 files changed, 187 insertions, 10 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 67ec35045ccb..6daad0d824b3 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.90 2012/06/14 07:12:40 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.91 2012/07/04 12:07:44 johu Exp $
+
+  04 Jul 2012; Johannes Huber <johu@gentoo.org>
+  +files/strigi-0.7.7-ffmpeg-0.11.patch, strigi-0.7.7-r1.ebuild:
+  Add mandriva patch to build with ffmpeg-0.11 spotted by Hanno Boeck
+  <hanno@gentoo.org> wrt bug #417877.
 
   14 Jun 2012; Ben de Groot <yngwin@gentoo.org> strigi-0.7.7.ebuild:
   Destabling to ~ia64 because last available stable qt will be masked pending
@@ -466,4 +471,3 @@
   strigi-0.5.1.ebuild, strigi-9999.ebuild:
   Added metadata.xml and Changelog. Thanks to Franz Fellner for the initial
   ebuild.
-
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index 116e92ba935f..ad6686ed2171 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,6 +1,21 @@
-AUX strigi-0.7.7-gcc47.patch 646 RMD160 8f515112485db8b410770bd3fb34f5d99d04b76b SHA1 7556289edf2c15c18066bbcb8773c07a74cbfeed SHA256 5803f646ee063dc397bf47164584aaac91f877f0195f80d027baa8e2571cf6bc
-DIST strigi-0.7.7.tar.xz 698312 RMD160 473fc190c003ea07b74b0e309052d65b220ec635 SHA1 31e80a5d762ab20391d07080ddb035f9b91a233f SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817
-EBUILD strigi-0.7.7-r1.ebuild 2542 RMD160 41d5e95cb74b07c4f4799aced7ec746635a29bb0 SHA1 60be33addaba801a2464e42da948799f1684a34e SHA256 dedef57f1776d1ad00bb292e2c7bc682c37afb646a67eb7f038f88ce4965022c
-EBUILD strigi-0.7.7.ebuild 2475 RMD160 4e8f6685b84c40b2a3b7505ca7d2aecaf8972524 SHA1 3489230fd143200ab86047ccb5223ef10df68347 SHA256 9b661f37b8da4157f10009843322a4f4728e9b9d38fbadf89e669ded109d1ddc
-MISC ChangeLog 17325 RMD160 a434031b2cf18def46be337d16b90af7bf38128d SHA1 3c0b87610598d7680228a7d7ff549b681a5ed294 SHA256 16b708e5303dceedc7bfb0288f7b88830d4db5f79b42a5e27eb24deec10b3dff
-MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX strigi-0.7.7-ffmpeg-0.11.patch 5112 SHA256 c3a3cdbd603091e0cc99201ea8221b068c4a7ae35d2241b1763d6b0ffab41ccd SHA512 467bf77dd43b62fd70a7e02346c5cab8e685ad73ffc018e926301f05b12399a3244f75dd3fb4615048898a029162ebb1e13759847926528dfef164c783d4309f WHIRLPOOL bd3b385d8f6493a4509901f27dc5be5d42e6b8428f064c3e39f450220e282ad3d0e0a20e47eeeb931d44a82cf4d53e9da417152f30dffd2433f788ec8b731ecc
+AUX strigi-0.7.7-gcc47.patch 646 SHA256 5803f646ee063dc397bf47164584aaac91f877f0195f80d027baa8e2571cf6bc SHA512 a6a70deb4d6f1a5756714bfa0b33cccb842940d01d786ef943199e91a7ccccb82d8acb629a01be82b6a8a86db378af2e2766f3a781a533fb05373a3b0d0634ed WHIRLPOOL a27a3d79de6bff3b45f343356de547ebc05ea9f546bfb261be3926aef213542fd97f0a42c1ae149e9adfb65ed457ee2504ab20eb70ecdd861f940e141d3fe801
+DIST strigi-0.7.7.tar.xz 698312 SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817 SHA512 00498e5248cbaf676054e40dba877a326b4da322b6624bd5f06b48d0b8567a45c8efadf1d7522bbd8ca6e50d4d9d7c4b4beccb25ccd84feb894be0e206818c78 WHIRLPOOL 404961425f99986956871978906a6defa447060a90bbdb9d755a8322e3616741cb6e4c922865857d5c9227d45aaca5cd30972dd8abcd34d43475178352b1403f
+EBUILD strigi-0.7.7-r1.ebuild 2577 SHA256 4a3abdb5117e81442c6654de2750209fb94305fd7a4bebeab52b704f344fe403 SHA512 8d3d141f6f4dbbb70bf473d34da8e71b739e35e00e968070b468f26dcda12caa689d1ec27b4ccdc707d6237a6529454169e37c12951afa503ce30587385d6882 WHIRLPOOL e07d4737cc80bb933e90f3e4c78f0eb3bd01a2aa3778cb4d2ea67237b7fd5f43ddcd216e4b0d13a45051ab0027c6f69fe6a08c030e7ea9a3ea80f04434b1c5da
+EBUILD strigi-0.7.7.ebuild 2475 SHA256 9b661f37b8da4157f10009843322a4f4728e9b9d38fbadf89e669ded109d1ddc SHA512 525c92dbb24ebfaf9c1e7a611c80bcf8d3edf65c8bd7358300602fae1722485551775b90e8d565c80417789192dd5c730e205107ca82aac36f7ab128a82f1102 WHIRLPOOL 3a94c410d0a04012764cd7736868d9e29997fcb09aae89d1d807adc9a5c6522c1753a952de0e73d2b23b0675b53c709510698907e6274454ff3817bebe6a8665
+MISC ChangeLog 17544 SHA256 83837c9250535b46348f497081bc92eac184e4a6ff05d26b318ff4557756b032 SHA512 315658f27fbc0ea4fa5431643ff21eb8b768b9602a93aabfdc88fcca618a62a49219de5fd0d6d1cb9d508d88c05c1f6f7c35cb6165bbe7f9be1a9699fb5620f0 WHIRLPOOL 2a595ae85d7f868133b6addc73ad3f045766e24d712f1cfb26c096c19f71ab6fb7c4b1b3e0fd3f38d9142ed394972399fe47cf3b6e561414e39840124cf98d5c
+MISC metadata.xml 486 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12 SHA512 d7b0cb1f16777eaa062327d6584e69ddc90842ea1d867ec06ceb0a03515fa107fc66d3a94806bf9cf2aaeef300024eb384a70f6fcbe26b2d6f008751f92c17ac WHIRLPOOL 87bd369ade6d7cb4d188aea272b239916d7a19040e5b2dd0965f4c63e657699e8509f2ca0d66dc9e83bcb5e6a9afe1dae4f97e957ce2436bc7a2e811ab1bf46f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJP9DIWAAoJEO+t9ga+3I3amr4H/0MsfmMxEbH3T/geGNPMMjJh
+p2cIdBjIsc5hVWEXnOxYU6sah4PkuJdf7euRKdAx7FJ0UvtUuZtQh0T7LCWVAqTq
+eD2jizCeKqqt8W5Ifi92g3bPz/Lpq+r9J3pD/PgwLn20tLBYdfQI3Fsk7lfnVVry
+jkQbxWUciJjjnyM/Y1ciqTLdP+QgfKatBXayQB/QJ/mHd75Bg9UNp/kCxht1sWZ5
+9Lqz6Rfi/lIibvzx2DGyDTrqU83MRP2MUlGQex92UqjnQX5i7e7bPJaPpuC5LTUi
+eXL0p+LdNoVpv/+cDdJ8poIuWJ1SlmDPu31MKLDIIm7D/fTNQOPMVx2ybC0WYBI=
+=Q/8e
+-----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/files/strigi-0.7.7-ffmpeg-0.11.patch b/app-misc/strigi/files/strigi-0.7.7-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..465eda4c71c5
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.7-ffmpeg-0.11.patch
@@ -0,0 +1,155 @@
+Source: Mandriva patch
+Upstream: No bug report on bugs.kde.org
+Reason: libstreamanalyzer uses deprecated symbols from ffmpeg removed in 0.11
+--- strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.bero	2012-06-08 16:49:40.846877030 +0200
++++ strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2012-06-08 17:27:40.416888115 +0200
+@@ -305,13 +305,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+   uint8_t pDataBuffer[32768];//65536];
+   long lSize = 32768;
+ 
+-  ByteIOContext ByteIOCtx;
+-  if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL, seek_data) < 0)
+-    return -1;
+-
+-  //pAVInputFormat->flags |= AVFMT_NOFILE;
+-  ByteIOCtx.is_streamed = 0;
+-
+   AVProbeData pd;
+   const char *buf;
+   pd.filename ="";
+@@ -324,14 +317,27 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+   if(fmt == NULL)
+     return 1;
+ 
+-  AVFormatContext *fc = NULL;
+-  if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0)
++  AVFormatContext *fc = avformat_alloc_context();
++  if(!fc)
++    return -1;
++
++  AVIOContext *pb = avio_alloc_context(pDataBuffer, lSize, 0, in, read_data, NULL, seek_data);
++  if(!fc->pb) {
++    av_free(fc);
+     return -1;
++  }
++
++  fc->pb = pb;
++
++  if(avformat_open_input(&fc, "", fmt, NULL) < 0) {
++    av_free(fc);
++    return -1;
++  }
+ 
+-  av_find_stream_info(fc);
++  avformat_find_stream_info(fc, NULL);
+   
+   // Dump information about file onto standard error
+-  dump_format(fc, 0, ar.path().c_str(), false);
++  av_dump_format(fc, 0, ar.path().c_str(), false);
+ 
+   if(fc->bit_rate)
+     ar.addValue(factory->bitrateProperty, fc->bit_rate);
+@@ -372,10 +378,10 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+         ar.addTriplet(streamuri, durationPropertyName,outs.str());
+       }
+ 
+-      //FIXME we must stop using the deprecated fuction av_metadata_get and use
++      //FIXME we must stop using the deprecated fuction av_dict_get and use
+       // av_dict_get once we are able to detect the version of FFMpeg being used
+       // using version macros. same goes for all occurences of this function.
+-      AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
++      AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0);
+       if (entry != NULL) {
+         const char *languageValue = entry->value;
+         if (size_t len = strlen(languageValue)) {
+@@ -430,7 +436,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+           outs << codec.sample_rate;
+           ar.addTriplet(streamuri, sampleratePropertyName, outs.str());
+         }
+-        if (codec.sample_fmt != SAMPLE_FMT_NONE) {}//FIXME sample format
++        if (codec.sample_fmt != AV_SAMPLE_FMT_NONE) {}//FIXME sample format
+           
+       } else { // video stream
+         
+@@ -469,7 +475,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ 
+   // Tags
+ 
+-  AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
++  AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *titleValue = entry->value;
+@@ -478,7 +484,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "author", NULL, 0);
++  entry = av_dict_get(fc->metadata, "author", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *authorValue = entry->value;
+@@ -490,7 +496,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
++  entry = av_dict_get(fc->metadata, "copyright", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *copyrightValue = entry->value;
+@@ -499,7 +505,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
++  entry = av_dict_get(fc->metadata, "comment", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *commentValue = entry->value;
+@@ -508,7 +514,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "album", NULL, 0);
++  entry = av_dict_get(fc->metadata, "album", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *albumValue = entry->value;
+@@ -520,7 +526,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
++  entry = av_dict_get(fc->metadata, "genre", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *genreValue = entry->value;
+@@ -529,7 +535,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "track", NULL, 0);
++  entry = av_dict_get(fc->metadata, "track", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *trackValue = entry->value;
+@@ -538,7 +544,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  entry = av_metadata_get(fc->metadata, "year", NULL, 0);
++  entry = av_dict_get(fc->metadata, "year", NULL, 0);
+   if (entry != NULL)
+   {
+     const char *yearValue = entry->value;
+@@ -547,7 +553,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+     }
+   }
+ 
+-  av_close_input_stream(fc);
++  avformat_close_input(&fc);
++  av_free(pb);
+   //url_fclose(&ByteIOCtx);
+   
+   return 0;
diff --git a/app-misc/strigi/strigi-0.7.7-r1.ebuild b/app-misc/strigi/strigi-0.7.7-r1.ebuild
index 06af1bf536b5..b84fb2c8b0cc 100644
--- a/app-misc/strigi/strigi-0.7.7-r1.ebuild
+++ b/app-misc/strigi/strigi-0.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r1.ebuild,v 1.2 2012/05/17 16:42:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r1.ebuild,v 1.3 2012/07/04 12:07:44 johu Exp $
 
 EAPI=4
 
@@ -48,7 +48,10 @@ DEPEND="${COMMONDEPEND}
 	test? ( dev-util/cppunit )"
 RDEPEND=${COMMONDEPEND}
 
-PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-ffmpeg-0.11.patch"
+)
 
 src_configure() {
 	# Enabled: POLLING (only reliable way to check for files changed.)