- Install mediatomb binary as group-executable instead of world-executable

- Use ffmpeg instead of vlc for audio/video transcoding
- Add profile for audio/xmp (MODule files), disable by default because the
  dependency on xmp is optional
PR:		ports/149305
Submitted by:	Douglas Carmichael [dcarmich dcarmichael.net]
Approved by:	maintainer timeout (11 weeks)

2 files changed, 35 insertions, 13 deletions

diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 4e7f00eca29a..21de7621d44d 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -185,6 +185,9 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/mediatomb/config.xml ]; then \
 		${CP} -p ${PREFIX}/etc/mediatomb/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml ; \
 	fi
+	@${CHGRP} ${MEDIATOMB_GROUP} ${PREFIX}/bin/mediatomb
+	@${CHMOD} a-x ${PREFIX}/bin/mediatomb
+	@${CHMOD} g+x ${PREFIX}/bin/mediatomb
 	@${MKDIR} -m ${MEDIATOMB_MASK} -p ${MEDIATOMB_DIR}
 	@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${MEDIATOMB_DIR}
 
diff --git a/net/mediatomb/files/config.xml.dist.in b/net/mediatomb/files/config.xml.dist.in
index e4d5ffdb4bdc..02658bf30479 100644
--- a/net/mediatomb/files/config.xml.dist.in
+++ b/net/mediatomb/files/config.xml.dist.in
@@ -91,27 +91,46 @@
   </import>
   <transcoding enabled="no">
     <mimetype-profile-mappings>
-      <transcode mimetype="video/x-flv" using="vlcmpeg"/>
-      <transcode mimetype="application/ogg" using="vlcmpeg"/>
-      <transcode mimetype="application/ogg" using="oggflac2raw"/>
-      <transcode mimetype="audio/x-flac" using="oggflac2raw"/>
+      <transcode mimetype="video/x-flv" using="video-common"/>
+      <transcode mimetype="application/ogg" using="video-common"/>
+      <transcode mimetype="application/ogg" using="audio-ffmpeg-wav"/>
+      <transcode mimetype="audio/x-flac" using="audio-ffmpeg-wav"/>
     </mimetype-profile-mappings>
-    <profiles>
-      <profile name="oggflac2raw" enabled="no" type="external">
-        <mimetype>audio/L16</mimetype>
+    <profiles> 
+      <profile name="audio-mod-xmp" enabled="no" type="external">
+        <mimetype>audio/x-wav</mimetype>
         <accept-url>no</accept-url>
+        <first-resource>no</first-resource>
+        <hide-original-resource>yes</hide-original-resource>
+        <agent command="/usr/local/bin/xmp" arguments="-d wav -o %out %in"/>
+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
+      </profile>
+      <profile name="audio-ffmpeg-wav" enabled="yes" type="external">
+        <mimetype>audio/x-wav</mimetype>
+        <accept-url>no</accept-url>
+        <first-resource>no</first-resource>        
+	<hide-original-resource>yes</hide-original-resource>
+        <agent command="/usr/local/bin/ffmpeg" arguments="-i %in -f wav -y %out"/>
+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
+      </profile>
+      <profile name="audio-ffmpeg-raw" enabled="no" type="external">
+        <mimetype>audio/L16</mimetype>
         <first-resource>yes</first-resource>
-        <accept-ogg-theora>no</accept-ogg-theora>
-        <agent command="ogg123" arguments="-d raw -f %out %in"/>
+        <accept-url>no</accept-url>
+        <sample-frequency>44100</sample-frequency>
+        <audio-channels>2</audio-channels>
+        <hide-original-resource>yes</hide-original-resource>
+        <agent command="/usr/local/bin/ffmpeg" arguments="-i %in -ac 2 -ar 44100 -y -f s16be %out"/>
         <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
       </profile>
-      <profile name="vlcmpeg" enabled="no" type="external">
+      <profile name="video-common" enabled="yes" type="external">
         <mimetype>video/mpeg</mimetype>
-        <accept-url>yes</accept-url>
+        <accept-url>no</accept-url>
         <first-resource>yes</first-resource>
+        <hide-original-resource>yes</hide-original-resource>
         <accept-ogg-theora>yes</accept-ogg-theora>
-        <agent command="vlc" arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit"/>
-        <buffer size="14400000" chunk-size="512000" fill-size="120000"/>
+        <agent command="/usr/local/bin/ffmpeg" arguments="-i %in -f mpegts -sameq -vb 4096k -r 25 -ac 2 -ar 48000 -ab 192k -async 2 -threads 2 -y %out"/>
+        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
       </profile>
     </profiles>
   </transcoding>