diff options
author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2008-03-03 23:03:33 +0000 |
---|---|---|
committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2008-03-03 23:03:33 +0000 |
commit | 4ed119570758893d874ab3372e99cede180c7c22 (patch) | |
tree | 3331fd380cef40f9139f3caf4c4e3c88a61d2d40 | |
parent | Update to 20080229. (diff) |
Update to 0.11.0
PR: 121273
Submitted by: Leonhard Wimmer <leo@mediatomb.cc> (maintainer)
Notes
Notes:
svn path=/head/; revision=208404
-rw-r--r-- | net/mediatomb/Makefile | 56 | ||||
-rw-r--r-- | net/mediatomb/distinfo | 6 | ||||
-rw-r--r-- | net/mediatomb/files/config.xml.dist.in | 71 | ||||
-rw-r--r-- | net/mediatomb/pkg-plist | 2 |
4 files changed, 113 insertions, 22 deletions
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index f3c9db27ec82..38cf9195f13f 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -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,8 @@ CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ CFLAGS="${CFLAGS}" +LIB_DEPENDS+= expat:${PORTSDIR}/textproc/expat2 \ + curl.4:${PORTSDIR}/ftp/curl USE_RC_SUBR= mediatomb.sh # --- configurable variables --- @@ -51,8 +53,11 @@ OPTIONS= SQLITE3 "sqlite3 support" on \ 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 +103,42 @@ LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif 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 @@ -119,15 +160,6 @@ LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib 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) CONFIGURE_ARGS+= --enable-tombdebug .else diff --git a/net/mediatomb/distinfo b/net/mediatomb/distinfo index ca279d08216b..056c6212690d 100644 --- a/net/mediatomb/distinfo +++ b/net/mediatomb/distinfo @@ -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 --git a/net/mediatomb/files/config.xml.dist.in b/net/mediatomb/files/config.xml.dist.in index 30d213e63088..043b99f6c0f4 100644 --- a/net/mediatomb/files/config.xml.dist.in +++ b/net/mediatomb/files/config.xml.dist.in @@ -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"/><!-- For PS3 support change to "yes" --> + <!-- + Uncomment the lines below to get rid of jerky avi playback on the + DSM320 or to enable subtitles support on the DSM units + --> + <!-- + <custom-http-headers> + <add header="X-User-Agent: redsonic"/> + </custom-http-headers> + + <manufacturerURL>redsonic.com</manufacturerURL> + <modelNumber>105</modelNumber> + --> + <!-- Uncomment the line below if you have a Telegent TG100 --> + <!-- + <upnp-string-limit>101</upnp-string-limit> + --> </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"/> + <!-- Uncomment the line below for PS3 divx support --> + <!-- <map from="avi" to="video/divx"/> --> + <!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 --> + <!-- <map from="avi" to="video/avi"/> --> </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 --git a/net/mediatomb/pkg-plist b/net/mediatomb/pkg-plist index ba326abcb69e..cbdbfea2ccf8 100644 --- a/net/mediatomb/pkg-plist +++ b/net/mediatomb/pkg-plist @@ -74,7 +74,7 @@ bin/mediatomb %%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 |