From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26B54139083 for ; Sat, 9 Dec 2017 13:52:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 578E7E101E; Sat, 9 Dec 2017 13:52:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 305F9E101E for ; Sat, 9 Dec 2017 13:52:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 710D033D4A6 for ; Sat, 9 Dec 2017 13:52:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EBA3AE7E for ; Sat, 9 Dec 2017 13:52:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1512827543.34c95024aab1cfb361746997c55e1e44e5f037ab.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch media-video/vlc/vlc-2.2.9999.ebuild X-VCS-Directories: media-video/vlc/ media-video/vlc/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 34c95024aab1cfb361746997c55e1e44e5f037ab X-VCS-Branch: master Date: Sat, 9 Dec 2017 13:52:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9446e23e-7523-417c-87df-949c7fc602fa X-Archives-Hash: 837c3282e7bc0c7e55d22acf0c77465f commit: 34c95024aab1cfb361746997c55e1e44e5f037ab Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 13:27:31 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 13:52:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c95024 media-video/vlc: Fix +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 +--- + 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 + #include + +-#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/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index 977724b1c27..40efb3e5ac1 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -213,6 +213,8 @@ PATCHES=( # Bug #593460 "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch + + "${FILESDIR}"/${P}-libupnp-compat.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )