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

View file

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