diff options
| author | Andraž Levstik | 2010-11-11 14:24:16 +0100 |
|---|---|---|
| committer | George Sherwood | 2010-11-19 15:50:44 -0600 |
| commit | d82962669c5d2ca8144be7a5c18aedae0abd3ff5 (patch) | |
| tree | f3c3996bbf46ed41caeb701b576fc205dcea256d | |
| parent | b51dcd56e63a903f76a060f8bc5b1e2f7085bf49 (diff) | |
mediatomb: fixes for bug 15686
(cherry picked from commit 34c1ea3592688a46653a1f9b4164888d003564f9)
| -rwxr-xr-x | audio-soft/mediatomb/CONFIGURE | 6 | ||||
| -rwxr-xr-x | audio-soft/mediatomb/DEPENDS | 23 | ||||
| -rw-r--r-- | audio-soft/mediatomb/HISTORY | 4 |
3 files changed, 16 insertions, 17 deletions
diff --git a/audio-soft/mediatomb/CONFIGURE b/audio-soft/mediatomb/CONFIGURE new file mode 100755 index 0000000000..a5840db823 --- /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 65600bec60..1df44620e7 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 f0fb75fe1f..7fec05a96f 100644 --- a/audio-soft/mediatomb/HISTORY +++ b/audio-soft/mediatomb/HISTORY @@ -1,3 +1,7 @@ +2010-11-11 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> + * DEPENDS: fix id3 provider (bug #15686) + * CONFIGURE: fix id3 provider (bug #15686) + 2010-05-19 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536) |