From nobody Mon Jul 22 19:31:18 2024 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 4WSVkt6wvdz5Q2F6; Mon, 22 Jul 2024 19:31:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSVkt6VVbz4T50; Mon, 22 Jul 2024 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721676678; 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=m2wfXyHm8N21tCKfy42oQJDjWBwWsKQ5z1L554x3aQQ=; b=g2T2jrO7VXr+VYvXGq4GpsbWLIWaD/PHmjVJJrrMUzLtyUKnb17UhJ9gHQWcQS1Dtcu+aG nTW72rCn+IdDhhpxy56uFVRr3dlhfpe6fIqWOPES4+JAMuoZ9Q6acmdXBKa0MIFTtIHLsi KK1cVVA0dhMSGq1cAnS8ne3ajMeL5cFTFrgIov2eg6gfDYEsb547TP0lRn2+8HM/yMItbs 01gSbvlMU0uz/ZEOgFlhEFSIjUfRw44lQh8Q9iXCqRSZ+k5EtfsSdMXwKDl4tUTl1Y7gDa 7POf8yn+HiOu98g3dhUHPKdjJwgAbdyKZIkCRZGgFpSCmcdaPfi3nZgiG4PZSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721676678; a=rsa-sha256; cv=none; b=ZH5VDESO4aUFN1iqGzFnJAD7PqMOxwecfwpo9jhhCJKCzVUUqh0TO7CFu1sf/A/viyaXEi drtrUqQqaBBjYr/4OVvTmyIlLlEpXR1QuMbMtn6k8DxgLacGz/dHS3c15PausfetmWKHkc WHxqthk1JabrFHUm58OZH3bEGYHn10k1KBTpkyk+SwgKm2bWD9MAWV0qG3xeMzbuIMn2Rl 49dl0UPpEjSvUReJbfYs3iGdivQwA5o5UuO0mxRHmODaNcl+22GPPKmOLGVLwxBcv6bC3e J117hfCz4G7AdVwf/LEy8eLo4O2kjYiMvsO1F0UNjPlg1kY0LVJktP3tEpOkeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721676678; 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=m2wfXyHm8N21tCKfy42oQJDjWBwWsKQ5z1L554x3aQQ=; b=YHhrO/P2lvwk0I10+KmdX/wB5/0y70lD0nyHcDBN8W5smEnLhHh0NCQ1q1XYjvZTKKbKWj yLMhlcIrmmyzj5fp5CT/r8sEfAbaCSZB9k5G5diVglIA2YeJcKWL22m2HzQrJQRq7/PIa+ 8OARkLRiOVqF20JrSr4TV1BKw7XEotwK/JsbeDUDOO11WgTgcELGQjbS2YB0CEVRx6ESX1 +zsMaUHcM0mavZnPgJV1H4N1Ih+C5xV+PDnz4vODqQRE2TPjhwxdEOZb9jA8ogCvFABBRP ZPbiGk8jv3nGppBJG8zHXmPtdh6peKCw4maB4oS7AOodmdSv13cF0NsTt3bTsQ== 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 4WSVkt65h0zxYV; Mon, 22 Jul 2024 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46MJVIWH004460; Mon, 22 Jul 2024 19:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MJVIlv004457; Mon, 22 Jul 2024 19:31:18 GMT (envelope-from git) Date: Mon, 22 Jul 2024 19:31:18 GMT Message-Id: <202407221931.46MJVIlv004457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 03a3189d81c3 - 2024Q3 - games/foobillard: set BROKEN_aarch64, sort out Makefile 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 03a3189d81c370c2474ae1f63215988a3c8b4531 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=03a3189d81c370c2474ae1f63215988a3c8b4531 commit 03a3189d81c370c2474ae1f63215988a3c8b4531 Author: Thomas Vogt AuthorDate: 2024-07-22 19:24:16 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-22 19:31:12 +0000 games/foobillard: set BROKEN_aarch64, sort out Makefile Can't build on aarch64 with error: improper alignment for relocation R_AARCH64_LDST64_ABS_LO12_NC: 0x29B694 is not aligned to 8 bytes Fix dependencies from GL and XORG, pet portclippy. PR: 280403 MFH: 2024Q3 (cherry picked from commit e21b20273ae7e25fe6990443a63b0526cc8d1e00) --- games/foobillard/Makefile | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 34eb467e2288..d5eed728653c 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -1,6 +1,6 @@ PORTNAME= foobillard PORTVERSION= 3.0a -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/FooBillard-Sources/ @@ -11,11 +11,15 @@ WWW= https://foobillard.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png \ - libfreetype.so:print/freetype2 +BROKEN_aarch64= improper alignment for relocation R_AARCH64_LDST64_ABS_LO12_NC: \ + 0x29B694 is not aligned to 8 bytes -USES= gmake localbase:ldflags pkgconfig xorg -USE_XORG= xaw ice +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libpng.so:graphics/png + +USES= gl gmake localbase:ldflags pkgconfig xorg +USE_GL= gl glu +USE_XORG= ice sm xaw xi GNU_CONFIGURE= yes @@ -26,25 +30,27 @@ DESKTOP_ENTRIES= "Foobillard" \ "Game;Simulation;" \ false -OPTIONS_DEFINE= SDL NVIDIA_BUMPREF +OPTIONS_DEFINE= NVIDIA_BUMPREF SDL NVIDIA_BUMPREF_DESC= NVidia extensions -SDL_DESC= SDL instead of glut +SDL_DESC= SDL instead of glut NVIDIA_BUMPREF_CONFIGURE_OFF= --disable-nvidia -NVIDIA_BUMPREF_CFLAGS_OFF= -DGL_AMD_gpu_shader_int64=1 -DGLuint64EXT=uint64_t -DGLint64EXT=int64_t -UGL_VERTEX_PROGRAM_NV -DGL_NV_vertex_program=1 +NVIDIA_BUMPREF_CFLAGS_OFF= -DGL_AMD_gpu_shader_int64=1 \ + -DGL_NV_vertex_program=1 -DGLint64EXT=int64_t \ + -DGLuint64EXT=uint64_t -UGL_VERTEX_PROGRAM_NV SDL_USES= sdl -SDL_USE= SDL=sdl +SDL_USE= SDL=sdl +SDL_USE_OFF= GL=glut SDL_CONFIGURE_ON= --enable-SDL -SDL_USES_OFF= gl -SDL_USE_OFF= GL=glut SDL_CONFIGURE_OFF= --enable-glut FREETYPE_CONFIG?= pkg-config freetype2 .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || \ + ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif @@ -53,6 +59,7 @@ post-patch: ${WRKSRC}/src/Makefile.in post-install: - ${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${STAGEDIR}${PREFIX}/share/man/man6/foobillard.6 + ${INSTALL_MAN} ${WRKSRC}/foobillard.6 \ + ${STAGEDIR}${PREFIX}/share/man/man6/foobillard.6 .include