Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a933bebfd675d69312844fc2c2bfd32962812781)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a933bebfd675d69312844fc2c2bfd32962812781)
  • Date: Wed, 20 Jun 2012 08:41:36 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

net/minidlna/HISTORY | 3 ++
net/minidlna/PRE_BUILD | 3 ++
net/minidlna/minidlna.patch | 46
++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)

New commits:
commit a933bebfd675d69312844fc2c2bfd32962812781
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

minidlna: added a patch to make it build against ffmpeg 0.11

diff --git a/net/minidlna/HISTORY b/net/minidlna/HISTORY
index 6225a1d..04d4da3 100644
--- a/net/minidlna/HISTORY
+++ b/net/minidlna/HISTORY
@@ -1,3 +1,6 @@
+2012-06-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, minidlna.patch: added ffmpeg fix
+
2012-02-16 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.0.24

diff --git a/net/minidlna/PRE_BUILD b/net/minidlna/PRE_BUILD
new file mode 100755
index 0000000..1e3ce88
--- /dev/null
+++ b/net/minidlna/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p1 < "${SPELL_DIRECTORY}/minidlna.patch"
diff --git a/net/minidlna/minidlna.patch b/net/minidlna/minidlna.patch
new file mode 100644
index 0000000..adb02c4
--- /dev/null
+++ b/net/minidlna/minidlna.patch
@@ -0,0 +1,46 @@
+Common subdirectories: minidlna-1.0.24/linux and minidlna-1.0.24-fixed/linux
+diff -Nau minidlna-1.0.24/metadata.c minidlna-1.0.24-fixed/metadata.c
+--- minidlna-1.0.24/metadata.c 2012-02-14 19:44:56.000000000 +0100
++++ minidlna-1.0.24-fixed/metadata.c 2012-06-19 17:11:39.150099226 +0200
+@@ -710,7 +710,7 @@
+ DPRINTF(E_WARN, L_METADATA, "Opening %s failed!\n", path);
+ return 0;
+ }
+- av_find_stream_info(ctx);
++ avformat_find_stream_info(ctx, NULL);
+ //dump_format(ctx, 0, NULL, 0);
+ for( i=0; i<ctx->nb_streams; i++)
+ {
+@@ -732,7 +732,7 @@
+ /* This must not be a video file. */
+ if( !vc )
+ {
+- av_close_input_file(ctx);
++ avformat_close_input(&ctx);
+ if( !is_audio(path) )
+ DPRINTF(E_DEBUG, L_METADATA, "File %s does not
contain a video stream.\n", basename(path));
+ return 0;
+@@ -1514,10 +1514,10 @@
+ {
+ if( ctx->metadata )
+ {
+- AVMetadataTag *tag = NULL;
++ AVDictionaryEntry *tag = NULL;
+
+ //DEBUG DPRINTF(E_DEBUG, L_METADATA, "Metadata:\n");
+- while( (tag = av_metadata_get(ctx->metadata, "", tag,
AV_METADATA_IGNORE_SUFFIX)) )
++ while( (tag = av_dict_get(ctx->metadata, "", tag,
AV_DICT_IGNORE_SUFFIX)) )
+ {
+ //DEBUG DPRINTF(E_DEBUG, L_METADATA, "
%-16s: %s\n", tag->key, tag->value);
+ if( strcmp(tag->key, "title") == 0 )
+@@ -1534,7 +1534,7 @@
+ #endif
+ #endif
+ video_no_dlna:
+- av_close_input_file(ctx);
++ avformat_close_input(&ctx);
+
+ #ifdef TIVO_SUPPORT
+ if( ends_with(path, ".TiVo") && is_tivo_file(path) )
+Common subdirectories: minidlna-1.0.24/po and minidlna-1.0.24-fixed/po
+Common subdirectories: minidlna-1.0.24/tagutils and
minidlna-1.0.24-fixed/tagutils



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a933bebfd675d69312844fc2c2bfd32962812781), Arjan Bouter, 06/20/2012

Archive powered by MHonArc 2.6.24.

Top of Page