diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-10 09:09:16 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-10 09:09:16 +0000 |
commit | f45955e60d4da9b7f4a1088c98042f9c06669039 (patch) | |
tree | 25ff171e8813c8b99f79a424124ed214a9520850 /media-video/vlc/files | |
parent | b9ef7cab6264f1838672efbbcb4ba3b3abd5323f (diff) |
gentoo resync : 10.12.2017
Diffstat (limited to 'media-video/vlc/files')
-rw-r--r-- | media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch | 24 |
2 files changed, 52 insertions, 0 deletions
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch new file mode 100644 index 000000000000..57b66685ede0 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch @@ -0,0 +1,28 @@ +From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001 +From: Tristan Matthews <tmatth@videolan.org> +Date: Wed, 29 Nov 2017 10:45:04 -0500 +Subject: [PATCH] upnp: don't clash with libupnp's own compat code + +Fixes build for upnp >= 1.6.23 and less than 1.8. + +Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> +--- + modules/services_discovery/upnp.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp +index bdd3c55ee5..82d43632f4 100644 +--- a/modules/services_discovery/upnp.cpp ++++ b/modules/services_discovery/upnp.cpp +@@ -38,7 +38,7 @@ + #include <set> + #include <string> + +-#if UPNP_VERSION < 10800 ++#if UPNP_VERSION < 10623 + /* + * Compat functions and typedefs for libupnp prior to 1.8 + */ +-- +2.11.0 + diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch new file mode 100644 index 000000000000..ab501e4e67a5 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch @@ -0,0 +1,24 @@ +--- a/modules/services_discovery/upnp.hpp 2015-05-19 15:32:38.000000000 +0200 ++++ b/modules/services_discovery/upnp.hpp 2017-12-09 14:07:08.551654458 +0100 +@@ -28,8 +28,8 @@ + #include <vector> + #include <string> + +-#include <upnp/upnp.h> +-#include <upnp/upnptools.h> ++#include <upnp-1.8/upnp.h> ++#include <upnp-1.8/upnptools.h> + + #include <vlc_common.h> + +--- a/configure.ac 2017-12-09 14:09:12.956370304 +0100 ++++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100 +@@ -4046,7 +4046,7 @@ + dnl + dnl UPnP Plugin (Intel SDK) + dnl +-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto]) ++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto]) + + EXTEND_HELP_STRING([Misc options:]) + |