Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.50 grimoire by George Sherwood (d82962669c5d2ca8144be7a5c18aedae0abd3ff5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.50 grimoire by George Sherwood (d82962669c5d2ca8144be7a5c18aedae0abd3ff5)
  • Date: Fri, 19 Nov 2010 15:50:59 -0600

GIT changes to stable-rc-0.50 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

audio-soft/mediatomb/CONFIGURE | 6 ++++++
audio-soft/mediatomb/DEPENDS | 23 ++++++-----------------
audio-soft/mediatomb/HISTORY | 4 ++++
3 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit d82962669c5d2ca8144be7a5c18aedae0abd3ff5
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: George Sherwood <gsherwood AT sourcemage.org>

mediatomb: fixes for bug 15686
(cherry picked from commit 34c1ea3592688a46653a1f9b4164888d003564f9)

diff --git a/audio-soft/mediatomb/CONFIGURE b/audio-soft/mediatomb/CONFIGURE
new file mode 100755
index 0000000..a5840db
--- /dev/null
+++ b/audio-soft/mediatomb/CONFIGURE
@@ -0,0 +1,6 @@
+config_query_list MEDIATOMB_ID3 "Which ID3 provider do you want?" \
+ taglib id3lib &&
+config_query_list MEDIATOMB_METADATA "Which Metadata extractor do you want?"
\
+ ffmpeg libextractor
+
+
diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 65600be..1df4462 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -23,15 +23,7 @@ optional_depends spidermonkey \
"--enable-libjs" \
"--disable-libjs" \
"personalized virtual containers" &&
-message "mediatomb depends on either taglib or id3lib, but NOT both" &&
-optional_depends taglib \
- "--enable-taglib" \
- "--disable-taglib" \
- "to parse id3 tags" &&
-optional_depends id3lib \
- "--enable-id3lib" \
- "--disable-id3lib" \
- "to parse id3 tags" &&
+depends $MEDIATOMB_ID3 "--enable-$MEDIATOMB_ID3" &&
optional_depends libexif \
"--enable-libexif" \
"--disable-libexif" \
@@ -40,14 +32,11 @@ optional_depends curl \
"--enable-curl" \
"--disable-curl" \
"to fetch content from the web" &&
-optional_depends libextractor \
- "--enable-libextractor" \
- "--disable-libextractor" \
- "to gather metadata from various files (NOT recommended)" &&
-optional_depends LIBAVCODEC \
- "--enable-ffmpeg" \
- "--disable-ffmpeg" \
- "to gather metadata from video files" &&
+if [[ $MEDIATOMB_METADATA == libextractor ]]; then
+depends libextractor "--enable-libextractor"
+else
+depends LIBAVCODEC "--enable-ffmpeg"
+fi &&
optional_depends mp4v2 \
"" "--disable-libmp4v2" \
"to enable MP4 support" &&
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index f0fb75f..7fec05a 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,7 @@
+2010-11-11 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DEPENDS: fix id3 provider (bug #15686)
+ * CONFIGURE: fix id3 provider (bug #15686)
+
2010-05-19 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)




  • [SM-Commit] GIT changes to stable-rc-0.50 grimoire by George Sherwood (d82962669c5d2ca8144be7a5c18aedae0abd3ff5), George Sherwood, 11/19/2010

Archive powered by MHonArc 2.6.24.

Top of Page