From patchwork Sun Dec 17 11:59:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 849606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FmBI4ip8"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z02lr4BPrz9t2M for ; Sun, 17 Dec 2017 22:59:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 69E3B87509; Sun, 17 Dec 2017 11:59:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q3Gxo1rTlUmS; Sun, 17 Dec 2017 11:59:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7121B87475; Sun, 17 Dec 2017 11:59:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 568AE1C2035 for ; Sun, 17 Dec 2017 11:59:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 521BE2CAB3 for ; Sun, 17 Dec 2017 11:59:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ENRwUEP88-jv for ; Sun, 17 Dec 2017 11:59:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by silver.osuosl.org (Postfix) with ESMTPS id 708A52C9A9 for ; Sun, 17 Dec 2017 11:59:44 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t8so24532315wmc.3 for ; Sun, 17 Dec 2017 03:59:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=em3W/tjY02q9suUg3E1oF3C5CmV/Y/5k9EfKrHsNtnU=; b=FmBI4ip88jjQ9+/pYqqZEr4esdkFwBnA78c28HcyAFDDW+aFdk63XKcolKn8BDqOAS k6pCxw8LI4IKGx92EtcuPt8nQRAqZKmBB4a0znJhpKOCLNJc1IrKIukdQHGLZBX8S8Nv p/bgFv8EYNqzsakQzvNvKpH5lTyV6w5pmGnHO8hICVYb7p6Nyd6ObqGt0qqTTi2D3e2x cNCPeCmuYClon8MGsH4PhG/8qzjS3JVYXhOf59S4laM9Ii4Q0pny3yY4ESQPo96UuvH3 x0ROxidv9s2h+nlrGL3TNqC+hghvHwAGmkf6oZcc2vvmri7+IgOzuUTQjWXPv1bI2UgN ZuuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=em3W/tjY02q9suUg3E1oF3C5CmV/Y/5k9EfKrHsNtnU=; b=jxSSkXQjPn/5xJfjcwIy7ela6cgIDSyCHxiXCxZcYEoZsRsAA4sb2bxq+nWkeDBvo6 IYi5e/OPK1KSZP3q/Of2X7HByvj/1vOM+rYF02vanODXnKHcPExp5AnD8brXgN/c/S8e ZLmFj02kOZ2ZGBaY7igZyEci42SJQYc82IV3OCPDejzd5c70ERcgz8x+r71YvzSZ+Q7H X+YCgVlnNiInaavIliH5xNkUmPoYahX42yMznuN6Ng1Es6vbr+qhUlDT9N9vFw4Ac+vW PnrFFNj2pEzfXE0xLsIUqGGzD+NGaSfwmPIX9Up27VNItbL86UUOyG0kV8yhfxwanr8+ HzTw== X-Gm-Message-State: AKGB3mJvJtwXRzrjyalMIuNVHuselcT8GGTWHhH49KMwAcxdNcXxpNwK 9EKNm5EzvQ4xo7mn6HiMYlcScA== X-Google-Smtp-Source: ACJfBosf2Z/Z71F9F/r2UNyMYa0kyU1oCwLUyGBrD0gbyMG6avYUi58xnaan6MLignyBxGAKhAWayA== X-Received: by 10.28.138.142 with SMTP id m136mr10475175wmd.40.1513511982461; Sun, 17 Dec 2017 03:59:42 -0800 (PST) Received: from fabrice-VirtualBox.home (ARennes-656-1-410-249.w92-135.abo.wanadoo.fr. [92.135.62.249]) by smtp.gmail.com with ESMTPSA id 90sm4488553wrp.93.2017.12.17.03.59.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 03:59:40 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 17 Dec 2017 12:59:32 +0100 Message-Id: <20171217115932.24429-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] vlc: fix build with libupnp above 1.6.23 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Backport patch already available upstream Fixes: - http://autobuild.buildroot.net/results/d98bdcc745a2480d4664db2427f0ae1c9c5ea71e Signed-off-by: Fabrice Fontaine --- .../0012-Fix-build-with-libupnp-above-1.6.23.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch diff --git a/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch b/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch new file mode 100644 index 0000000000..8490cbdaa2 --- /dev/null +++ b/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch @@ -0,0 +1,64 @@ +From 0c8d631f4f9fa24f1bbd56a4dbe9d6f1e2360685 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Dec 2017 12:26:33 +0100 +Subject: [PATCH] Fix build with libupnp above 1.6.23 + +Starting from this release, libupnp has its own compat functions, +backport patch from mainstream: +https://github.com/videolan/vlc/commit/f9c5a343f1a8cad9c2c153f9c05e4e7201675a43#diff-2e66eb8b4fb06845a6426bd4a541d2f7 + +Move UpnpEventPtr declaration in upnp.hpp as done in: +https://github.com/videolan/vlc/commit/3eb4e03512f45c1fa27c7f9a6759e8e7d3905720#diff-ac39568c5e5e1c68776a93dfe0b3c1e6 + +Signed-off-by: Fabrice Fontaine +--- + modules/services_discovery/upnp.cpp | 5 +---- + modules/services_discovery/upnp.hpp | 6 ++++++ + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp +index 9b6ed8727a..cf846602b8 100644 +--- a/modules/services_discovery/upnp.cpp ++++ b/modules/services_discovery/upnp.cpp +@@ -40,11 +40,10 @@ + #include + #include + +-#if UPNP_VERSION < 10800 ++#if UPNP_VERSION < 10623 + /* + * Compat functions and typedefs for libupnp prior to 1.8 + */ +-typedef void* UpnpEventPtr; + typedef Upnp_Discovery UpnpDiscovery; + typedef Upnp_Action_Complete UpnpActionComplete; + typedef Upnp_Event UpnpEvent; +@@ -74,8 +73,6 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_ + { + return p_s->Sid; + } +-#else +-typedef const void* UpnpEventPtr; + #endif + + /* +diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp +index 23fe4db9ab..c369a04da6 100644 +--- a/modules/services_discovery/upnp.hpp ++++ b/modules/services_discovery/upnp.hpp +@@ -33,6 +33,12 @@ + + #include + ++#if UPNP_VERSION < 10800 ++typedef void* UpnpEventPtr; ++#else ++typedef const void* UpnpEventPtr; ++#endif ++ + // Classes + class Container; + +-- +2.14.1 +