From nobody Wed Jul 6 19:50:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4EEC11D048CA; Wed, 6 Jul 2022 19:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LdVWh1jSjz3rP4; Wed, 6 Jul 2022 19:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657137024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7knGodnHS2eowoAzkeLPMNxy5O7Q40vHrX0+U9hClwU=; b=GZogGtWOVpO2xpdJJuk+073fs+uA4V6tdFOmjUSh1bhulp6NmxlYhjYhZy5reQbCzVmlXe KqLHivH57W3SwsMW5tfrdL2wAmvPm04qzvQu5KI127TCI9wROX6+9HWD+27mvRFcPzs1Z9 kWEnkYH9Nv92ZLWq8gPP+6uK2fHdEusaWDljYk6MmawWJjmMquzDLUJCWC973QoX1EtQKH W5gvJ4ugNpmx5VH9i9QIimo2x6czyMwcTvRos/Vd+o/Jz0Oi4HqDlzL6JGj++CLPD3euz9 TVrZFBF+YO7qu9AYFzaIy8A7Bg7DJ8iaRZHjNAbk7EfoELXgjEMid7ZFWId4KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F41320A4D; Wed, 6 Jul 2022 19:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 266JoNw6009123; Wed, 6 Jul 2022 19:50:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266JoN3X009122; Wed, 6 Jul 2022 19:50:23 GMT (envelope-from git) Date: Wed, 6 Jul 2022 19:50:23 GMT Message-Id: <202207061950.266JoN3X009122@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: dd5e9f5cacbc - main - games/luola: fix build with -fno-common List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd5e9f5cacbc15953e417a6121aae6a06cf53de0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657137024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7knGodnHS2eowoAzkeLPMNxy5O7Q40vHrX0+U9hClwU=; b=iOWMQV8WrBBHzsjJIb6maFo3Qk3HGwa7LKVEWEXCVIoFxstx1rpGVc+KxEUjsqBmasAcK6 pXAmlW+BABAqs+I7Vohs9Hi+U1KvAStAVOPtvgF1Am/YGn8ppV299SeWyba3TGzz8JWyVe eUAyF/dT5aduPERB7soKhrp0gFrNlNF+bVVZ0x81ipFHoK506TSQehe6xsglx3NS67UOOA U8VrZxT83uUyII4vrSOJePKKB1sbIjDnlZqb+KNyEa6vBy34f1Tv5btZgIbP4dla8SUieo B7awcPE+3C6EoFwwL3E88o6XEjPbEofoNi++/uY/4lxJXs0OPPzNYmlGezHjpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657137024; a=rsa-sha256; cv=none; b=M8f2GmD6tuMLeYB0sucpoEf/FadGNxksa+GNHq6NbqrJB7oS5Il//WCHDmCfhJNniDq1Cn MfN0m9t55L63hF6G+N17rAeU2Dqa87g6B+JGTf0/YUkV/dMDEBUUKDGeimVmrIbjfLjiP7 1wgbZd4aluodBYSiH6Dj96/BO51uvqcTq7YZt6VRHwg3zv3vm78EbpHXM6h5OfMvzAs3c0 q2BpissQ/3iLgpYSzTkVwQSGvpW2mqi7f7jkaAg+WXAPA6d3eaTBSq1LUTCm9k26CxSdy7 8313RQMlS4qsbxhT07qmB15Baf/JSYUgHeywtYDKH0JZdtoevN8nGPvBRHcQzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd5e9f5cacbc15953e417a6121aae6a06cf53de0 commit dd5e9f5cacbc15953e417a6121aae6a06cf53de0 Author: Dmitry Marakasov AuthorDate: 2022-07-05 21:30:02 +0000 Commit: Dmitry Marakasov CommitDate: 2022-07-06 19:49:32 +0000 games/luola: fix build with -fno-common PR: 264998 Submitted by: fuz@fuz.su --- games/luola/Makefile | 8 ++------ games/luola/files/patch-src__fs.h | 2 +- games/luola/files/patch-src_pilot.c | 11 +++++++++++ games/luola/files/patch-src_pilot.h | 11 +++++++++++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/games/luola/Makefile b/games/luola/Makefile index 23ecc7fefc8a..3b3ca7befa31 100644 --- a/games/luola/Makefile +++ b/games/luola/Makefile @@ -14,13 +14,9 @@ COMMENT= 2D multiplayer cave-flying game LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: Pilot -BROKEN_FreeBSD_14= ld: error: duplicate symbol: Pilot - -GNU_CONFIGURE= yes USES= gmake sdl +GNU_CONFIGURE= yes USE_SDL= sdl image ttf -CONFIGURE_ARGS= --program-prefix='' LIBS+= -lm PLIST_FILES= bin/${PORTNAME} \ @@ -38,7 +34,7 @@ DESKTOP_ENTRIES="Luola" \ OPTIONS_DEFINE= SDL_GFX SOUND DOCS OPTIONS_DEFAULT=SDL_GFX SOUND -SDL_GFX_DESC= Nicer graphics +SDL_GFX_DESC= Nicer graphics with SDL_gfx SDL_GFX_USE= SDL=gfx SDL_GFX_CONFIGURE_ENABLE=sdl-gfx SOUND_USE= SDL=mixer diff --git a/games/luola/files/patch-src__fs.h b/games/luola/files/patch-src__fs.h index 1e947bae8701..989831598ee3 100644 --- a/games/luola/files/patch-src__fs.h +++ b/games/luola/files/patch-src__fs.h @@ -4,7 +4,7 @@ #define FILESYSTEM_H #include -+#include ++#include #include "SDL.h" #include "ldat.h" diff --git a/games/luola/files/patch-src_pilot.c b/games/luola/files/patch-src_pilot.c new file mode 100644 index 000000000000..510d72347f3b --- /dev/null +++ b/games/luola/files/patch-src_pilot.c @@ -0,0 +1,11 @@ +--- src/pilot.c.orig 2022-07-02 17:04:58 UTC ++++ src/pilot.c +@@ -43,6 +43,8 @@ + #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */ + #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */ + ++struct Pilot Pilot = {}; ++ + /* List of active pilots */ + struct dllist *pilot_list; + diff --git a/games/luola/files/patch-src_pilot.h b/games/luola/files/patch-src_pilot.h new file mode 100644 index 000000000000..6882199fce06 --- /dev/null +++ b/games/luola/files/patch-src_pilot.h @@ -0,0 +1,11 @@ +--- src/pilot.h.orig 2022-07-02 17:04:35 UTC ++++ src/pilot.h +@@ -34,7 +34,7 @@ struct Ship; + + #define PARACHUTE_FRAME 2 + +-struct Pilot { ++extern struct Pilot { + struct Walker walker; /* inherits Walker */ + SDL_Surface *sprite[3]; /* Normal,Normal2, Parachute */ + Vector attack_vector; /* Direction where gun is pointed to */