Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=450691b511688480e6740e8e56bd6f966c6b1b4c
commit 450691b511688480e6740e8e56bd6f966c6b1b4c
Author: Melko <me...@frugalware.org>
Date: Sat Sep 8 13:05:47 2012 +0200
strigi-0.7.7-5-i686
* rebuild with ffmpeg-0.11.1
diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild
index e411691..0bd3af2 100644
--- a/source/apps/strigi/FrugalBuild
+++ b/source/apps/strigi/FrugalBuild
@@ -3,9 +3,9 @@
pkgname=strigi
pkgver=0.7.7
-pkgrel=4
+pkgrel=5
pkgdesc="An advanced, desktop independent search daemon"
-depends=('bzip2' 'dbus-x11' 'exiv2>=0.23' 'gamin' 'libxml2>=2.7.8' 'ffmpeg')
+depends=('bzip2' 'dbus-x11' 'exiv2>=0.23' 'gamin' 'libxml2>=2.7.8'
'ffmpeg>=0.11.1')
makedepends=('ca-certificates' 'boost')
groups=('apps')
archs=('i686' 'x86_64')
@@ -38,7 +38,9 @@ subrodepends=("${subrodepends[@]}"
"libstrigiqtdbusclient>=$pkgver strigi>=$pkgv
subgroups=("${subgroups[@]}" 'xapps-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64')
-source=("gcc4.7.patch")
+source=("gcc4.7.patch" "strigi-0.7.7-ffmpeg_fix-1.patch")
+sha1sums=('fc929b31d811d5cbecacf64544158a3a1e3403e2' \
+ '0e7b1e2d8688c3c48663178e435cb2e4ec033295')
build()
{
@@ -49,4 +51,5 @@ build()
Fsplit libstrigiqtdbusclient usr/include/strigi/qtdbus
Fsplit $pkgname-qt4-gui usr/bin/strigiclient
}
+
# optimization OK
diff --git a/source/apps/strigi/strigi-0.7.7-ffmpeg_fix-1.patch
b/source/apps/strigi/strigi-0.7.7-ffmpeg_fix-1.patch
new file mode 100644
index 0000000..8fdfdd0
--- /dev/null
+++ b/source/apps/strigi/strigi-0.7.7-ffmpeg_fix-1.patch
@@ -0,0 +1,160 @@
+Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org)
+Date: 2012-04-15
+Initial Package Version: 0.7.7
+Description: Fixes compiling strigi with FFmpeg.
+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;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
