Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (764f2b982daaaf6d5373d1456be92ec01bf913a8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (764f2b982daaaf6d5373d1456be92ec01bf913a8)
  • Date: Mon, 4 Mar 2013 04:25:32 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

utils/strigi/DETAILS | 11 -
utils/strigi/HISTORY | 4
utils/strigi/PRE_BUILD | 13 --
utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch | 155
----------------------------
utils/strigi/strigi-0.7.7-gcc47.patch | 20 ---
5 files changed, 8 insertions(+), 195 deletions(-)

New commits:
commit 764f2b982daaaf6d5373d1456be92ec01bf913a8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

strigi 0.7.8

diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index 3693696..1f0eeec 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -1,11 +1,8 @@
SPELL=strigi
- VERSION=0.7.7
-
SOURCE_HASH=sha512:5bc60a1f3cdcbede20d858e3437647aea5e4e76f2850db6b116983f073294e1f06e595e756889700ac2039e720c53273960a0036791864871e552716685b3dc5
- SOURCE=$SPELL\_$VERSION.orig.tar.bz2
-# SOURCE=$SPELL-$VERSION.tar.bz2
-# SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-# SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
- SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/s/strigi/$SOURCE
+ VERSION=0.7.8
+
SOURCE_HASH=sha512:536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.vandenoever.info/software/strigi/
LICENSE[0]=LGPL
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 47da754..9d2af1e 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,7 @@
+2013-03-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.8
+ * PRE_BUILD, strigi-0.7.7-{gcc47,ffmpeg-0.11}.patch: removed
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply strigi-0.7.7-ffmpeg-0.11.patch for ffmpeg 1.0+ as
well

diff --git a/utils/strigi/PRE_BUILD b/utils/strigi/PRE_BUILD
deleted file mode 100755
index d90b136..0000000
--- a/utils/strigi/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-gcc47.patch &&
-
-FFMPEG_VER=0
-if is_depends_enabled $SPELL ffmpeg; then
- FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
-fi
-if (( $FFMPEG_VER >= 11 || $(installed_version ffmpeg|cut -d. -f1) >= 1)) ||
is_depends_enabled $SPELL ffmpeg-svn; then
- message "${MESSAGE_COLOR}Patching for ffmpeg 0.11+ API...${DEFAULT_COLOR}"
&&
- patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-ffmpeg-0.11.patch
-fi
diff --git a/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
b/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
deleted file mode 100644
index 465eda4..0000000
--- a/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-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/utils/strigi/strigi-0.7.7-gcc47.patch
b/utils/strigi/strigi-0.7.7-gcc47.patch
deleted file mode 100644
index 3e3d318..0000000
--- a/utils/strigi/strigi-0.7.7-gcc47.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit a8e97f672325557b3fbc84b987299350ec5ac10b
-Author: Rex Dieter <rdieter AT fedoraproject.org>
-Date: Mon Jan 9 11:13:25 2012 -0600
-
- gcc47 fix, unistd.h header required unconditionally for 'sleep'
-
-diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
-index 9fcdcb1..1e97599 100644
---- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
-+++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
-@@ -27,9 +27,7 @@
- #include <iostream>
- #include <stdio.h>
-
--#if defined(__SUNPRO_CC)
- #include <unistd.h>
--#endif
-
- using namespace std;
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (764f2b982daaaf6d5373d1456be92ec01bf913a8), Ladislav Hagara, 03/04/2013

Archive powered by MHonArc 2.6.24.

Top of Page