Menu

Git Merge Request #37: Subtitles with country code and an assortment of patches (open)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Sérgio M. Basto wants to merge 23 commits from /u/sergiomb/minidlna/ to master, 2023-10-09

Since 0763719 tagutils: Fix spurious warnings with ogg coverart (master)

I propose merge all Debian patches for minidlna package [1] and more patches picked in sourceforge tickets .

Patches :
- https://sourceforge.net/p/minidlna/patches/149/ Multiple subtitles support (protocolInfo) It make subtibles with coutry code work [2],
- https://sourceforge.net/p/minidlna/support-requests/71/ upnphttp.c: fix CallStranger a.k.a. CVE-2020-12695
- https://sourceforge.net/p/minidlna/patches/176/ webOS TV 3.5 flac support
- https://sourceforge.net/p/minidlna/patches/177/ Force sorting by path
- https://sourceforge.net/p/minidlna/patches/160/ Add support for time-based seek
- https://sourceforge.net/p/minidlna/patches/152/ Favicon support

[1]
https://tracker.debian.org/pkg/minidlna
https://salsa.debian.org/debian/minidlna/-/tree/master/debian/patches

[2]
https://sourceforge.net/p/minidlna/support-requests/33/ "Support multiple subtitles"

ba3c6ea Patches/149 Multiple subtitles support (protocolInfo)
940a4c8 https://sourceforge.net/p/minidlna/patches/152/
1f9bf5f https://sourceforge.net/p/minidlna/patches/160/
2b6421a Update .gitignore
adabb36 https://sourceforge.net/p/minidlna/patches/177/
ccb9066 https://sourceforge.net/p/minidlna/patches/176/
312b17c https://sourceforge.net/p/minidlna/support-requests/71/
70ea590 15-use-newer-ip_multicast_if-api
617d526 14-fix-gcc10-ftbfs.patch
e574bde 13-missing-ru-po.patch
404316f 07-fix-multi-artist-album-handling.patch
3ebd64a 03-make-sure-the-database-is-closed-after-scanning
28d2602 02-use-USER-instead-of-LOGNAME.patch
5a72ad1 01-run-instead-of-var-run.patch
Commit Date  
[91684b] (HEADmaster) by Sérgio M. Basto Sérgio M. Basto

fix build with musl-1.2.0 sf.net/p/minidlna/patches/182/

2021-12-20 01:51:32 Tree
[964cd2] by Sérgio M. Basto Sérgio M. Basto

nonlocal-queries - sf.net/p/minidlna/patches/181/

2021-12-19 03:22:14 Tree
[7e5175] by Sérgio M. Basto Sérgio M. Basto

musicAlbum_date and fix-multi-artist-album-handling

- sf.net/p/minidlna/patches/162/

- patch from Debian (07-fix-multi-artist-album-handling.patch)

Author: Florian Will <florian.will@...>
Forwarded: http://sourceforge.net/p/minidlna/bugs/246/
Bug-Debian: https://bugs.debian.org/734383
Last-Update: 2015-03-09
Subject: [PATCH] Ignore artist when looking up existing container

This prevents creation of multiple album containers for compilation
albums (i.e. one separate album for each artist) when adding files via
inotify, which causes the scanner cache to be invalidated all the time.

