[3.0] Backport upnp contrib update (!1768) · Merge requests · VideoLAN / VLC

Merged Alaric Senat requested to merge asenat/vlc:backport-upnp-bump into 3.0.x 2 years ago

May 05, 2022

contrib: upnp: remove `--without-documentation` · 2baf4b09

Alaric Senat authored 3 years ago and

Steve Lhomme committed 2 years ago

This configure flag was dropped in 1.8.
See pupnp upstream 8abbd63b9a8190bcbbbbcbcff5cdbaaf83fbe99a

(cherry picked from commit 5f20a2b4)

2baf4b09

contrib: upnp: rename config options variable · a0db8719

Alaric Senat authored 4 years ago and

Steve Lhomme committed 2 years ago

Adding the `UPNP_` prefix just like the other variables will avoid
potential namespaces conflicts.

(cherry picked from commit 48cf7013)

a0db8719

contrib: upnp: unify `CONFIGURE_ARGS` · a9bfd4e5
Alaric Senat authored 3 years ago and Steve Lhomme committed 2 years ago
```
(cherry picked from commit cb610b5b)
```
a9bfd4e5

contrib: upnp: update to 1.14.11 · 9419aec1

Alaric Senat authored 4 years ago and

Steve Lhomme committed 2 years ago

libupnp 1.6 is starting to get really old and caused bugs recently with
the new winpthread rework for contribs.

Added contrib patches:
  - revert-ifaddrs.patch (revert changes breaking android)

Removed contrib patches:
  - 0001-Do-not-try[...]           -> Fixed upstream by 386b7ed7
  - dont_use_down_intf.patch       -> Fixed upstream by 1f2e3b88
  - fix_infinite_loop.patch        -> Fixed upstream by 4367cbfa
  - libpthread.patch               -> Replaced
  - missing_win32.patch            -> Fixed upstream by 02bb90c5
  - no-getifinfo.patch             -> Fixed upstream by 0296c3cd
  - use-inet-pton.patch            -> Fixed upstream by 44cdeeb7
  - use-unicode.patch              -> Fixed upstream
  - windows-random.patch           -> Fixed upstream by 44e092a6

Edited patches (mostly to fit the new sources):
  - miniserver.patch
  - upnp-no-debugfile.patch
  - pthread-w32-checks.patch (Partially fixed upstream by e0f44dd9)
  - libupnp-win32.patch (Partially fixed upstream)
  - libupnp-win64.patch (Partially fixed upstream by 421d5d28)
  - windows-version-inet.patch
  - libupnp-win32-exports.patch

Renamed patch:
  - pthread-w32-force -> pthread-force (Gets applied to linux too now)

(cherry picked from commit 4b31cb69)

9419aec1

extra: snap: build libupnp from contribs · 9d223a21

Alaric Senat authored 4 years ago and

Steve Lhomme committed 2 years ago

We will soon bump libupnp to a more recent version fixing
vulnerabilities for libupnp >= 1.8.3.
It might be preferable to switch to the contribs version of libupnp also
for snapcraft as our snap repo is still using `core18` which only
provides libupnp 1.6.

9d223a21

contrib: upnp: Remove mingw ipv6 patch · 43a5df25

Marvin Scholz authored 5 years ago and

Steve Lhomme committed 2 years ago

VLC needs Mingw-w64 v5.0 or higher , the define mentioned in the patch
was added in v3.0.0

(cherry picked from commit 6b94b967)

43a5df25

contrib: upnp: remove unapplied winrt patch · 5c7ba52a
Alaric Senat authored 3 years ago and Steve Lhomme committed 2 years ago
```
This patch was never used.

(cherry picked from commit cf47ddcc)
```
5c7ba52a

upnp: prioritize `UpnpInit2()` over `UpnpInit()` · de9c8cde

Alaric Senat authored 3 years ago and

Steve Lhomme committed 2 years ago

`UpnpInit` is deprecated since 1.8.3 and removed in 1.14. `UpnpInit2`
offer a better replacement, working for both ipv6 and ipv4. There is no
reason to keep using `UpnpInit` apart from keeping the module usable
with 1.6.

de9c8cde

upnp: remove pointless `#if` guards · 75bb776c

Alaric Senat authored 3 years ago and

Steve Lhomme committed 2 years ago

These functions are inline and will be removed by the compiler anyway if
unused. The #if guards add unecessary compexity.

(cherry picked from commit aaef25ce)

75bb776c

[3.0] Backport upnp contrib update

Merge request reports

Activity