From nobody Thu Jul 20 17:43:14 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 4R6Km50LC9z4nSMy; Thu, 20 Jul 2023 17:43:17 +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 4R6Km30kRRz3Mbk; Thu, 20 Jul 2023 17:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689874995; 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=q9A5MXMWF8ECPKVVk4Q0Gb96zt/nDsMjh5AoSo+1EvE=; b=J6761u4m2EmkYsGp7tf2RZdmM65vXiouAS+jzUKS6RhzYVzHaOE8qd4/bwmyfa9ZVx6hMh reo/pI+A6L5P2djzTqVKGd0uPGJ4X+pLgDzoM+n5NW7EJS4X2fqi+A1V2Yne53fBbC02xh 3ZNqFFN+I2RuMxBXZClnmB4w6CblySGjyh/7Bo3Vtfepb9fwrxIY7gRatYn8OP1Bc6gOLf +Kn5GKuBUPG/++jaJC0/52UvsfWFV+u87EeHMOjjR9x97I75wyusyEUKGz/juIyalN5bfZ QCc9o6Ayauo9thGUwsGRLJhooSCXtDNz1FwnvFQpo9N9CdEr7bdtK4FIpwj/Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689874995; 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=q9A5MXMWF8ECPKVVk4Q0Gb96zt/nDsMjh5AoSo+1EvE=; b=lHVSBvBmU46iVwT4hUn+7pQphMn6yezJWxaLWP4wZ74T+V4C/1Z5Uw1CyOKpuXE1PSBaI6 2SGL1BJro3ufBe18JLBsn2kh06YSdyNP6sV/ahHCvkhz5iwdRA7X/xwq/e/bKwz/P94u7s cRsC/MLkAlqRRcoA8YtXf3++rvNtuzi1LIsh2b0D65Q7BBqhujaUWPa/5HlwgP0jKVhsri OBdmmsgo+9efO2kvz17QnUmNn9PLRk7qYW1X4IWAvI5DOD9pvy6MqJQ0Ic7Od/X088TFKh wAD+hsBut5ApSbZ8H7H6vZ23ZdetRfgR5ZiJLem/C8XfHmDYjTtgLXzkki5X4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689874995; a=rsa-sha256; cv=none; b=Vxjjg1MwhjAfCm/sS7rVLNx1bKsJ+566Xc3D7tg6bD+8w3uX2KqFwaYSRb5QATgdhQUDP3 JYgcXEODvubqOIOdr33uWeQSXVgSS9S9/SrgJSjG6V3vOTFYxPAx5gZRIvAca3/XqbNiDl nyMRlWj+uYp9aBrZ0yN+N8o0AGLT7WdKZ0DsnpqPOzNiuY9TDf5cGXhSwoPHjcdAKSJzjp Gcgmo4iOXZ5XxYMDOek1pUUhZSBXkTN8SqAHNhC5U03ZPSdHCxDziVD4s/Xg7wGfASXL5U BeomPgbLaDuyC/cSsogLcPA63aUFB+99p3Wfjj96AgTfvYOnhBOOEc1Sy5QQ7Q== 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 4R6Km26KSSzgWM; Thu, 20 Jul 2023 17:43:14 +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 36KHhEiY036517; Thu, 20 Jul 2023 17:43:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KHhErn036516; Thu, 20 Jul 2023 17:43:14 GMT (envelope-from git) Date: Thu, 20 Jul 2023 17:43:14 GMT Message-Id: <202307201743.36KHhErn036516@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: 0c6028e22f9e - main - games/aquaria: 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: 0c6028e22f9e0629c01205dd56d5baedfe251bfc Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c6028e22f9e0629c01205dd56d5baedfe251bfc commit 0c6028e22f9e0629c01205dd56d5baedfe251bfc Author: Muhammad Moinur Rahman AuthorDate: 2023-07-20 13:29:22 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-20 17:42:34 +0000 games/aquaria: Fix build with llvm16 - Pet portclippy Sponsored by: The FreeBSD Foundation --- games/aquaria/Makefile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile index aca4d2d93fc8..0190b93653c5 100644 --- a/games/aquaria/Makefile +++ b/games/aquaria/Makefile @@ -20,14 +20,12 @@ LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libpng.so:graphics/png \ libtinyxml2.so:textproc/tinyxml2 +USES= cmake:insource compiler:c++11-lang lua:51 openal pkgconfig sdl +USE_CXXSTD= c++11 USE_GITHUB= yes GH_ACCOUNT= AquariaOSE GH_PROJECT= Aquaria -USES= cmake:insource compiler:c++11-lang lua:51 openal pkgconfig sdl -EXCLUDE= AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \ - libogg-* libvorbis-* lua-* tinyxml2* -EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,} CMAKE_ARGS= -DAQUARIA_DEFAULT_DATA_DIR:PATH="${DATADIR}" CMAKE_OFF= AQUARIA_INTERNAL_FREETYPE \ AQUARIA_INTERNAL_FTGL \ @@ -38,11 +36,9 @@ CMAKE_OFF= AQUARIA_INTERNAL_FREETYPE \ AQUARIA_INTERNAL_SDL \ AQUARIA_INTERNAL_TINYXML2 \ AQUARIA_INTERNAL_ZLIB + LDFLAGS+= -Wl,--as-needed # avoid overlinking (vorbis deps) LDFLAGS_i386= -Wl,-z,notext -Wl,--no-check-dynamic-relocations -SUB_FILES= pkg-message -PLIST_FILES= bin/aquaria -PORTDATA= * DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ @@ -50,14 +46,23 @@ DESKTOP_ENTRIES="${GH_PROJECT}" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" +EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,} +SUB_FILES= pkg-message + +PLIST_FILES= bin/aquaria +PORTDATA= * OPTIONS_DEFINE= SDL2 OPTIONS_DEFAULT=SDL2 SDL2_DESC= Use SDL 2.x instead of SDL 1.2.x -SDL2_CMAKE_BOOL=AQUARIA_USE_SDL2 + SDL2_USE= SDL=sdl2 SDL2_USE_OFF= SDL=sdl +SDL2_CMAKE_BOOL=AQUARIA_USE_SDL2 + +EXCLUDE= AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \ + libogg-* libvorbis-* lua-* tinyxml2* do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin