Attachment 85169 Details for Bug 121273 – file.diff

[patch] file.diff

file.diff (text/plain), 8.43 KB, created by Leonhard Wimmer on 2008-03-01 23:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leonhard Wimmer

Created: 2008-03-01 23:20:02 UTC

Size: 8.43 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net/mediatomb/Makefile /usr/tmp/port/Makefile
>--- /usr/ports/net/mediatomb/Makefile	Mon Jul 23 11:36:16 2007
>+++ /usr/tmp/port/Makefile	Sat Mar  1 19:44:57 2008
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mediatomb
>-PORTVERSION=	0.10.0
>+PORTVERSION=	0.11.0
> CATEGORIES=	net multimedia
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -24,6 +24,7 @@
> 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
> 		LDFLAGS="${LDFLAGS}" \
> 		CFLAGS="${CFLAGS}"
>+LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
> USE_RC_SUBR=	mediatomb.sh
> 
> # --- configurable variables ---
>@@ -51,8 +52,11 @@
> 		MYSQL "MySQL support" on \
> 		JS "JavaScript (SpiderMonkey) support" on \
> 		LIBEXIF "libexif support" on \
>-		ID3LIB "id3lib support" on \
>-		TAGLIB "taglib support" off \
>+		TAGLIB "taglib support" on \
>+		FFMPEG "ffmpeg metadata extraction support" on \
>+		EXTERNAL_TRANSCODING "external transcoding support" on \
>+		CURL "curl support" on \
>+		ID3LIB "id3lib support" off \
> 		LIBEXTRACTOR "libextractor support" off \
> 		DEBUG "debug build" off
> 
>@@ -98,6 +102,42 @@
> CONFIGURE_ARGS+=	--disable-libexif
> .endif
> 
>+.if defined(WITH_EXTERNAL_TRANSCODING)
>+CONFIGURE_ARGS+=	--enable-external-transcoding
>+.else
>+CONFIGURE_ARGS+=	--disable-external-transcoding
>+.endif
>+
>+# CURL is only useful in combination with EXTERNAL_TRANSCODING
>+.if defined(WITH_CURL) && defined(WITH_EXTERNAL_TRANSCODING)
>+CONFIGURE_ARGS+=	--enable-curl \
>+			--with-curl-cfg="${LOCALBASE}/bin/curl-config"
>+.else
>+CONFIGURE_ARGS+=	--disable-curl
>+.endif
>+
>+.if defined(WITH_FFMPEG) && defined(WITH_LIBEXTRACTOR)
>+IGNORE=	cannot be compiled with both, ffmpeg and libextractor. Please (re)run 'make config' and deselect either FFMPEG or LIBEXTRACTOR
>+.endif
>+
>+.if defined(WITH_FFMPEG)
>+CONFIGURE_ARGS+=	--enable-ffmpeg \
>+			--with-ffmpeg-h="${LOCALBASE}/include" \
>+			--with-ffmpeg-libs="${LOCALBASE}/lib"
>+LIB_DEPENDS+=		avformat:${PORTSDIR}/multimedia/ffmpeg
>+.else
>+CONFIGURE_ARGS+=	--disable-ffmpeg
>+.endif
>+
>+.if defined(WITH_LIBEXTRACTOR)
>+CONFIGURE_ARGS+=	--enable-libextractor \
>+			--with-extractor-h="${LOCALBASE}/include" \
>+			--with-extractor-libs="${LOCALBASE}/lib"
>+LIB_DEPENDS+=		extractor:${PORTSDIR}/textproc/libextractor
>+.else
>+CONFIGURE_ARGS+=	--disable-libextractor
>+.endif
>+
> .if defined(WITH_ID3LIB) && defined(WITH_TAGLIB)
> IGNORE=	cannot be compiled with both, taglib and id3lib. Please (re)run 'make config' and deselect either TAGLIB or ID3LIB
> .endif
>@@ -117,15 +157,6 @@
> LIB_DEPENDS+=		tag:${PORTSDIR}/audio/taglib
> .else
> CONFIGURE_ARGS+=	--disable-taglib
>-.endif
>-
>-.if defined(WITH_LIBEXTRACTOR)
>-CONFIGURE_ARGS+=	--enable-libextractor \
>-			--with-extractor-h="${LOCALBASE}/include" \
>-			--with-extractor-libs="${LOCALBASE}/lib"
>-LIB_DEPENDS+=		extractor:${PORTSDIR}/textproc/libextractor
>-.else
>-CONFIGURE_ARGS+=	--disable-libextractor
> .endif
> 
> .if defined(WITH_DEBUG)
>diff -ruN --exclude=CVS /usr/ports/net/mediatomb/distinfo /usr/tmp/port/distinfo
>--- /usr/ports/net/mediatomb/distinfo	Sun Jul 15 17:05:15 2007
>+++ /usr/tmp/port/distinfo	Sun Mar  2 00:02:58 2008
>@@ -1,3 +1,3 @@
>-MD5 (mediatomb-0.10.0.tar.gz) = 2436c73de4ac5f3ba1575f7ee93a0430
>-SHA256 (mediatomb-0.10.0.tar.gz) = 801bb34cc552b31e7bd873ab90b7af92cc8a473f1603265baf7c3b62a71a4877
>-SIZE (mediatomb-0.10.0.tar.gz) = 910233
>+MD5 (mediatomb-0.11.0.tar.gz) = 661f08933830d920de21436fe122fb15
>+SHA256 (mediatomb-0.11.0.tar.gz) = 25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
>+SIZE (mediatomb-0.11.0.tar.gz) = 1059429
>diff -ruN --exclude=CVS /usr/ports/net/mediatomb/files/config.xml.dist.in /usr/tmp/port/files/config.xml.dist.in
>--- /usr/ports/net/mediatomb/files/config.xml.dist.in	Sun Jul 15 17:05:15 2007
>+++ /usr/tmp/port/files/config.xml.dist.in	Sat Mar  1 20:27:17 2008
>@@ -1,15 +1,42 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<config xmlns="http://mediatomb.cc/0.10.0/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/0.10.0/config http://mediatomb.cc/0.10.0/config.xsd">
>+<config version="1" xmlns="http://mediatomb.cc/config/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/1 http://mediatomb.cc/config/1.xsd">
>   <server>
>     <ui enabled="yes">
>-      <accounts enabled="no" session-timeout="30"/>
>+      <accounts enabled="no" session-timeout="30">
>+        <account user="mediatomb" password="mediatomb"/>
>+      </accounts>
>     </ui>
>     <name>MediaTomb</name>
>+    <udn/>
>     <home>%%MEDIATOMB_DIR%%</home>
>     <webroot>%%DATADIR%%/web</webroot>
>-    <storage driver="sqlite3">
>-      <database-file>mediatomb.db</database-file>
>+    <storage>
>+      <sqlite3 enabled="yes">
>+        <database-file>mediatomb.db</database-file>
>+      </sqlite3>
>+      <mysql enabled="no">
>+        <host>localhost</host>
>+        <username>mediatomb</username>
>+        <database>mediatomb</database>
>+      </mysql>
>     </storage>
>+    <protocolInfo extend="no"/>
>+    
>+    
>+    
>+    
>   </server>
>   <import hidden-files="no">
>     <scripting script-charset="UTF-8">
>@@ -33,10 +60,14 @@
>         <map from="wmx" to="video/x-ms-wmx"/>
>         <map from="m3u" to="audio/x-mpegurl"/>
>         <map from="pls" to="audio/x-scpls"/>
>+        <map from="flv" to="video/x-flv"/>
>+        
>+        
>+        
>+        
>       </extension-mimetype>
>       <mimetype-upnpclass>
>         <map from="audio/*" to="object.item.audioItem.musicTrack"/>
>-        <map from="application/ogg" to="object.item.audioItem.musicTrack"/>
>         <map from="video/*" to="object.item.videoItem"/>
>         <map from="image/*" to="object.item.imageItem"/>
>       </mimetype-upnpclass>
>@@ -47,7 +78,35 @@
>         <treat mimetype="image/jpeg" as="jpg"/>
>         <treat mimetype="audio/x-mpegurl" as="playlist"/>
>         <treat mimetype="audio/x-scpls" as="playlist"/>
>+        <treat mimetype="audio/x-wav" as="pcm"/>
>+        <treat mimetype="video/x-msvideo" as="avi"/>
>       </mimetype-contenttype>
>     </mappings>
>   </import>
>-</config>
>+  <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"/>
>+    </mimetype-profile-mappings>
>+    <profiles>
>+      <profile name="oggflac2raw" enabled="no" type="external">
>+        <mimetype>audio/L16</mimetype>
>+        <accept-url>no</accept-url>
>+        <first-resource>yes</first-resource>
>+        <accept-ogg-theora>no</accept-ogg-theora>
>+        <agent command="ogg123" arguments="-d raw -f %out %in"/>
>+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
>+      </profile>
>+      <profile name="vlcmpeg" enabled="no" type="external">
>+        <mimetype>video/mpeg</mimetype>
>+        <accept-url>yes</accept-url>
>+        <first-resource>yes</first-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"/>
>+      </profile>
>+    </profiles>
>+  </transcoding>
>+</config>
>\ No newline at end of file
>diff -ruN --exclude=CVS /usr/ports/net/mediatomb/pkg-plist /usr/tmp/port/pkg-plist
>--- /usr/ports/net/mediatomb/pkg-plist	Sun Jul 15 17:05:15 2007
>+++ /usr/tmp/port/pkg-plist	Sat Mar  1 19:24:30 2008
>@@ -74,7 +74,7 @@
> %%DATADIR%%/web/js/items.js
> %%DATADIR%%/web/js/md5.js
> %%DATADIR%%/web/js/nanotree.js
>-%%DATADIR%%/web/js/pngbehavior.htc
>+%%DATADIR%%/web/js/iepngfix.htc
> %%DATADIR%%/web/js/prototype.js
> %%DATADIR%%/web/js/tasks.js
> %%DATADIR%%/web/js/tools.js

Actions: View | Diff

Attachments on bug 121273: 85169