From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A71051388BF for ; Sun, 10 Jan 2016 20:37:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16CAD21C006; Sun, 10 Jan 2016 20:37:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F0D721C006 for ; Sun, 10 Jan 2016 20:37:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFC7534070F for ; Sun, 10 Jan 2016 20:37:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31C9AC79 for ; Sun, 10 Jan 2016 20:37:40 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1452458246.245ec6adbd16742786282dd6a06814a24d1a7567.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild X-VCS-Directories: games-strategy/s25rttr/ games-strategy/s25rttr/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 245ec6adbd16742786282dd6a06814a24d1a7567 X-VCS-Branch: master Date: Sun, 10 Jan 2016 20:37:40 +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: 1b3fe864-ca13-4942-ae8a-39342da5028d X-Archives-Hash: f9461d618972f704f4d9463e562daba5 commit: 245ec6adbd16742786282dd6a06814a24d1a7567 Author: David Seifert gentoo org> AuthorDate: Sun Jan 10 19:56:32 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 10 20:37:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245ec6ad Revbump, include patch for miniUPnPc API breakage Package-Manager: portage-2.2.26 .../files/s25rttr-0.8.1-miniupnpc-api-14.patch | 36 +++++++ games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild | 110 +++++++++++++++++++++ 2 files changed, 146 insertions(+) diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch new file mode 100644 index 0000000..d2ff0ee --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch @@ -0,0 +1,36 @@ +From 3b08b907235c09ab84e3bb23d1e05fe5a1d1c00e Mon Sep 17 00:00:00 2001 +From: Manuel Zeise +Date: Sun, 3 Jan 2016 16:54:05 +0100 +Subject: [PATCH] Switch for miniUPnPc API version 14 and above + +API version 14 of miniUPnPc has introduced a new TTL argument to +upnpDiscover() with a recommended default value of 2. A new preprocessor +statement evaluates the API version and selects the correct version of +upnpDiscover() based on the API version. + +--- s25rttr-0.8.1/libutil/src/UPnP.cpp ++++ s25rttr-0.8.1/libutil/src/UPnP.cpp +@@ -210,7 +210,11 @@ + UPNPDev* devicelist = NULL; + #ifdef UPNPDISCOVER_SUCCESS + int upnperror = 0; ++#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */ ++ devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror); ++#else + devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror); ++#endif + #else + devicelist = upnpDiscover(2000, NULL, NULL, 0); + #endif +@@ -276,7 +280,11 @@ + UPNPDev* devicelist = NULL; + #ifdef UPNPDISCOVER_SUCCESS + int upnperror = 0; ++#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */ ++ devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror); ++#else + devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror); ++#endif + #else + devicelist = upnpDiscover(2000, NULL, NULL, 0); + #endif diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild new file mode 100644 index 0000000..9f39e6b --- /dev/null +++ b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils cmake-utils gnome2-utils games + +DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)" +HOMEPAGE="http://www.siedler25.org/" +# no upstream source tarball yet +# https://bugs.launchpad.net/s25rttr/+bug/1069546 +SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug glfw" + +RDEPEND="app-arch/bzip2 + media-libs/libsamplerate + media-libs/libsdl[X,sound,opengl,video] + media-libs/libsndfile + media-libs/sdl-mixer[vorbis] + net-libs/miniupnpc + virtual/libiconv + virtual/opengl + glfw? (