From nobody Wed Sep 06 05:02:03 2023 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 4RgVbb6YTFz4sR6t; Wed, 6 Sep 2023 05:02:03 +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 4RgVbb672yz3XwP; Wed, 6 Sep 2023 05:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693976523; 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=JCInrRiiRJQ6xiqcXO2Bfc+mBHHo++nydzgG2cZdCls=; b=M5ZqUpgc60HOOH7xIVaDcVUvKJf1coi8kfNAxWU20Q6GYJQx1f1wVkcSx6SQYb+6KpPv+V 3Rj7uQhW1OfFSiyDknfkgb/p5f0mXH42TPuUNEVWRXVUT9JS31W/iYR6QvDM29KF85Mh0+ uryhGO+8/zDoQuIgKkPGPrfb9RkFpNANzwJxXpTNzMH11acjyMuNUO0zi62p7wwMbLSVsc a370uqPE8yL9d5jWIG68f7MOiG/Sa6X1h+XxI5y5yLY0VdJNA5H7fRwTcpQARQj7UEIbiX VUc3MJPlMvxbaGGxBvnyFe7e7lxLzdS9HIke1VZqNkzkiTZi+ZObX3h37PxuAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693976523; a=rsa-sha256; cv=none; b=bkt54riGzEJMfmMeKyaVqhiKp7l+XnkdNByqqVdOsV3npo7C3iKv5od4bNAOuXizYHPyY7 7gQSC/z8TjJzNRoMks2medv7CEVXBol4XpLvCJ4zjSKH4ZHd4aW4HdyzjzkN2UFILI6Dg9 +EAJxGiGTRpFA1UhgdFeacUxBwVxml1thPCdlgAyszYNapflaeLGZr7a2IuIf9pWEbh7eA Mx7QCJULtI0CDSkbZox9QdhkHgOdKupJihbgozBZFj1mEsrOB3xfJ+AroEQjCD8YSrpOU3 vrA1zxz6MjpTSpFEWgLeLp5JE/X4F/hI0GuAYJWevDK7OlXlq8L3JLdqNNmAFg== 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=1693976523; 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=JCInrRiiRJQ6xiqcXO2Bfc+mBHHo++nydzgG2cZdCls=; b=LOh9xM4Cz77Ur9CQL2o5VycM+vDaBl3AkcDyrBcPeLRwfCUSSCtc6n3O7DapRDmxwsxLXI 1lsx9t7R4yirfDGw+Cp4sx5ssTFPZtLGZ/pzewEW4GT6cLEgnG+DC5uxASMyKqjXokCpSL 0Fhl73uPCAB8rtP4dfHVcBSoqy2+HZOVAeZQSJzN2et0t7Xi6pAROGKz5keKG5so253XMY 1BDCPB9CjlnVoOl9943bFvOY/yRLGKPvY4tMkJujDJYvSUjL/aPRtp9um8uvvEKEJNAMIP ipi/+6By2c+ViE+HDfydnWXR77Q3mihCAYq4zcY2cI4meTCsokQVP2nZ3uK2xg== 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 4RgVbb5DjMz135P; Wed, 6 Sep 2023 05:02:03 +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 386523b3037847; Wed, 6 Sep 2023 05:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386523kP037832; Wed, 6 Sep 2023 05:02:03 GMT (envelope-from git) Date: Wed, 6 Sep 2023 05:02:03 GMT Message-Id: <202309060502.386523kP037832@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 1e713e7082b0 - main - graphics/fv: make the code both C++14/17-friendly, cleanup 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e713e7082b0c4ecd96dac71944cdee56c8e3bd5 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e713e7082b0c4ecd96dac71944cdee56c8e3bd5 commit 1e713e7082b0c4ecd96dac71944cdee56c8e3bd5 Author: Alexey Dokuchaev AuthorDate: 2023-09-06 05:00:54 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-09-06 05:00:54 +0000 graphics/fv: make the code both C++14/17-friendly, cleanup Makefile Fixes: dd362b15e226 --- graphics/fv/Makefile | 28 ++++------------------------ graphics/fv/files/patch-Makefile | 18 ++++++++++++++++++ graphics/fv/files/patch-common.h | 18 ++++++++++++++++++ 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile index 8bee9692d85c..a3443faa6d04 100644 --- a/graphics/fv/Makefile +++ b/graphics/fv/Makefile @@ -13,35 +13,15 @@ LICENSE= GPLv2+ LIB_DEPENDS= libpng.so:graphics/png -USES= gl gmake pkgconfig zip -USE_GL= glut +USES= gl gmake xorg zip +USE_GL= gl glu glut +USE_XORG= sm x11 xext xi xmu ALL_TARGET= ${PORTNAME} -CXXFLAGS+= $$(pkg-config --cflags libpng) -I${LOCALBASE}/include -LDFLAGS+= $$(pkg-config --libs libpng) -L${LOCALBASE}/lib -lglut \ - -lGLU -lGL -lbz2 -lm -lz -llzma -lpthread - PORTDOCS= AUTHORS ChangeLog README PLIST_FILES= bin/${PORTNAME} -OPTIONS_DEFINE= DEBUG DOCS - -DEBUG_CXXFLAGS_OFF= -DNDEBUG - -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - -post-patch: - @${REINPLACE_CMD} -e \ - 's|^CXX=|CXX?=| ; \ - s|^CXXFLAGS=|CXXFLAGS?=| ; \ - s|^LDFLAGS=|LDFLAGS?=|' ${WRKSRC}/Makefile +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/graphics/fv/files/patch-Makefile b/graphics/fv/files/patch-Makefile new file mode 100644 index 000000000000..3a0ec0d66b4a --- /dev/null +++ b/graphics/fv/files/patch-Makefile @@ -0,0 +1,18 @@ +--- Makefile.orig 2012-05-07 01:48:43 UTC ++++ Makefile +@@ -62,11 +62,12 @@ LDFLAGS=\ + -L/opt/local/lib -lpng15 -lz -lbz2 -llzma -lpthread \ + -lm + else +-CXXXFLAGS=\ +-$(OPT) ++CXXFLAGS+=\ ++-Wno-deprecated \ ++-I$(LOCALBASE)/include + LDFLAGS=\ + -lpng -lz -lbz2 -llzma -lpthread \ +--lfreeglut -lGLU -lGL -L/usr/X11R6/lib -lXi -lXmu -lX11 -lXext -lSM \ ++-lglut -lGLU -lGL -L$(LOCALBASE)/lib -lXi -lXmu -lX11 -lXext -lSM \ + -lm + endif + endif diff --git a/graphics/fv/files/patch-common.h b/graphics/fv/files/patch-common.h new file mode 100644 index 000000000000..9acf98835ffc --- /dev/null +++ b/graphics/fv/files/patch-common.h @@ -0,0 +1,18 @@ +--- common.h.orig 2012-05-07 01:48:43 UTC ++++ common.h +@@ -108,6 +108,7 @@ inline T deg2rad(T angle) + return angle * M_PI / 180.0; + } + ++#if _LIBCPP_STD_VER <= 14 + template + inline T clamp(T x, T a, T b) + { +@@ -118,6 +119,7 @@ inline T clamp(T x, T a, T b) + } + return x; + } ++#endif + + extern bool isLittleEndian(); +