From nobody Mon Jul 22 19:28:51 2024 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 4WSVh34sY0z5Q1xq; Mon, 22 Jul 2024 19:28:51 +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 4WSVh349S9z4Sr2; Mon, 22 Jul 2024 19:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721676531; 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=b9qZv1ryTxkntbZBwtA0BlATAnaWdupUzokLbaQvPqM=; b=Pb+4Z97BcxTdfiIZoI4blWvQ8f55t9w22UOuh/yut1TP22RrDRLpbxcZBQWBNaxlYssISM PggUZ9GwAZtE7Rp/zWx06ThQxoLyUG6Xug9Dr5/cPtNQ3e4RLYcTexI4KakGclxeS0DIGW a9dQ8LIDvNQx3T0PlNlrmHsYLz2QAE8FJoEbnZGhE5cUWV1yc0CGoTs8Fzi0XyxeuBnuWQ wHyg12IgvWPrNH3dvRdJNArDyp5DT2+krWQDHHESDgovaL1GWQ0aQwo2Ev6Ks/f/WX/vhG 6/YJws0s4sfxdmdechT0xoJU2jIjA6XeSmrUQvVdKXomelX24WRgrbkWKI/CtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721676531; a=rsa-sha256; cv=none; b=EXXs6cIHIPd06d/MiitxYMl7ym2C9xMxInpq0+r+bfYillt1VIUDC/o+Vvz1VfgaSLBlgt dcp7z6QGiHd9w3ez2GdNmar0g1WHW/hD8nA5XJU4ecSDeMsWjwsCYVL8qSSF75APW8z47D K458X4pd2O/jnVXI2u6dSi2cZBRa/yg3JFxYDfrNpsfnAfSmFOH4rUb87xwhbRN47LRPFk vxAf/B+ug99k4G6ml4uoNiDPl50iXFNkPs7LTDcvWmx+GNSxj45ka6LR4FE6u+0z0+jY6/ k25TPRYnsExaToIN5JdgaJFQy7g3S/UNJDGup9mvqhFdhz3sWjy2LbOpg8kl1g== 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=1721676531; 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=b9qZv1ryTxkntbZBwtA0BlATAnaWdupUzokLbaQvPqM=; b=cmLU0PwzWrAUl2wpxtK05FTdZg28WuoJEZ2kJ3k8+85el1yyh+sADlTybvQeCpqjIR2Vye oM/wgeo1FMTydnU1OpuyWr6SCfFTZvJoofCSznw8v+Xt9B3525dmOCkcDuba0HEQ+TMfWN 8gZTO0S7rf6JS9znusNC8xY+jZ6UiA/f8961v8rJUPg+g/AZqYKDjgR7+r0c2/lKkP86L/ b0+lcSoxODq4WfL7ibeC4yPzYEe6wnAop29N1Ur8LEJHfR+4zhBn2lWq3i6iKjY4D5nlHw vWjZAzVTrwMKuXJnDV7RV3Kl4S293zC3tEK8PfG2YBdb1Bz5WJknnQQowcqhKQ== 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 4WSVh33ls1zxPc; Mon, 22 Jul 2024 19:28:51 +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 46MJSpN8093596; Mon, 22 Jul 2024 19:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MJSpk5093593; Mon, 22 Jul 2024 19:28:51 GMT (envelope-from git) Date: Mon, 22 Jul 2024 19:28:51 GMT Message-Id: <202407221928.46MJSpk5093593@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: e21b20273ae7 - main - games/foobillard: set BROKEN_aarch64, sort out Makefile 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: e21b20273ae7e25fe6990443a63b0526cc8d1e00 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e21b20273ae7e25fe6990443a63b0526cc8d1e00 commit e21b20273ae7e25fe6990443a63b0526cc8d1e00 Author: Thomas Vogt AuthorDate: 2024-07-22 19:24:16 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-22 19:24:16 +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 --- 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