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 7C72F139084 for ; Sat, 9 Dec 2017 13:52:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E095BE0F51; Sat, 9 Dec 2017 13:52:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 AE827E0F51 for ; Sat, 9 Dec 2017 13:52:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 92413340BEA for ; Sat, 9 Dec 2017 13:52:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22726AE77 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: <1512827542.eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch media-video/vlc/vlc-2.2.9999.ebuild media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-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: eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29 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: 7919218e-fd0d-4b6b-a556-d6f864f224db X-Archives-Hash: b6b46a8fb372e245f5c9d559e58fcee1 commit: eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 13:20:43 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 13:52:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebfeb8b media-video/vlc: Fix configure with slotted >=net-libs/libupnp-1.8 Package-Manager: Portage-2.3.17, Repoman-2.3.6 .../vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch | 24 ++++++++++++++++++++++ media-video/vlc/vlc-2.2.9999.ebuild | 2 ++ media-video/vlc/vlc-3.0.9999.ebuild | 2 ++ media-video/vlc/vlc-9999.ebuild | 2 ++ 4 files changed, 30 insertions(+) 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 00000000000..ab501e4e67a --- /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 + #include + +-#include +-#include ++#include ++#include + + #include + +--- 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-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index 1b50d864a4b..223c1ec8989 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -230,6 +230,8 @@ src_unpack() { src_prepare() { default + has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + # Remove unnecessary warnings about unimplemented pragmas on gcc for now. # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc. # diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 0492df5372d..1eeebe1b56d 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default + has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then ./bootstrap diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 0492df5372d..1eeebe1b56d 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default + has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then ./bootstrap