Date: Fri, 13 Jul 2007 01:07:24 +0200 (CEST) From: Leonhard Wimmer <leo@mediatomb.cc> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/114542: [MAINTAINER] net/mediatomb: update to 0.10.0 Message-ID: <20070712230724.99EF11C8DD9@winf.htu.tuwien.ac.at> Resent-Message-ID: <200707122330.l6CNU7mc023737@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114542
>Category: ports
>Synopsis: [MAINTAINER] net/mediatomb: update to 0.10.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 12 23:30:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Leonhard Wimmer
>Release: FreeBSD 6.2-RELEASE-p2 i386
>Organization:
private
>Environment:
System: FreeBSD 6.2
>Description:
udpate to new MediaTomb version 0.10.0
>How-To-Repeat:
>Fix:
--- patch-0.10.0 begins here ---
diff -naur /usr/ports/net/mediatomb/Makefile /home/leo/mediatomb-port/net/mediatomb/Makefile
--- /usr/ports/net/mediatomb/Makefile Wed May 30 08:16:37 2007
+++ /home/leo/mediatomb-port/net/mediatomb/Makefile Thu Jul 12 22:57:09 2007
@@ -6,7 +6,7 @@
#
PORTNAME= mediatomb
-PORTVERSION= 0.9.1
+PORTVERSION= 0.10.0
CATEGORIES= net multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,8 @@
LDFLAGS+= ${PTHREAD_LIBS}
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-search="${LOCALBASE}" \
- --mandir="${MANPREFIX}/man"
+ --mandir="${MANPREFIX}/man" \
+ --disable-inotify
CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
diff -naur /usr/ports/net/mediatomb/distinfo /home/leo/mediatomb-port/net/mediatomb/distinfo
--- /usr/ports/net/mediatomb/distinfo Wed May 30 08:16:37 2007
+++ /home/leo/mediatomb-port/net/mediatomb/distinfo Thu Jul 12 22:57:40 2007
@@ -1,3 +1,3 @@
-MD5 (mediatomb-0.9.1.tar.gz) = 3cb8a14b17102ec828853679d879f7bc
-SHA256 (mediatomb-0.9.1.tar.gz) = 64821ec2c678e5da1582ee116d919ce2beef166301586e42c547e4482fb8d945
-SIZE (mediatomb-0.9.1.tar.gz) = 881850
+MD5 (mediatomb-0.10.0.tar.gz) = 2436c73de4ac5f3ba1575f7ee93a0430
+SHA256 (mediatomb-0.10.0.tar.gz) = 801bb34cc552b31e7bd873ab90b7af92cc8a473f1603265baf7c3b62a71a4877
+SIZE (mediatomb-0.10.0.tar.gz) = 910233
diff -naur /usr/ports/net/mediatomb/files/config.xml.dist.in /home/leo/mediatomb-port/net/mediatomb/files/config.xml.dist.in
--- /usr/ports/net/mediatomb/files/config.xml.dist.in Wed May 30 08:16:38 2007
+++ /home/leo/mediatomb-port/net/mediatomb/files/config.xml.dist.in Thu Jul 12 22:50:28 2007
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<config
- xmlns="http://mediatomb.cc/0.9.1/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mediatomb.cc/0.9.1/config http://mediatomb.cc/0.9.1/config.xsd">;
+<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">;
<server>
<ui enabled="yes">
<accounts enabled="no" session-timeout="30"/>
@@ -15,9 +12,13 @@
</storage>
</server>
<import hidden-files="no">
- <virtual-layout type="builtin">
- <script>%%DATADIR%%/js/import.js</script>
- </virtual-layout>
+ <scripting script-charset="UTF-8">
+ <common-script>%%DATADIR%%/js/common.js</common-script>
+ <playlist-script>%%DATADIR%%/js/playlists.js</playlist-script>
+ <virtual-layout type="builtin">
+ <import-script>%%DATADIR%%/js/import.js</import-script>
+ </virtual-layout>
+ </scripting>
<mappings>
<extension-mimetype ignore-unknown="no">
<map from="mp3" to="audio/mpeg"/>
@@ -30,7 +31,8 @@
<map from="wvx" to="video/x-ms-wvx"/>
<map from="wm" to="video/x-ms-wm"/>
<map from="wmx" to="video/x-ms-wmx"/>
- <map from="wmx" to="video/x-ms-wmx"/>
+ <map from="m3u" to="audio/x-mpegurl"/>
+ <map from="pls" to="audio/x-scpls"/>
</extension-mimetype>
<mimetype-upnpclass>
<map from="audio/*" to="object.item.audioItem.musicTrack"/>
@@ -43,6 +45,8 @@
<treat mimetype="application/ogg" as="ogg"/>
<treat mimetype="audio/x-flac" as="flac"/>
<treat mimetype="image/jpeg" as="jpg"/>
+ <treat mimetype="audio/x-mpegurl" as="playlist"/>
+ <treat mimetype="audio/x-scpls" as="playlist"/>
</mimetype-contenttype>
</mappings>
</import>
diff -naur /usr/ports/net/mediatomb/files/mediatomb.sh.in /home/leo/mediatomb-port/net/mediatomb/files/mediatomb.sh.in
--- /usr/ports/net/mediatomb/files/mediatomb.sh.in Tue Apr 17 20:33:48 2007
+++ /home/leo/mediatomb-port/net/mediatomb/files/mediatomb.sh.in Thu Jul 12 23:13:25 2007
@@ -22,14 +22,21 @@
mediatomb_flags=${mediatomb_flags-""}
mediatomb_logfile=${mediatomb_logfile-"%%MEDIATOMB_DIR%%/mediatomb.log"}
mediatomb_pidfile=${mediatomb_pidfile-"%%MEDIATOMB_DIR%%/mediatomb.pid"}
+mediatomb_interface=${mediatomb_interface-""}
name="mediatomb"
rcvar=`set_rcvar`
load_rc_config $name
+if [ "xx" != "x${mediatomb_interface}x" ]; then
+ mediatomb_interface_command="-e ${mediatomb_interface}"
+else
+ mediatomb_interface_command=""
+fi
+
command="%%PREFIX%%/bin/mediatomb"
-command_args="-d -c ${mediatomb_config} -l ${mediatomb_logfile} -u ${mediatomb_mtuser} -g ${mediatomb_mtgroup} -P ${mediatomb_pidfile}"
+command_args="-d -c ${mediatomb_config} -l ${mediatomb_logfile} -u ${mediatomb_mtuser} -g ${mediatomb_mtgroup} -P ${mediatomb_pidfile} ${mediatomb_interface_command}"
pidfile="${mediatomb_pidfile}"
diff -naur /usr/ports/net/mediatomb/pkg-plist /home/leo/mediatomb-port/net/mediatomb/pkg-plist
--- /usr/ports/net/mediatomb/pkg-plist Tue Apr 17 20:33:48 2007
+++ /home/leo/mediatomb-port/net/mediatomb/pkg-plist Thu Jul 12 23:40:50 2007
@@ -1,6 +1,8 @@
@comment $FreeBSD: ports/net/mediatomb/pkg-plist,v 1.1 2007/04/17 18:33:48 miwi Exp $
bin/mediatomb
%%DATADIR%%/js/import.js
+%%DATADIR%%/js/playlists.js
+%%DATADIR%%/js/common.js
%%DATADIR%%/mappings.xml
%%DATADIR%%/mysql.sql
%%DATADIR%%/sqlite3.sql
@@ -9,8 +11,10 @@
%%DATADIR%%/web/disabled.html
%%DATADIR%%/web/favicon.ico
%%DATADIR%%/web/icons/add_as_autoscan.png
-%%DATADIR%%/web/icons/autoscan_config_folder_open.png
-%%DATADIR%%/web/icons/autoscan_folder_open.png
+%%DATADIR%%/web/icons/autoscan_inotify_config_folder_open.png
+%%DATADIR%%/web/icons/autoscan_inotify_folder_open.png
+%%DATADIR%%/web/icons/autoscan_timed_config_folder_open.png
+%%DATADIR%%/web/icons/autoscan_timed_folder_open.png
%%DATADIR%%/web/icons/blank.gif
%%DATADIR%%/web/icons/blank.png
%%DATADIR%%/web/icons/document-new.png
@@ -31,10 +35,14 @@
%%DATADIR%%/web/icons/mt-icon48.bmp
%%DATADIR%%/web/icons/mt-icon48.jpg
%%DATADIR%%/web/icons/mt-icon48.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_config_folder_closed.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_config_folder_open.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_folder_closed.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_config_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_config_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_config_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_config_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_folder_open.png
%%DATADIR%%/web/icons/nanotree/images/folder_closed.png
%%DATADIR%%/web/icons/nanotree/images/folder_open.png
%%DATADIR%%/web/icons/nanotree/images/lastnode.png
--- patch-0.10.0 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070712230724.99EF11C8DD9>