From nobody Sat Jul 22 06:11:27 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 4R7GJw2HWgz4pFvq; Sat, 22 Jul 2023 06:11:28 +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 4R7GJw1bvkz4JDn; Sat, 22 Jul 2023 06:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690006288; 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=XnBte8HMWj/EfpPc0BgcDtAykQdLlvla/XSGHkCJKmA=; b=LqD3HFCxng8imipp5lw34vuuhAy9eJcQX03STHiM5/HsPcIww2/20dG+AZYK3oEwiNohRq QKiwvgzI3fQdZkhPOWB5CCk2pB03pOJUmxrOMVQiG2yiUArHUObcaAGww6AHXmePmiHjuJ beY2zMyWXp9Ar0A0342+THjsJkYkYzaBls9Ofc1G1x33wmdy9fmfpw0QV/4/7LlFKaYl5b BwCighg/kv5V2zxzQra6fE27BiLg8ksXzJ48qdlk6OdmSalmbxLviUd27v1G0Lp5wuvhAU H7AiVfWVw1L++E/7MdgC/Gx8MiddR+n1HoMgbOYpsN8NSRWNIGsitqTcjoQSsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690006288; 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=XnBte8HMWj/EfpPc0BgcDtAykQdLlvla/XSGHkCJKmA=; b=NgXTRFMA2/5h5g8FH7pXnGZW1hRIojWO3oVw4SDWwRpaLmbAfSgpn1hGRAWwkwsvoj5XQS zWW5P1gHcY66lA0kmFRuCw4kqnVCwVvsr+P6PDlgjhIuUlgdZXbTikIWRacXvYBAeFRy54 szoF+Fa70dunSCG3t+lNjm35NAxsYjCrPHkPZ5R2Y1kPhExwMcOuVDbL0loHijJTnDTy1v jqLuUXYJjsISNeNQy1QmzTgUByBZ+MlFjX8IvZ+rB0vPjUh0lvHv8NuUp746z5GLEcUfil DKHOujNlaLRCYT67ovQwVGxuUV39Xas3zVKaO00xzm89zElTekbAQkMRPsXi9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690006288; a=rsa-sha256; cv=none; b=a0a7LOV12y8KEoL1Rhxs5AffOultw0uwidX2mlwVTtfw455A4XxouZYquHufCn1yQ0aj77 Z7MuabKtIx27usjTwbAIwYmE85oMeSC7XakVW5IZUyb+U6UY5ioJ0VhcJ1dwFCFfBwlBe+ WU6Opi0CEK48Qy9qEE9sqjDGmwBJ2qWIqwjFdD6xxtbQzCxszACLE1JEO3+Ak/Tx1apeWP OuddOOtLjF8Hc9iNMwXFa0KBD0rssi6l7s3raYftTM9whJ4TFU4CxNArihCYi733hbwdAj 4jBLDm+xzI/Vxc4/dSaEtUhBaNfVakX89Yu3+fzMgUGm4BCxpbwFSCAwA3f3HA== 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 4R7GJw0h5jzk7y; Sat, 22 Jul 2023 06:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M6BSKD060880; Sat, 22 Jul 2023 06:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M6BRuL060879; Sat, 22 Jul 2023 06:11:27 GMT (envelope-from git) Date: Sat, 22 Jul 2023 06:11:27 GMT Message-Id: <202307220611.36M6BRuL060879@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: e143e8f39714 - main - games/foobillard: Fix build with llvm16 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e143e8f397142b8746ef00756c0184589ed4cd33 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e143e8f397142b8746ef00756c0184589ed4cd33 commit e143e8f397142b8746ef00756c0184589ed4cd33 Author: Muhammad Moinur Rahman AuthorDate: 2023-07-21 20:28:28 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-22 06:11:19 +0000 games/foobillard: Fix build with llvm16 - Utilize OPTIONSNG to simplify Makefile - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- games/foobillard/Makefile | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 23ab559b9798..da745cb82710 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -14,20 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 -OPTIONS_DEFINE= SDL NVIDIA_BUMPREF -SDL_DESC= SDL instead of glut -NVIDIA_BUMPREF_DESC= NVidia extensions - -.include - -FREETYPE_CONFIG?= pkg-config freetype2 - -USES= gmake pkgconfig xorg -GNU_CONFIGURE= yes +USES= gmake localbase:ldflags pkgconfig xorg USE_XORG= xaw ice -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes DESKTOP_ENTRIES= "Foobillard" \ "A free OpenGL-billard game" \ @@ -36,19 +26,26 @@ DESKTOP_ENTRIES= "Foobillard" \ "Game;Simulation;" \ false -.if ${PORT_OPTIONS:MSDL} -USES+= sdl -USE_SDL= sdl -CONFIGURE_ARGS+= --enable-SDL -.else -USES+= gl -USE_GL= glut -CONFIGURE_ARGS+= --enable-glut -.endif +OPTIONS_DEFINE= SDL NVIDIA_BUMPREF + +NVIDIA_BUMPREF_DESC= NVidia extensions +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 +SDL_USES= sdl +SDL_USE= SDL=sdl +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 ! ${PORT_OPTIONS:MNVIDIA_BUMPREF} -CONFIGURE_ARGS+= --disable-nvidia -CFLAGS += -DGL_AMD_gpu_shader_int64=1 -DGLuint64EXT=uint64_t -DGLint64EXT=int64_t -UGL_VERTEX_PROGRAM_NV -DGL_NV_vertex_program=1 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-patch: