From 0029cd352319e81e84974c4a09157bbf50b2c7b0 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sat, 21 Feb 2015 08:00:06 +0000 Subject: [PATCH] fix building with USE=-joystick (bug #540764) Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- games-emulation/dgen-sdl/ChangeLog | 6 +++++- games-emulation/dgen-sdl/Manifest | 5 +++-- games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild | 9 +++++++-- .../files/dgen-sdl-1.33-joystick.patch | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch diff --git a/games-emulation/dgen-sdl/ChangeLog b/games-emulation/dgen-sdl/ChangeLog index f6123cd6c547..9712736e9098 100644 --- a/games-emulation/dgen-sdl/ChangeLog +++ b/games-emulation/dgen-sdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/dgen-sdl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/ChangeLog,v 1.24 2015/02/19 01:48:48 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/ChangeLog,v 1.25 2015/02/21 08:00:01 mr_bones_ Exp $ + + 21 Feb 2015; Michael Sterrett + +files/dgen-sdl-1.33-joystick.patch, dgen-sdl-1.33.ebuild: + fix building with USE=-joystick (bug #540764) 19 Feb 2015; Michael Sterrett -dgen-sdl-1.32.ebuild: old diff --git a/games-emulation/dgen-sdl/Manifest b/games-emulation/dgen-sdl/Manifest index 345459d8ff69..601b6720c7c4 100644 --- a/games-emulation/dgen-sdl/Manifest +++ b/games-emulation/dgen-sdl/Manifest @@ -1,6 +1,7 @@ +AUX dgen-sdl-1.33-joystick.patch 402 SHA256 f4ca63080487761a08b44f81943539c58fc7e150963fbf10532b08aeaf2849f5 SHA512 929e3779247bf8e852a129a48044c2e1a4df91811cabc799fd9fb87a8f4f18d0a0ec0c2186ceecf67bad0b6a45a84c41a0030b164d6e5bee942f1832159695f0 WHIRLPOOL 236df3d9b1e149f8c50675bee242805defba1cf11e8c740d4a7cc31c4c75682d52b8f79be058917e31e59feacf0e3e5919d0f872205ad67eb8ab23eeb243ef56 DIST dgen-sdl-1.30.tar.gz 608549 SHA256 2ecd364ff64d4ba759b7159d73e1bb8f289f6d5a4b7dfa021d4ab5cbc6443b86 SHA512 bb112c885d54a01082e2585837aba4f084012e86d5244c483f77d091572b6dda7c98769c47ac93cf92e59ad4731af0516a45dd92270fb23aefa0c91c12942f40 WHIRLPOOL 15abacb96d6ccbf9506bb61a51597d7e057baeeccc5b75df3f1167a612b46bc2b7fa8d64b64ef07f9e8043af6eb2906d391a6e2d2a7fb5691c9a6c0e3146a061 DIST dgen-sdl-1.33.tar.gz 939297 SHA256 99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e SHA512 c98ab8cdced62a5d26fd677ad36b031e756620114c946ac067599e84ae6ebcfab731554dd4337b6314c3b5db4601c8a6cc67c285d2aad136e659b9973c01a749 WHIRLPOOL 09c22244983ca960b03a25f633e9885698787a57d3a4e5be2e6af571d71a38d166dbf18aac280e8980ec4e7db2f4eaac6927dd529641c3bd1758a9984e64a211 EBUILD dgen-sdl-1.30.ebuild 991 SHA256 9250255053b1b429c47ea2c9b7ac1604c42f28c60934f9d3ea32b5ac0975d527 SHA512 4633710d0c883f3277192ef3cdd04c53d31b59aaaf07e8eac35d31e02a7d4ccd34340b53e0a254deeba4af5baf4052b6b0e857fe04fd91e08e07a5482d088b6b WHIRLPOOL 55813e13076925c8706f5d8e68eee3417ba5b1edbad050837d2dd2a8abbb53ee02d6d9ec06a12de477a1077ec8b1804386fb97ab43fa63dceb679ffe710d25d2 -EBUILD dgen-sdl-1.33.ebuild 931 SHA256 4f0b07428f922c9dfc3622912871a6a5b75c5f70bf7d6ed6458bc2b6d9e86bc9 SHA512 43ffe46bccc122d39a5136f9ef37c22ad47f9b8e582fb8a84350da976d5fa4451e6deee328f5c00a01d69b0cdf4d852d36d22830dc8cadc4f9811c0734280924 WHIRLPOOL ff8e4df94dbd6b7322866026c3c9b8389f8f90dda6aeadf41c0e000e078db913a40906a832b67093396a30cc4c659bac1b08cfe3e049c6dedabfccca661d5dea -MISC ChangeLog 3371 SHA256 a9a5338b348046eebe3025a373601ee0a1ffdec1cacc6886048431b6a9b32fb0 SHA512 327739813626092b277a7fe68d092a425bf1cac970b6d64256817781d2f617a59045e0d1fc64251a908eee90ab119c670ffd72dc605361d7c43b2014c6f8854d WHIRLPOOL 320359f77468127bfcddd20d14ffab8aeac597e615ec4672211bc8bf85d212839867ba048e0b2b92674d306fc67822fbf0db534b81cdda270b7132a4042f3fdd +EBUILD dgen-sdl-1.33.ebuild 1034 SHA256 0c10ad09366890bc9e255bb0ad7bd8769ea59fa67a846480dd543cdef24795bd SHA512 533e0b29d8bda99573ba11bdb622ee5137f3c442ab4431a5ac04418d4e7c67acdc7c14d3c254bece5c885860dc3390c44e408dad3cf828ca3df48b4e616e1bc8 WHIRLPOOL 1ccf57a98f18958f51662539cb1347c230f6c36befe78f46f9b666bd3c393ea54528202710e32179258ad63f86501bbd97c44550044462d12e0c51a4d959ab39 +MISC ChangeLog 3536 SHA256 6598459bc5568f8e3b0cbf53caa717a70785d0af00ca60352ec4611fe71cc294 SHA512 93916f87cd00ddf0a88700745ecbf6bd2d9a7b9f337ffb267a9113631c230f099bc3ea18f87a565646036d47ccd1e62c418714dcc7a6ffb80f933091f0111d5a WHIRLPOOL 6f445e42a56c51d5f18ffe157a1253d0cae3866bd6b29659400ecf431af49253cc572321956a9b665ab97e01dadc2282ff4d0e2a6a12a64f930e41c9298f9104 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild index f71ebff66ca1..5606c8f5841e 100644 --- a/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild +++ b/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild,v 1.1 2015/02/13 06:24:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild,v 1.2 2015/02/21 08:00:01 mr_bones_ Exp $ EAPI=5 -inherit games +inherit eutils games DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator" HOMEPAGE="http://dgen.sourceforge.net/" @@ -20,6 +20,11 @@ RDEPEND="media-libs/libsdl[joystick?,opengl?] DEPEND="${RDEPEND} x86? ( dev-lang/nasm )" +src_prepare() { + # fix building with USE=-joystick + epatch "${FILESDIR}"/${P}-joystick.patch +} + src_configure() { egamesconf \ $(use_enable x86 asm) \ diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch new file mode 100644 index 000000000000..38cb962b690b --- /dev/null +++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch @@ -0,0 +1,18 @@ +--- sdl/sdl.cpp.orig ++++ sdl/sdl.cpp +@@ -6285,6 +6285,7 @@ + #endif + static unsigned long hide_mouse_when; + static bool hide_mouse; ++ bool pressed; + #ifdef WITH_JOYSTICK + static uint32_t const axis_value[][3] = { + // { pressed, [implicitly released ...] } +@@ -6301,7 +6302,6 @@ + }; + unsigned int hat_value_map; + intptr_t joypad; +- bool pressed; + #endif + uint32_t plist[8]; + uint32_t rlist[8]; -- 2.26.2