* [gentoo-commits] gentoo-x86 commit in net-misc/mediatomb/files: mediatomb.initd mediatomb-0.11.0-newffmpeg.patch mediatomb-0.11.0.config mediatomb.confd
@ 2008-03-27 17:32 Diego Petteno (flameeyes)
0 siblings, 0 replies; only message in thread
From: Diego Petteno (flameeyes) @ 2008-03-27 17:32 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/03/27 17:32:59
Added: mediatomb.initd mediatomb-0.11.0-newffmpeg.patch
mediatomb-0.11.0.config mediatomb.confd
Log:
Initial import of mediatomb, an UPnP media server compatible with Sony PlayStation 3. Thanks to BT in bug #172799 for the ebuild.
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 net-misc/mediatomb/files/mediatomb.initd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb.initd?rev=1.1&content-type=text/plain
Index: mediatomb.initd
===================================================================
#!/sbin/runscript
depend() {
need net #MYSQL#
}
start() {
ebegin "Starting MediaTomb"
start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
--interface ${MEDIATOMB_INTERFACE} ${MEDIATOMB_OPTIONS}
eend $?
}
stop () {
ebegin "Stopping MediaTomb"
start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
eend $?
}
1.1 net-misc/mediatomb/files/mediatomb-0.11.0-newffmpeg.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.11.0-newffmpeg.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.11.0-newffmpeg.patch?rev=1.1&content-type=text/plain
Index: mediatomb-0.11.0-newffmpeg.patch
===================================================================
Index: mediatomb-0.11.0/configure.ac
===================================================================
--- mediatomb-0.11.0.orig/configure.ac
+++ mediatomb-0.11.0/configure.ac
@@ -2340,9 +2340,14 @@ if test "x$FFMPEG_OK" = xyes; then
]
)
else
- AC_CHECK_HEADER(ffmpeg/avformat.h,
- [],
+ AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h],
+ [ffmpeg_found=yes; break;], [],
[
+ #define __STDC_CONSTANT_MACROS
+ #include <stdint.h>
+ ]
+ )
+ if test "x$ffmpeg_found" != "xyes"; then
CPPFLAGS="-I$SEARCH_DIR_HEADERS"
unset ac_cv_header_ffmpeg_avformat_h
AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
@@ -2357,12 +2362,7 @@ if test "x$FFMPEG_OK" = xyes; then
#include <stdint.h>
]
)
- ],
- [
- #define __STDC_CONSTANT_MACROS
- #include <stdint.h>
- ]
- )
+ fi
fi
fi
@@ -2447,7 +2447,11 @@ if test "x$FFMPEG_OK" = xyes; then
[
#define __STDC_CONSTANT_MACROS
#include <stdint.h>
+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+ #include <libavformat/avformat.h>
+ #else
#include <ffmpeg/avformat.h>
+ #endif
],
[
av_register_all();
@@ -2462,7 +2466,11 @@ if test "x$FFMPEG_OK" = xyes; then
#define __STDC_CONSTANT_MACROS
#include <stdint.h>
extern "C" {
- #include <ffmpeg/avformat.h>
+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+ #include <libavformat/avformat.h>
+ #else
+ #include <ffmpeg/avformat.h>
+ #endif
}
],
[
Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
===================================================================
--- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc
+++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
@@ -56,7 +56,11 @@ extern "C"
{
#endif
-#include <ffmpeg/avformat.h>
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+# include <libavformat/avformat.h>
+#else
+# include <ffmpeg/avformat.h>
+#endif
#ifdef FFMPEG_NEEDS_EXTERN_C
} // extern "C"
1.1 net-misc/mediatomb/files/mediatomb-0.11.0.config
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.11.0.config?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.11.0.config?rev=1.1&content-type=text/plain
Index: mediatomb-0.11.0.config
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<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">
<account user="mediatomb" password="mediatomb"/>
</accounts>
</ui>
<name>MediaTomb</name>
<udn></udn>
<home>/var/lib/mediatomb</home>
<webroot>/usr/share/mediatomb/web</webroot>
<storage>
<sqlite3 enabled="yes">
<database-file>mediatomb.db</database-file>
</sqlite3>
<mysql enabled="no">
<host>localhost</host>
<database>mediatomb</database>
<username>mediatomb</username>
<password>mediatomb</password>
</mysql>
</storage>
<protocolInfo extend="no"/>
</server>
<import hidden-files="no">
<scripting script-charset="UTF-8">
<common-script>/usr/share/mediatomb/js/common.js</common-script>
<playlist-script>/usr/share/mediatomb/js/playlists.js</playlist-script>
<virtual-layout type="builtin">
<import-script>/usr/share/mediatomb/js/import.js</import-script>
</virtual-layout>
</scripting>
<mappings>
<extension-mimetype ignore-unknown="no">
<map from="mp3" to="audio/mpeg"/>
<map from="ogg" to="application/ogg"/>
<map from="asf" to="video/x-ms-asf"/>
<map from="asx" to="video/x-ms-asf"/>
<map from="wma" to="audio/x-ms-wma"/>
<map from="wax" to="audio/x-ms-wax"/>
<map from="wmv" to="video/x-ms-wmv"/>
<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="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="video/*" to="object.item.videoItem"/>
<map from="image/*" to="object.item.imageItem"/>
</mimetype-upnpclass>
<mimetype-contenttype>
<treat mimetype="audio/mpeg" as="mp3"/>
<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"/>
<treat mimetype="audio/x-wav" as="pcm"/>
<treat mimetype="audio/L16" as="pcm"/>
<treat mimetype="video/x-msvideo" as="avi"/>
</mimetype-contenttype>
</mappings>
</import>
</config>
1.1 net-misc/mediatomb/files/mediatomb.confd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mediatomb/files/mediatomb.confd?rev=1.1&content-type=text/plain
Index: mediatomb.confd
===================================================================
# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
# See the mediatomb(1) manpage for more info.
# MediaTomb Web UI port.
# NOTE: The minimum value allowed is 49152
MEDIATOMB_PORT=49152
# Bind MediaTomb to this interface
MEDIATOMB_INTERFACE="eth0"
# Run MediaTomb as this user.
# NOTE: It is not recommended to run MediaTomb as root for
# security reasons.
MEDIATOMB_USER="mediatomb"
# Run MediaTomb as this group.
# NOTE: It is not recommended to run MediaTomb as root for
# security reasons.
MEDIATOMB_GROUP="mediatomb"
# Path to MediaTomb config file.
MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
# Path to MediaTomb log file.
MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
# Path to MediaTomb pid file.
MEDIATOMB_PIDFILE="/var/run/mediatomb/mediatomb.pid"
# Other options you want to pass to MediaTomb.
MEDIATOMB_OPTIONS=""
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-27 17:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-27 17:32 [gentoo-commits] gentoo-x86 commit in net-misc/mediatomb/files: mediatomb.initd mediatomb-0.11.0-newffmpeg.patch mediatomb-0.11.0.config mediatomb.confd Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox