Updated то 1.2.1

This commit is contained in:
VictorR2007 2017-09-12 13:13:21 +03:00
parent a4fb358475
commit bb7f2fe7d6
4 changed files with 226 additions and 141 deletions

12
minidlna-1.1.6.l10n.patch Normal file
View file

@ -0,0 +1,12 @@
diff -urN minidlna-1.1.6/po/ru.po minidlna-1.1.6-patched/po/ru.po
--- minidlna-1.1.6/po/ru.po 2016-06-17 00:29:22.000000000 +0300
+++ minidlna-1.1.6-patched/po/ru.po 2016-12-03 15:52:23.760011832 +0300
@@ -87,7 +87,7 @@
#: scanner.c:598
msgid "Recently Added"
-msgstr ""
+msgstr "Недавно Добавленные"
#: scanner.c:536
msgid "Video"

View file

@ -1,134 +1,189 @@
.\" Man page for minidlna.conf
.\"
.\" This man page is based on the comments in the default configuration file
.\" shipped with the minidlna source. Consequently, it is licensed under the
.\" GPLv2.
.\"
.\" Copyright (C) 2009 Justin Maggard <jmaggard@users.sourceforge.net>
.\" Copyright (C) 2010 Benoît Knecht <benoit.knecht@fsfe.org>
.\"
.\" This package is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License version 2 as
.\" published by the Free Software Foundation.
.\"
.\" This package is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>
.\"
.\" On Debian systems, the complete text of the GNU General
.\" Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
.Dd 22 October, 2010
.Dt MINIDLNA.CONF \&5 "File Formats Manual"
.Os Debian
.Sh NAME
.Nm minidlna.conf
.Nd MiniDLNA server configuration file
.Sh SYNOPSIS
.Nm /etc/minidlna.conf
.Sh DESCRIPTION
.Xr minidlna 1
reads configuration options from the system-wide configuration file
.Pa /etc/minidlna.conf ,
or the file specified with
.Fl f
on the command line. The file contains keyword-argument pairs, one per line.
Lines starting with
.Ql #
and empty lines are interpreted as comments.
.Pp
The possible
keywords and their meanings are as follows:
.Bl -tag -width Ds
.It Cm album_art_names
List of filenames to check for when searching for album art cache, separated by
forward slashes
.Pq Ql / .
.It Cm db_dir
Path to the directory
.Nm minidlna
should use to store its database and album art cache. Uses
.Pa /var/lib/minidlna
by default.
.It Cm enable_tivo
Set to
.Ql yes
to enable support for streaming JPEG and mp3 files to a TiVo supporting HMO.
Set to
.Ql no
otherwise.
.It Cm friendly_name
Customize the name that the
.Nm minidlna
server sends to clients.
.It Cm inotify
Set to
.Ql yes
to enable inotify monitoring of the files under
.Cm media_dir
to automatically discover new files. Set to
.Ql no
to disable inotify.
.It Cm log_dir
Path to the directory where the log file should be stored. Defaults to
.Pa /var/log .
.It Cm media_dir
Path to the directory containing the media files the
.Nm minidlna
server should share. Use this option several times if you have more than one
directory to share. To restrict a path to one specific media type, you can use
the following syntax: the letter
.Ql A ,
.Ql V
or
.Ql P ,
followed by a comma
.Pq Ql \&,
followed by the path. The meaning of the first letter is as follows:
.Bl -bullet -offset indent -compact
.It
.Ql A
for audio files;
.It
.Ql V
for video files;
.It
.Ql P
for image files.
.El
For example, if you want to include only video files located under the
.Pa /opt/media/videos
directory, you would use
.Cm media_dir=V,/opt/media/videos .
.It Cm model_number
Set the model number reported to clients.
.It Cm network_interface
Network interface to bind to.
.It Cm notify_interval
Set the notify interval, in seconds. The default is 895 seconds.
.It Cm port
Port for HTTP traffic. Defaults to port 80.
.It Cm presentation_url
.\" TODO: Needs a better description.
Define the presentation URL.
.It Cm serial
Set the serial number reported to clients.
.It Cm strict_dlna
Set to
.Ql yes
to strictly adhere to DLNA standards. This will allow server-side downscaling
of very large JPEG images, which may hurt JPEG serving performance on (at
least) Sony DLNA products. Set to
.Ql no
otherwise.
.El
.Sh FILES
.Bl -tag -width Ds
.It Pa /etc/minidlna.conf
System-wide default configuration file.
.El
.Sh SEE ALSO
.Xr minidlna 1
.\" minidlna.conf man page
.TH minidlna.conf 5 "October 2012"
.SH NAME
minidlna
.SH DESCRIPTION
.PP
.B minidlna
is a light weight but very functional DLNA server. In most cases, the defaults
do not need modifications. The global configuration file is /etc/minidlna.conf
but local users without system root access can run minidlna with their own
configuration file.
.SH OPTIONS
.PP
The following are user configurable options in /etc/minidlna.conf.
minidlna runs by default as user nobody, so make sure system permissions are
set correctly for read access to media and write access to cache and log dirs.
.IP "\fBfriendly_name\fP"
The name you want your media server seen as, EG: friendly_name=Home Media Server
.IP "\fBport\fP"
.nf
Port for HTTP (descriptions, SOAP, media transfer) traffic etc, defaults to 8200.
There should be no need to change this.
.fi
.IP "\fBnetwork_interface\fP"
Network interfaces to serve, comma delimited. Defaults to all.
.IP "\fBstrict_dlna\fP"
.nf
Set this to strictly adhere to DLNA standards.
This will allow server-side downscaling of very large JPEG images,
which may hurt JPEG serving performance on (at least) Sony DLNA products.
.fi
.IP "\fBnotify_interval\fP"
Notify interval in seconds. The default is 895 seconds.
.IP "\fBminissdpdsocket\fP"
.nf
Specify the path to the MiniSSDPd socket,
EG: minissdpdsocket=/var/run/minissdpd.sock
.fi
.IP "\fBserial\fP"
.nf
Serial number the daemon will report to clients in its XML description.
Defaults to 12345678
.fi
.IP "\fBmodel\fP"
.nf
Model number the daemon will report to clients in its XML description.
Defaults to 1
.fi
.IP "\fBmedia_dir\fP"
.nf
Path to the directory containing the media files minidlna should share.
Use this option multile times if you have more than one directory to share.
Example:
media_dir=/opt/multimedia/videos
media_dir=/opt/multimedia/movies
.fi
.PP
You can also restrict an entry to a specific media type, you do this
by using the following syntax:
.nf
the letter 'A', 'V' or 'P', followed by a comma (',') followed by the path.
The meaning of the first letter is as follows:
'A' for audio files
'V' for video files
'P' for image files
For example, if you want to include only video files located
in /opt/multimedia/videos directory, and only music
in /opt/multimedia/music, then you would use
media_dir=V,/opt/multimedia/videos
media_dir=A,/opt/multimedia/music
Another example would be
media_dir=V,/opt/multimedia/videos
media_dir=V,/opt/multimedia/movies
media_dir=A,/opt/multimedia/music
Or, if you did not care what type it finds, then you could use
media_dir=/opt/multimedia/videos
media_dir=/opt/multimedia/movies
media_dir=/opt/multimedia/music
You can mix it up, find anything in music, but only Videos, in videos and movies
media_dir=V,/opt/multimedia/videos
media_dir=V,/opt/multimedia/movies
media_dir=/opt/multimedia/music
.fi
.IP "\fBpresentation_url\fP"
.nf
Default presentation url is http address on port 80
EG: presentation_url=http://www.mediaserver.lan/index.php
.fi
.IP "\fBdb_dir\fP"
Where minidlna stores the data files, including Album caceh files, by default
this is /var/cache/minidlna
.IP "\fBlog_dir\fP"
Path to the directory where the log file upnp-av.log should be stored, this
defaults to /var/log
.IP "\fBlog_level\fP"
Set this to change the verbosity of the information that is logged each
section can use a different level: off, fatal, error, warn, info, or debug
.nf
Example
log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn
.fi
.IP "\fBinotify\fP"
Set to 'yes' to enable inotify monitoring of the files under media_dir
to automatically discover new files. Set to 'no' to disable inotify.
.IP "\fBalbum_art_names\fP"
This should be a list of file names to check for when searching for album art
and names should be delimited with a forward slash ("/").
.nf
Example
album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg
/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
.fi
.IP "\fBenable_tivo\fP"
Set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo
supporting HMO, default is no.
.IP "\fBroot_container\fP"
Use a different container as the root of the tree exposed to clients.
.nf
The possible values are:
'.' to use the standard container (this is the default)
'B' to use the "Browse Directory" container;
'M' to use the "Music" container;
'V' to use the "Video" container;
'P' to use the "Pictures" container.
If you specify 'B' and the client device is audio only, then
"Music/Folders" will be used as root container and you wont see Videos.
.fi
.IP "\fBforce_sort_criteria\fP"
Always force SortCriteria to this value, regardless of the SortCriteria passed by the client.
.nf
Example
force_sort_criteria=+upnp:class,+upnp:originalTrackNumber,+dc:title
.fi
.IP "\fBwide_links\fP"
Set to 'yes' to allow symlinks that point outside user-defined media_dirs.
By default, wide symlinks are not followed.
.SH VERSION
This manpage corresponds to minidlna version 1.0.25
.SH AUTHOR
.nf
minidlna developed by Justin Maggard https://sourceforge.net/projects/minidlna/
man page written by Noel Butler <noelb@ausics.net>
.fi
.SH LICENSE
GPL
.SH FILES
/etc/minidlna.conf
.SH SEE ALSO
minidlna(8)

View file

@ -1,12 +1,12 @@
[Unit]
Description=MiniDLNA is a DLNA/UPnP-AV server software
After=syslog.target local-fs.target network.target
After=network.target
[Service]
User=minidlna
Group=minidlna
Type=simple
ExecStart=/usr/sbin/minidlnad -S
Type=forking
PIDFile=/var/run/minidlna.pid
ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid
PIDFile=/run/minidlna/minidlna.pid
[Install]
WantedBy=multi-user.target

View file

@ -1,6 +1,6 @@
Summary: A DLNA/UPnP-AV compliant media server
Name: minidlna
Version: 1.1.5
Version: 1.2.1
Release: 1
License: GPLv2+
Group: Networking/Other
@ -10,6 +10,7 @@ Source2: minidlna-tmpfiles.conf
Source3: minidlna.1
Source4: minidlna.conf.5
Source5: %{name}.service
Patch0: minidlna-1.1.6.l10n.patch
BuildRequires: pkgconfig(flac)
BuildRequires: libid3tag-devel
BuildRequires: libexif-devel
@ -17,7 +18,15 @@ BuildRequires: jpeg-devel
BuildRequires: pkgconfig(sqlite3)
BuildRequires: ffmpeg-devel >= 1.1
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: systemd
BuildRequires: pkgconfig
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: gettext-devel
Requires(post): rpm-helper
Requires(preun): rpm-helper
Requires(postun): rpm-helper
@ -32,10 +41,14 @@ and http://www.dlna.org/ for mode details on DLNA.
%prep
%setup -q
%patch0 -p1
%build
%serverbuild
CPPFLAGS="`pkg-config --cflags libavcodec libavformat libavutil`"
export CPPFLAGS
./autogen.sh
%configure2_5x \
--with-log-path=%{_logdir} \
--with-db-path=%{_localstatedir}/cache \
@ -53,6 +66,11 @@ install -m 644 -D minidlna.conf %{buildroot}%{_sysconfdir}/minidlna.conf
install -m 644 -D %{SOURCE3} %{buildroot}%{_mandir}/man1/minidlna.1
install -m 644 -D %{SOURCE4} %{buildroot}%{_mandir}/man5/minidlna.conf.5
sed 's|#friendly_name=My DLNA Server|friendly_name=Rosa|' -i %{buildroot}%{_sysconfdir}/minidlna.conf
sed 's|#db_dir=/var/cache/minidlna|db_dir=/var/cache/minidlna|' -i %{buildroot}%{_sysconfdir}/minidlna.conf
sed 's|#log_dir=/var/log|log_dir=/var/log|' -i %{buildroot}%{_sysconfdir}/minidlna.conf
sed 's|#wide_links=no|wide_links=yes|' -i %{buildroot}%{_sysconfdir}/minidlna.conf
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf