Attachment 144651 Details for Bug 191859 – svn diff on head_2

[patch] svn diff on head_2

svn-diff--universal-media-server-4.0.0-b1_2.diff (text/plain), 4.94 KB, created by dreamcat4 on 2014-07-14 12:05:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dreamcat4

Created: 2014-07-14 12:05:47 UTC

Size: 4.94 KB

patch

obsolete

>Index: multimedia/universal-media-server/distinfo
>===================================================================
>--- multimedia/universal-media-server/distinfo	(revision 361766)
>+++ multimedia/universal-media-server/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (UMS-4.0.0-a1.tgz) = 054988dd3ceb98d2ef93a1214f31b3834d1a69e12ad37b41a46294afccad61fe
>-SIZE (UMS-4.0.0-a1.tgz) = 31503844
>+SHA256 (UMS-4.0.0-b1.tgz) = 06fc344db1b8e439cbbe5a67c65f52d5aaee8fa571ebb4cb76ba293087b62031
>+SIZE (UMS-4.0.0-b1.tgz) = 31516062
>Index: multimedia/universal-media-server/pkg-descr
>===================================================================
>--- multimedia/universal-media-server/pkg-descr	(revision 361766)
>+++ multimedia/universal-media-server/pkg-descr	(working copy)
>@@ -7,9 +7,15 @@
> Powered by MEncoder, FFmpeg, tsMuxeR, AviSynth, MediaInfo and more,
> which combine to offer support for a wide range of media formats.
> 
>-See also: http://www.universalmediaserver.com/
> 
>-NOTE: Missing transcoder dependancies can be installed seperately.
>-See files/pkg-message.in for more information.
>+IMPORTANT NOTE:
> 
>+All the missing transcoder dependancies CAN be installed seperately.
>+NOT needed to re-build this port from scratch to select options.
>+
>+Please read: 'files/pkg-message.in' in the port directory for more
>+information about how to best install these missing dependancies.
>+
>+
>+See also: http://www.universalmediaserver.com/
> WWW: http://sourceforge.net/projects/unimediaserver/
>Index: multimedia/universal-media-server/files/pkg-message.in
>===================================================================
>--- multimedia/universal-media-server/files/pkg-message.in	(revision 361766)
>+++ multimedia/universal-media-server/files/pkg-message.in	(working copy)
>@@ -18,19 +18,21 @@
>   %%UMS_PROFILE_PATH%%/debug.log
> 
> NOTE: None of the following transcoders are installed by default
>-ffmpeg, mplayer, vlc, mencoder
>+ffmpeg, mplayer, vlc, mencoder, linux-tsmuxer
> 
> These missing transcoders each have a lot of dependancies of their 
> own. That is why they are not included by default with UMS.
> UMS will automatically detect any missing transcoder once it has
> been installed. Either from the ports tree or pkgng.
> 
>-NOTE: Mencoder is license restricted and therefore NOT available 
>-from pkgng. It can be installed from the ports tree instead.
>+NOTE: 'mencoder' is license restricted and therefore NOT available 
>+from pkgng. But it can be installed from the ports tree instead.
> 
>+NOTE: 'tsmuxer' requires the kernel module 'linux.ko' to be loaded.
>+
> To install all missing transcoders: (beware, many dependancies)
> 
>-  pkg install ffmpeg mplayer vlc
>+  pkg install ffmpeg mplayer vlc linux-tsmuxer
>+  sysrc linux_enable=YES && kldload linux.ko
>   cd /usr/ports/multimedia/mencoder && BATCH=YES make install
>   service %%RCNAME%% restart
>-
>Index: multimedia/universal-media-server/pkg-plist
>===================================================================
>--- multimedia/universal-media-server/pkg-plist	(revision 361766)
>+++ multimedia/universal-media-server/pkg-plist	(working copy)
>@@ -85,6 +85,7 @@
> %%DATADIR%%/renderers/Realtek.conf
> %%DATADIR%%/renderers/SMP-N100.conf
> %%DATADIR%%/renderers/Samsung-SMT-G7400.conf
>+%%DATADIR%%/renderers/SamsungAllShare-CD.conf
> %%DATADIR%%/renderers/SamsungAllShare-D7000.conf
> %%DATADIR%%/renderers/SamsungAllShare.conf
> %%DATADIR%%/renderers/SamsungMobile.conf
>@@ -111,16 +112,20 @@
> %%DATADIR%%/ums.jar
> %%DATADIR%%/web/background-blank.jpg
> %%DATADIR%%/web/background.jpg
>+%%DATADIR%%/web/button-search.png
> %%DATADIR%%/web/download.png
> %%DATADIR%%/web/favicon.ico
> %%DATADIR%%/web/flowplayer.min.js
> %%DATADIR%%/web/functional.css
>+%%DATADIR%%/web/inputbackground-search.png
> %%DATADIR%%/web/jquery.min.js
> %%DATADIR%%/web/jquery.ums.js
> %%DATADIR%%/web/logo.png
> %%DATADIR%%/web/menu-background-content.png
> %%DATADIR%%/web/menu-left-content.png
> %%DATADIR%%/web/reset.css
>+%%DATADIR%%/web/web-narrow.css
>+%%DATADIR%%/web/web-wide.css
> %%DATADIR%%/web/web.css
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/css
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images
>Index: multimedia/universal-media-server/Makefile
>===================================================================
>--- multimedia/universal-media-server/Makefile	(revision 361766)
>+++ multimedia/universal-media-server/Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # Created by: Dreamcat4 <dreamcat4@gmail.com>
>-# $FreeBSD$
>+# $FreeBSD: head/multimedia/universal-media-server/Makefile 361621 2014-07-12 15:22:00Z pi $
> 
> PORTNAME=	universal-media-server
>-DISTVERSION=	4.0.0-a1
>+DISTVERSION=	4.0.0-b1
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/unimediaserver/Official%20Releases/Linux
> DISTFILES=	UMS-${DISTVERSION}.tgz
>@@ -18,7 +18,7 @@
> JAVA_RUN=	true
> 
> OPTIONS_DEFINE=		MEDIAINFO FLAC DCRAW TSMUXER FFMPEG MPLAYER VLC MENCODER
>-OPTIONS_DEFAULT=	MEDIAINFO FLAC DCRAW TSMUXER
>+OPTIONS_DEFAULT=	MEDIAINFO FLAC DCRAW
> 
> MEDIAINFO_DESC=		Metadata information about video & audio files
> MEDIAINFO_LIB_DEPENDS=	libmediainfo.so:${PORTSDIR}/multimedia/mediainfo

Flags:

dreamcat4: maintainer-approval+

Actions: View | Diff

Attachments on bug 191859: 144647 | 144651