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 B858E1382C5 for ; Tue, 9 Mar 2021 08:46:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8ABD5E08BF; Tue, 9 Mar 2021 08:46:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6EA03E08BF for ; Tue, 9 Mar 2021 08:46:32 +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 D403A340942 for ; Tue, 9 Mar 2021 08:46:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C54056F for ; Tue, 9 Mar 2021 08:46:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1615279577.117f6634d01f2c89e614561de47351c9bdfef37a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/files/, games-emulation/vbam/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch games-emulation/vbam/vbam-2.1.4.ebuild X-VCS-Directories: games-emulation/vbam/ games-emulation/vbam/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 117f6634d01f2c89e614561de47351c9bdfef37a X-VCS-Branch: master Date: Tue, 9 Mar 2021 08:46:29 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c7f433e5-f761-4f3f-b799-f06b012b4894 X-Archives-Hash: e2fe0b351768f370675fac7b462a2451 commit: 117f6634d01f2c89e614561de47351c9bdfef37a Author: Lars Wendler gentoo org> AuthorDate: Tue Mar 9 08:46:17 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Mar 9 08:46:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117f6634 games-emulation/vbam: Fixed build against libsdl2-2.0.14 Closes: https://bugs.gentoo.org/762208 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> .../vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch | 27 ++++++++++++++++++++++ games-emulation/vbam/vbam-2.1.4.ebuild | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch new file mode 100644 index 00000000000..a528a22e506 --- /dev/null +++ b/games-emulation/vbam/files/vbam-2.1.4-libsdl2-2.0.14.patch @@ -0,0 +1,27 @@ +From 619a5cce683ec4b1d03f08f316ba276d8f8cd824 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= +Date: Thu, 31 Dec 2020 00:22:21 +0100 +Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum + +Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value: +https://hg.libsdl.org/SDL/rev/15a0bc9612e9 + +So this code broke as the enum value doesn't satisfy `defined()`. +--- + src/sdl/SDL.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp +index ee8ae50a3..082b47c0c 100644 +--- a/src/sdl/SDL.cpp ++++ b/src/sdl/SDL.cpp +@@ -878,7 +878,8 @@ void sdlInitVideo() + + sdlResizeVideo(); + } +-#if defined(KMOD_GUI) ++ ++#ifndef KMOD_META + #define KMOD_META KMOD_GUI + #endif + diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index b9fd01b61bd..21f3c2cf4a2 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -56,6 +56,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-cmake_fix.patch + "${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208 ) src_configure() {