Date: Sat, 22 Jul 2023 06:11:27 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e143e8f39714 - main - games/foobillard: Fix build with llvm16 Message-ID: <202307220611.36M6BRuL060879@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e143e8f397142b8746ef00756c0184589ed4cd33 commit e143e8f397142b8746ef00756c0184589ed4cd33 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-07-21 20:28:28 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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 <bsd.port.options.mk> - -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 <bsd.port.options.mk> -.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307220611.36M6BRuL060879>