OTOH, different albums with identical names ("Greatest Hits", "Love
Songs") are now listed as just a single album in the "Album" container.
This might be solved using some heuristic based on music file location
(same directory / different directories).

The new behaviour is usually the same as encountered when doing a full
rescan, because there's a scanner cache that is used during full rescans
and that cache ignores artist names as well.

2020-10-03 23:33:06 Tree
[12ea13] by Sérgio M. Basto Sérgio M. Basto

improve response speed sf.net/p/minidlna/patches/144/

modified image_utils.c to improve response speed.

2021-12-05 23:16:20 Tree
[2b06d5] by Sérgio M. Basto Sérgio M. Basto

Labox Numericable sf.net/p/minidlna/patches/129/

Fix the subtitles where not presented to my client (Labox Numericable).

2021-12-05 22:30:09 Tree
[577674] by Sérgio M. Basto Sérgio M. Basto

Favicon support sf.net/p/minidlna/patches/152/

2020-10-04 02:54:13 Tree
[b515d3] by Sérgio M. Basto Sérgio M. Basto

What's new list sf.net/p/minidlna/patches/122/

from with whitespaces fixes
commit edbb827e57ed65f0d25a26bacdc046130efc3e2f
Author: Eduardo Rocha <folhabranca@...>
Date: Sun Sep 14 13:36:58 2014 -0300

upnpsoap: Adding support to "What's new list" of Samsung TVs ES series

2021-12-05 20:49:47 Tree
[8c73dd] by Sérgio M. Basto Sérgio M. Basto

upnphttp.c: fix CallStranger a.k.a. CVE-2020-12695

https://sourceforge.net/p/minidlna/support-requests/71/
Import CheckCallback function from miniupnpd source code:
https://github.com/miniupnp/miniupnp/commit/0d9634658860c3c8c209e466cc0ef7002bad3b0a

IPv6 code was kept even if minidlna does not support it currently

This code is licensed under BSD-3-Clause like minidlna.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@...>

2020-10-04 00:22:59 Tree
[d28a30] by Sérgio M. Basto Sérgio M. Basto

Debian 03-make-sure-the-database-is-closed-after-scanning + select_use_after_free.patch

Joined :
- Author: Benoît Knecht <benoit.knecht@...>
Description: Make sure the database is closed after scanning

- Fix core dump (fix potential use-after-free in child process)

https://sourceforge.net/p/minidlna/bugs/333/

also applied in RPMFusion
https://pkgs.rpmfusion.org/cgit/free/minidlna.git/tree/minidlna-1.3.0-select_use_after_free.patch?id=833fae19709871397c7749b46fef3977375f0669

2020-10-03 22:57:46 Tree
[5694cf] by Sérgio M. Basto Sérgio M. Basto

Added live thumbinails generation

based from here
https://sourceforge.net/u/meniona/minidlna/ci/95c8fa4b6a229db9f5fcedb1c724f3faa2f9f3cc/
and here https://sourceforge.net/u/meniona/minidlna/ci/a425be7fa341303aba178430fcbea38ac3f3ccaa/
without whitespaces difrences

2021-12-27 22:31:46 Tree
[f0edd2] by Eric Toombs Eric Toombs , pushed by Sérgio M. Basto Sérgio M. Basto

Added opus support.

The changes are identical to the patch provided in https://sourceforge.net/p/minidlna/patches/133/, but without changing the existing behaviour of ogg. That can happen on a different commit.

2022-05-30 22:08:30 Tree
[061fcb] by Sérgio M. Basto Sérgio M. Basto

minidlna_vdr - sf.net/p/minidlna/patches/166/

2021-12-19 03:17:17 Tree
[f0c69c] by Sérgio M. Basto Sérgio M. Basto

Added support to read titles from MKV metadata, just like MP4 and MOV files.

https://sourceforge.net/p/minidlna/patches/127/

2021-12-05 21:57:14 Tree
[2b1432] by Sérgio M. Basto Sérgio M. Basto

we may enable debug option without verbose option

2023-10-08 20:41:51 Tree
[6ff147] by Sérgio M. Basto Sérgio M. Basto

Improve usage descriptions

2023-10-08 20:39:45 Tree
[380ed9] by Sérgio M. Basto Sérgio M. Basto

Update .gitignore

2023-10-08 20:39:26 Tree
[8d0c84] by Sérgio M. Basto Sérgio M. Basto

man page fixes

Add to man page -r (rescan) and -v options and other fixes

2023-10-08 20:38:16 Tree
[d0a4bd] by Sérgio M. Basto Sérgio M. Basto

non-destructive rescan sf.net/p/minidlna/patches/172/ v3

manual-non-destructive-rescan_v2.patch

+ Fix for manual-non-destructive-rescan_v2.patch

https://sourceforge.net/p/minidlna/patches/172/#e18c/0351/4ed0/546d

2023-10-08 18:58:04 Tree
[62de5b] by Sérgio M. Basto Sérgio M. Basto

Darkvater/multiple_captions support scanning multiple captions for a media v2

This is the squash of all commits from
https://github.com/Darkvater/minidlna branch multiple_captions

and also replaces sf.net/patches/149 Multiple subtitles support that was in
this repo

2023-10-08 18:57:44 Tree
[14de2d] by Sérgio M. Basto Sérgio M. Basto

add systemd unitdir and systemd-tmpfile

2021-12-27 01:49:37 Tree
[50bbc8] by Sérgio M. Basto Sérgio M. Basto

install man pages

2021-12-27 00:09:41 Tree
[e9ed94] by Barak A. Pearlmutter Barak A. Pearlmutter , pushed by Sérgio M. Basto Sérgio M. Basto

autoconf version

2022-11-13 22:23:34 Tree
[96eb5d] by Sérgio M. Basto Sérgio M. Basto

01-run-instead-of-var-run.patch

Author: Benoît Knecht <benoit.knecht@...>
Use /run instead of /var/run to store runtime files

2020-10-03 22:56:31 Tree

Discussion

  • Sérgio M. Basto

     

    Last edit: Sérgio M. Basto 2021-12-27
  • Sérgio M. Basto

     

    Last edit: Sérgio M. Basto 2021-12-27
  • Sérgio M. Basto

    dropped patch time based support (not good)

    • b740ff5 2021-12-27 20:35 Sérgio M. Basto (origin/master, origin/HEAD) Darkvater/multiple_captions support scanning multiple captions for a media

    is the most important commit

     
  • Sérgio M. Basto

    new commit series (1)

    • the first 4 already are in use by downstream like Fedora or Debian
    • new version of commit multiple_captions support scanning multiple captions for a media 62de5b6
    • new version of commit forces a rescan while server is running d0a4bd3
    • new trivial fixes on man pages, usage description and .gitignore
    • more some trivial and harmless patches
    • enable opus support
    • added live thumbs generation

    (1)
    96eb5d9 2020-10-03 23:56 Sérgio M. Basto 01-run-instead-of-var-run.patch
    e9ed94a 2022-11-13 22:23 Barak A. Pearlmutter autoconf version
    50bbc89 2021-12-27 00:09 Sérgio M. Basto install man pages
    14de2d1 2021-12-27 01:49 Sérgio M. Basto (downstream) add systemd unitdir and systemd-tmpfile
    62de5b6 2023-10-08 19:57 Sérgio M. Basto Darkvater/multiple_captions support scanning multiple captions for a media v2
    d0a4bd3 2023-10-08 19:58 Sérgio M. Basto non-destructive rescan sf.net/p/minidlna/patches/172/ v3
    8d0c843 2023-10-08 21:38 Sérgio M. Basto man page fixes
    380ed9c 2023-10-08 21:39 Sérgio M. Basto Update .gitignore
    6ff147d 2023-10-08 21:39 Sérgio M. Basto Improve usage descriptions
    2b14323 2023-10-08 21:41 Sérgio M. Basto we may enable debug option without verbose option
    f0c69c0 2021-12-05 21:57 Sérgio M. Basto Added support to read titles from MKV metadata, just like MP4 and MOV files.
    061fcbe 2021-12-19 03:17 Sérgio M. Basto minidlna_vdr - sf.net/p/minidlna/patches/166/
    f0edd2f 2022-05-30 18:08 Eric Toombs Added opus support.
    5694cf0 2021-12-27 22:31 Sérgio M. Basto Added live thumbinails generation
    d28a300 2020-10-03 23:57 Sérgio M. Basto Debian 03-make-sure-the-database-is-closed-after-scanning + select_use_after_free.patch
    8c73ddb 2020-10-04 01:22 Sérgio M. Basto upnphttp.c: fix CallStranger a.k.a. CVE-2020-12695
    b515d3f 2021-12-05 20:49 Sérgio M. Basto What's new list sf.net/p/minidlna/patches/122/
    5776747 2020-10-04 03:54 Sérgio M. Basto Favicon support sf.net/p/minidlna/patches/152/
    2b06d5c 2021-12-05 22:30 Sérgio M. Basto Labox Numericable sf.net/p/minidlna/patches/129/
    12ea13e 2021-12-05 23:16 Sérgio M. Basto improve response speed sf.net/p/minidlna/patches/144/
    7e51753 2020-10-04 00:33 Sérgio M. Basto musicAlbum_date and fix-multi-artist-album-handling
    964cd2d 2021-12-19 03:22 Sérgio M. Basto nonlocal-queries - sf.net/p/minidlna/patches/181/

     

    Last edit: Sérgio M. Basto 2023-10-09

Log in to post a comment.