commit: cb5f940755abbd0a20e50f797535fae7365de6f6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 21:00:34 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 22:29:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5f9407
media-video/vlc: Drop obsolete libupnp:1.8 patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch | 24 ----------------------
.../vlc/files/vlc-9999-libupnp-slot-1.8.patch | 24 ----------------------
media-video/vlc/vlc-3.0.21_p20250217-r3.ebuild | 3 ---
media-video/vlc/vlc-3.0.9999.ebuild | 3 ---
media-video/vlc/vlc-9999.ebuild | 3 ---
5 files changed, 57 deletions(-)
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
deleted file mode 100644
index ab501e4e67a5..000000000000
--- a/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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:])
-
diff --git a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
deleted file mode 100644
index 15ffc6af6fa4..000000000000
--- a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/modules/services_discovery/upnp-wrapper.hpp 2017-12-25
18:17:33.358015500 +0100
-+++ b/modules/services_discovery/upnp-wrapper.hpp 2017-12-25
18:30:45.158167813 +0100
-@@ -35,8 +35,8 @@
- #include <algorithm>
- #include <assert.h>
-
--#include <upnp.h>
--#include <upnptools.h>
-+#include <upnp-1.8/upnp.h>
-+#include <upnp-1.8/upnptools.h>
-
- #if UPNP_VERSION < 10800
- typedef void* UpnpEventPtr;
-
---- 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:])
diff --git a/media-video/vlc/vlc-3.0.21_p20250217-r3.ebuild
b/media-video/vlc/vlc-3.0.21_p20250217-r3.ebuild
index 6855ce968ad5..7e8b18a15ffc 100644
--- a/media-video/vlc/vlc-3.0.21_p20250217-r3.ebuild
+++ b/media-video/vlc/vlc-3.0.21_p20250217-r3.ebuild
@@ -238,9 +238,6 @@ src_prepare() {
# bug 608256
xdg_environment_reset
- has_version 'net-libs/libupnp:1.8' && \
- eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
# Bootstrap when we are on a git checkout.
if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* ]] ; then
./bootstrap
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index 53923dfbd20c..a7e5825699a1 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -253,9 +253,6 @@ src_prepare() {
# bug 608256
xdg_environment_reset
- has_version 'net-libs/libupnp:1.8' && \
- eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
# Bootstrap when we are on a git checkout.
if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* ]] ; then
./bootstrap
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 31fab379ad34..8ab8b3c1dc1e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -253,9 +253,6 @@ src_prepare() {
# bug 608256
xdg_environment_reset
- has_version 'net-libs/libupnp:1.8' && \
- eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
-
# Bootstrap when we are on a git checkout.
if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* ]] ; then
./bootstrap
