From nobody Mon Apr 17 09:30:26 2023 X-Original-To: dev-commits-ports-main@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 4Q0MGp5Zfsz45dWj; Mon, 17 Apr 2023 09:30:26 +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 4Q0MGp4W69z430p; Mon, 17 Apr 2023 09:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723826; 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=UkdFWUy2QwXAUqq9vq3P1bemf8TPm+HjyJwAqj0Owxs=; b=DLhkg2kIusrZVyviauINWZLfe6bPBwBlDQc/ldzZ7jx87GSnBAFJ+BUkkSnCrvhgk1DHKR eOSlLnCxhh3FSmjAWl76AYXlKN6QPH6LYyehwU/cJWe+/IfsXT0+2ohoYKeCbwvka1JOSj KHaiDdh2+fOza7ijHXUIzIygzip2Tecb7AU5RkT9ifGj5+LwvZF2Q8hPjj1v5nhyEnNKcW x315FwTYt6GhrlD2h3fQ+7f9yCfFYfD+Vg5h4Tk0Vb3btoRwBAbMZn9b0oDJuJMqfKU44f bUW8ocRlpLZ9RepPNYTPA/nF+O04A2Qu5RS5a4ueiYvd2k2aRcTyXT2scgfveg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723826; 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=UkdFWUy2QwXAUqq9vq3P1bemf8TPm+HjyJwAqj0Owxs=; b=mNnH4MYj+gAW1DYh2vmhPhdIAVy0Q46MBDOv5jx7jhY2lX4EEP6BuP6EFyqf3YrP8Nzvw5 kac8HSAdZcZ1KvJ55h/HMOGjXSxAsDO9lmLMXTZ6cuv7u4ZaX401yDkfFvH5w7VD79/h5H QZWWbzKHIj44P8FiZZP0zxTN45FK5MIPTlQlKrWdEpzNTmrJwG2f1AzMF94QStyAjvLPwp ejDM1pUw2T7KjPRxb3DuyvzAmNE+6mnRxOeQuZjn7HaDUnuj8dMmijq/3EaEa8KqCQuuQF F0y2F8UNeBGv36chLlg/anPoI2E7EVqGJfyAELQmSSq6clcqA/RhopxPht6pXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681723826; a=rsa-sha256; cv=none; b=elKHmhEDWzNPwMr4Y8EuAne8L6daZyxfKaT/xmsDmBJHfzud7C9SztCoAx/eOWdCMsr3Im qAR2bub3WrBIJe3oMmG9uyhui5IS4nYUx99S134DwXRM37buV/OqVU/I6v+q3JX4UCO77B T9GNuAwNkq0t0ezSBa6//tIdYfwHD9NEP24hDHEOP9r1Ksn+FF797sG8CY9BaBFPtR8Fd5 MBZyWay8AM8C+W6Z7/SbO1DgoNdDxzSpDl4Vta8yUULHMoOxSzGU85GInhXL3KUNUhtUUO zeGyh9t3g+iHQjCkLMsw+Elzl10u1S65aq0+Cx4TqYbsrfR0qC2Z8Q2jGgWWZQ== 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 4Q0MGp2m4RzPFD; Mon, 17 Apr 2023 09:30:26 +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 33H9UQQQ051446; Mon, 17 Apr 2023 09:30:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H9UQV7051444; Mon, 17 Apr 2023 09:30:26 GMT (envelope-from git) Date: Mon, 17 Apr 2023 09:30:26 GMT Message-Id: <202304170930.33H9UQV7051444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 1092ffe19022 - main - games/uhexen: fix build with -fno-common, on big endian platforms List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1092ffe19022aa17a164efc50b8b392d2a4e3f2e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1092ffe19022aa17a164efc50b8b392d2a4e3f2e commit 1092ffe19022aa17a164efc50b8b392d2a4e3f2e Author: Robert Clausecker AuthorDate: 2023-04-15 12:50:27 +0000 Commit: Robert Clausecker CommitDate: 2023-04-17 09:27:24 +0000 games/uhexen: fix build with -fno-common, on big endian platforms - turns a duplicate definition into a declaration - replace nonexisting byte swap functions with gcc/clang intrinsics - define LICENSE --- games/uhexen/Makefile | 10 +++++----- games/uhexen/files/patch-include__h2def.h | 17 +++++++++++++++-- games/uhexen/files/patch-src_i__fbsdvideo.c | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile index 59d3705b1cdb..1d3f136d5906 100644 --- a/games/uhexen/Makefile +++ b/games/uhexen/Makefile @@ -1,6 +1,6 @@ PORTNAME= uhexen PORTVERSION= 0.601 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/U-hexen%20version%20${PORTVERSION} @@ -8,10 +8,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Yet another port of Hexen, popular game from Raven Software WWW= http://uhexen.sourceforge.net/ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: mouse_scale_factor -BROKEN_FreeBSD_14= ld: error: duplicate symbol: mouse_scale_factor -BROKEN_powerpc= fails to compile -BROKEN_powerpc64= fails to compile: m_misc.o: undefined reference to 'ShortSwap' +LICENSE= ACTIVISION +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_NAME= Activision Software License Agreement +LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept USES= gmake sdl USE_SDL= mixer sdl diff --git a/games/uhexen/files/patch-include__h2def.h b/games/uhexen/files/patch-include__h2def.h index ed1cf5f5edde..87a61ca4f3ff 100644 --- a/games/uhexen/files/patch-include__h2def.h +++ b/games/uhexen/files/patch-include__h2def.h @@ -1,5 +1,5 @@ ---- include/h2def.h 2003/02/10 14:43:33 1.1 -+++ include/h2def.h 2003/02/10 14:46:37 +--- include/h2def.h.orig 2001-12-02 08:51:54 UTC ++++ include/h2def.h @@ -26,7 +26,11 @@ /* XXX ifdefs */ @@ -12,3 +12,16 @@ // Uncomment, to enable all timebomb stuff //#define TIMEBOMB +@@ -894,10 +898,8 @@ fixed_t FixedDiv2 (fixed_t a, fixed_t b); + #endif + + #ifdef __BIG_ENDIAN__ +-short ShortSwap(short); +-long LongSwap(long); +-#define SHORT(x) ShortSwap(x) +-#define LONG(x) LongSwap(x) ++#define SHORT(x) __builtin_bswap16(x) ++#define LONG(x) __builtin_bswap32(x) + #else + #define SHORT(x) (x) + #define LONG(x) (x) diff --git a/games/uhexen/files/patch-src_i__fbsdvideo.c b/games/uhexen/files/patch-src_i__fbsdvideo.c new file mode 100644 index 000000000000..525f2ba0c2ff --- /dev/null +++ b/games/uhexen/files/patch-src_i__fbsdvideo.c @@ -0,0 +1,20 @@ +--- src/i_fbsdvideo.c.orig 2023-04-15 12:37:20 UTC ++++ src/i_fbsdvideo.c +@@ -8,7 +8,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -26,7 +26,7 @@ + #define RestorePalette() SavRstPalette(FBIO_SETPALETTE) + + extern int usemouse; +-int mouse_scale_factor; ++extern int mouse_scale_factor; + + static event_t event; +