From nobody Sun Jul 23 20:02:44 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 4R8Djc6KZmz4pQfm; Sun, 23 Jul 2023 20:02:44 +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 4R8Djc3dwfz4R78; Sun, 23 Jul 2023 20:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690142564; 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=awHCYkJh9gwYvs9pQeqLAOSQ+kfp9UBqmbRIG2R43Qg=; b=FlamsSfgHiUvbjvpShluv5KrjJ5+PwWOpKX1YsfkR1jaAuwjXPy+PTqNrJVNFU/cV8+YU9 4t2w48Qda4griMJrYLj+IQrm1GwMXY/5n/41PbEa2mjWQTmIuwFygHNdQYwNi2ubkVlf8D lNzxzj/7ycBQDmrA3Ak+YoUdwNp8Nh7yqNkSr4JPlTgC6w8jN+ZnDNuehFrm9aoP9jv8ps iXP6SvMDEljMd0LSnO9sVav38yFWn4iZlCr5blEkbQptWzFcFXDk3VY5BEXy+qL19LtHoL YfvUbUVZNbddGHNJXtbGk1pKG2w9oflCdep6WpdfhzGq1aw9YC6uTIh8Sfui2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690142564; 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=awHCYkJh9gwYvs9pQeqLAOSQ+kfp9UBqmbRIG2R43Qg=; b=Rm381zlBbxR5N4uWihwitcl1kh3J1Vjk71Oc0mCPyFcbpLsx4AgUgJNvXsjkp2Yubm+GVb FwpJTDhDwCwQHYkJakObLnfRGQU5ATugEdMFFdmWzwSB3Lb6hU6HSPbTD0PsLitC+mnu5v 5F2RsFGr9ps/h6zBHxXM7Sq/RUXXnsLAXobXA0XZyBkBk/BFtqagkpX+RRuzOvuehMZ1tD u4C3dP+Ykw1KcHr+X9wr3abPJ7SznST/3ZO8IiYr8eidiYnGbboHbIkWnCjZIQjWlrCkq/ 6BBxrJ9ICoyKhNKHq7Mwwvo4aaa4WNLoh81rB+tANMd/hXooupi0sdd+xpJXww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690142564; a=rsa-sha256; cv=none; b=wHZLgOo6mVpNJfuS43vRbzwUJaJecj6Qrx0XHJTLiohMy6IiQT0+y8G/7ly9BLfQG4bqIC XJsaXIWjUie4LKCCRuKi7yHHlQMyDyhX5dt32kV+9bV/Ou4ERXK5qxwAqG3KnCRY37Ugro 2oejT99kzBppTHbaWiRS+NuExxuAGt6GvZIUwmuTWpFaF2U3hzAO2BkjbqkZVWm0x4L7Wb pPdndm43JskUWwsyoc9KIeAWr1HhVjdQ6LeTXR37GHcUTt+sl9qVUNhVuT+UgNTsSbXCt5 w0fJ4fktKqJ1COIHqVd/04wYcNThPhjoiYG1zrFun/Ef+NWriZODeakAf0QgWw== 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 4R8Djc2HYbzqLR; Sun, 23 Jul 2023 20:02:44 +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 36NK2i7F025167; Sun, 23 Jul 2023 20:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NK2iik025166; Sun, 23 Jul 2023 20:02:44 GMT (envelope-from git) Date: Sun, 23 Jul 2023 20:02:44 GMT Message-Id: <202307232002.36NK2iik025166@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: a493958303d4 - main - graphics/osg34: 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: a493958303d4c9aa1a24e41bc1ffb632369e764b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=a493958303d4c9aa1a24e41bc1ffb632369e764b commit a493958303d4c9aa1a24e41bc1ffb632369e764b Author: Muhammad Moinur Rahman AuthorDate: 2023-07-23 19:59:13 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-23 20:02:30 +0000 graphics/osg34: Fix build with llvm16 - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- graphics/osg34/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile index 56aa2b56a7f4..ee6d0e39151d 100644 --- a/graphics/osg34/Makefile +++ b/graphics/osg34/Makefile @@ -17,30 +17,32 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff +USES= alias cmake compiler:c++11-lang gl jpeg localbase pkgconfig xorg +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= openscenegraph GH_PROJECT= OpenSceneGraph - -CONFLICTS_INSTALL=osg - -USES= alias cmake compiler:c++11-lang gl jpeg localbase pkgconfig xorg USE_GL= gl glu -USE_XORG= x11 USE_LDCONFIG= yes +USE_XORG= x11 + # needed to ensure build on gcc-based archs; harmless otherwise CXXFLAGS+= -Wno-narrowing -I${LOCALBASE}/include/Imath -DInt64=uint64_t +CONFLICTS_INSTALL=osg + +PORTSCOUT= limitw:1,even + PLIST_SUB= OSG_VERSION=${PORTVERSION} \ OSG_SHLIBVER=131 \ OPENTHREADS_VERSION=3.3.0 \ OPENTHREADS_SHLIBVER=20 -PORTSCOUT= limitw:1,even - OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA \ JASPER LIBLAS LUA NVTT OPENEXR PDF QT5 SDL \ SVG VNC XINE XRANDR OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR +OPTIONS_SUB= yes GDAL_DESC= GDAL support GTA_DESC= GTA file format support @@ -49,8 +51,6 @@ NVTT_DESC= Use NVidia texture tools SDL_DESC= Use SDL (joystick support in present3d) VNC_DESC= LibVNCServer support -OPTIONS_SUB= yes - CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_VARS= FORCE_REQUIRE+=CURL CURL_VARS_OFF= FORCE_IGNORE+=CURL @@ -112,9 +112,9 @@ VNC_VARS_OFF= FORCE_IGNORE+=LibVNCServer XINE_LIB_DEPENDS= libxine.so:multimedia/libxine XINE_VARS= FORCE_REQUIRE+=Xine XINE_VARS_OFF= FORCE_IGNORE+=Xine +XRANDR_USE= xorg=xrandr XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF -XRANDR_USE= xorg=xrandr # GUI toolkits are only needed for building examples, which are not even installed FORCE_IGNORE= FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2 # only for examples