From nobody Wed Nov 09 11:25:15 2022 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 4N6jLh16sqz4Ycfq; Wed, 9 Nov 2022 11:25:16 +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 4N6jLh0ZFVz3sCd; Wed, 9 Nov 2022 11:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667993116; 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=Yh6Bz/vIk1Fe8qJeE5V9JUlqDf/jWct2b/vhx3WLY8I=; b=rP8LTjHqGYObnYv1S7eC016aILwyo4xci28w2edCKPAC8xXV6UbsGBJOnt0SN8tjFqKpl2 /+xYD77EMwz++21ZtROiKPmXn1Aow3Fu9iNIXj39hTHQI+R3n17Ajus4CbZmoCA6hEjquD mCNxZ5SY8+bF3d9hb0Ta4Ik8QuHXxdK1BpwrcOdcmwbHrQkiM8Jt6cXHeJWXrV0sapv4Jy jOjbJgKzK9wat4qjSnVoYl9ZKCu80bBMZuKgZtEw+DGSRVktx8xrXyU8AFdpa4NAUfqzGt 48ty6u7Va9iLjm6PaOT7B8JV02uOofWEguM+1EOlic+ehn5GfcbBpxEEkOqDLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667993116; 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=Yh6Bz/vIk1Fe8qJeE5V9JUlqDf/jWct2b/vhx3WLY8I=; b=vW7a/NQsJt2t9CMfJ6km2fidCPnroZGiVzN8sXS6nYZtviuWw9nINV/iImANEsPr0g8B/T g68GZ91DGjdKmkLxdU1AmL5bIwMqMZMvB4U9ONPSnNB4d+EXWvZcvA5xUaKM5T0IWa76u9 k3ZMrt3ToSI7SqKWTwfgAMil+LIeKCrDQatqv9EWViVHgMpwC028h1oYcr5At+Ch+hWYJL Sxejoy8aj6PzjJYHqZ/nPVuUBJ1r/c//OXZcpVix17VnkH31XWC3KCMgWuGi+/Xb/MDmAm Oi0Q+RqqxbWEhYrIyZ+UR0m4HUKFQmRtAG2Bp/sREf6vJp4bD0kv+aOvDG6t7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667993116; a=rsa-sha256; cv=none; b=wpG4piWWtjtxe8zS6dZxZGE4PJV2N1M7qs70rWld0QaaQyRB1zf5lIL01Zk4/BSRKjrdLU amDBgGEzlzWB2H7KnOuhgr5zV57EFnFhbDkNO1fGSsU53NzvRSeEl3fuGldMyKqglXPtcD XcgVT0UNcChs9LnY6wp365i5nuOg8HJwaqBrIYUQ0xk8l/+WElQYBDc2lZyo0qXzRdQfcA /eAh/sy310wp912Knx/qGRI+uv4niFViiLD7hOZmnr14QkCOGzDC7FR5Z3n+VcqbeQ4aP0 RaW6HQ939mJD3lbtRg+1HmLsKlPURrFxhp4fwMlFHo3ogI/JBupm4Xm5dAtHug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6jLg6jcdzKj5; Wed, 9 Nov 2022 11:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A9BPF4M089060; Wed, 9 Nov 2022 11:25:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9BPFEc089059; Wed, 9 Nov 2022 11:25:15 GMT (envelope-from git) Date: Wed, 9 Nov 2022 11:25:15 GMT Message-Id: <202211091125.2A9BPFEc089059@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: f6123f561a05 - main - graphics/goxel: resurrect the port, unbreak against Python 3.x 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6123f561a05ded0cf2af0c9cb1f7c86e48653ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6123f561a05ded0cf2af0c9cb1f7c86e48653ae commit f6123f561a05ded0cf2af0c9cb1f7c86e48653ae Author: Alexey Dokuchaev AuthorDate: 2022-11-09 11:20:56 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-11-09 11:20:56 +0000 graphics/goxel: resurrect the port, unbreak against Python 3.x Keep the changes at minimum to help Git track history better. --- MOVED | 1 - graphics/Makefile | 1 + graphics/goxel/Makefile | 43 ++++++++++++++++++++++ graphics/goxel/distinfo | 3 ++ graphics/goxel/files/patch-SConstruct | 35 ++++++++++++++++++ .../patch-ext__src_cycles_src_util_util__path.cpp | 13 +++++++ graphics/goxel/pkg-descr | 3 ++ graphics/goxel/pkg-plist | 4 ++ 8 files changed, 102 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index 4536700c91fe..29013a739987 100644 --- a/MOVED +++ b/MOVED @@ -15887,7 +15887,6 @@ games/freera||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Pyth games/glob2||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream games/marsnomercy||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream games/netpanzer||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream -graphics/goxel||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream graphics/sk1libs||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream graphics/uniconvertor||2021-01-02|Has expired: Uses deprecated version of python games/dangerdeep||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream diff --git a/graphics/Makefile b/graphics/Makefile index 9e1d8321ed0a..d1c238ad41da 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -293,6 +293,7 @@ SUBDIR += goocanvasmm2 SUBDIR += goom SUBDIR += gource + SUBDIR += goxel SUBDIR += gpaint SUBDIR += gphoto2 SUBDIR += gpicview diff --git a/graphics/goxel/Makefile b/graphics/goxel/Makefile new file mode 100644 index 000000000000..238c28d0fc4f --- /dev/null +++ b/graphics/goxel/Makefile @@ -0,0 +1,43 @@ +PORTNAME= goxel +DISTVERSIONPREFIX= v +DISTVERSION= 0.8.2 +PORTREVISION= 1 +CATEGORIES= graphics + +MAINTAINER= greg@unrelenting.technology +COMMENT= Free and Open Source 3D Voxel Editor + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libargp.so:devel/argp-standalone \ + libglfw.so:graphics/glfw \ + libpng.so:graphics/png + +USES= compiler:c++11-lang pkgconfig scons gnome gl +USE_GITHUB= yes +GH_ACCOUNT= guillaumechereau +USE_GNOME= cairo gtk30 +USE_GL= gl + +INSTALLS_ICONS= yes +MAKE_ARGS= debug=0 werror=0 +DESKTOP_ENTRIES="Goxel" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Graphics;3DGraphics;" false + +.include + +.if ${ARCH} != amd64 && ${ARCH} != i386 +post-patch: + ${REINPLACE_CMD} -e 's/-msse2 //g' ${WRKSRC}/SConstruct +.endif + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ +.for SZ in 32 64 256 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps + ${INSTALL_DATA} ${WRKSRC}/osx/goxel/goxel/Assets.xcassets/AppIcon.appiconset/${SZ}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/goxel.png +.endfor + +.include diff --git a/graphics/goxel/distinfo b/graphics/goxel/distinfo new file mode 100644 index 000000000000..a23644b16088 --- /dev/null +++ b/graphics/goxel/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1545486941 +SHA256 (guillaumechereau-goxel-v0.8.2_GH0.tar.gz) = 4f8297560e356cb69469e0a23bcb4e9c4e8549766a0466ffeaa0c9cfb7a04049 +SIZE (guillaumechereau-goxel-v0.8.2_GH0.tar.gz) = 3387515 diff --git a/graphics/goxel/files/patch-SConstruct b/graphics/goxel/files/patch-SConstruct new file mode 100644 index 000000000000..a4c6b5177ff8 --- /dev/null +++ b/graphics/goxel/files/patch-SConstruct @@ -0,0 +1,35 @@ +--- SConstruct.orig 2018-12-22 14:00:12 UTC ++++ SConstruct +@@ -28,15 +28,18 @@ clang = int(ARGUMENTS.get("clang", 0)) + cycles = int(ARGUMENTS.get('cycles', 1)) + sound = False + +-if os.environ.get('CC') == 'clang': clang = 1 ++import subprocess ++if b'clang' in subprocess.check_output([os.environ.get('CC', 'cc'), '-v'], ++ stderr=subprocess.STDOUT): ++ clang = 1 ++print('clang', clang) + if profile: debug = 0 + +-env = Environment(ENV = os.environ) ++ ++env = Environment(ENV = os.environ, CC = os.environ.get('CC', 'cc'), ++ CXX = os.environ.get('CXX', 'c++')) + conf = env.Configure() + +-if clang: +- env.Replace(CC='clang', CXX='clang++') +- + # Asan & Ubsan (need to come first). + # Cycles doesn't like libasan with clang, so we only use it on + # C code with clang. +@@ -145,7 +148,7 @@ if cycles: + sources += glob.glob('ext_src/cycles/src/subd/*.cpp') + + env.Append(CPPPATH=['ext_src/cycles/src']) +- env.Append(CPPPATH=['ext_src/cycles/third_party/atomic']) ++ env.Prepend(CPPPATH=['ext_src/cycles/third_party/atomic']) + env.Append(CPPFLAGS=[ + '-DCYCLES_STD_UNORDERED_MAP', + '-DCCL_NAMESPACE_BEGIN=namespace ccl {', diff --git a/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp b/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp new file mode 100644 index 000000000000..008ccd5b9909 --- /dev/null +++ b/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp @@ -0,0 +1,13 @@ +--- ext_src/cycles/src/util/util_path.cpp.orig 2018-12-22 14:23:19 UTC ++++ ext_src/cycles/src/util/util_path.cpp +@@ -38,6 +38,10 @@ + # include + #endif + ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#include ++#endif ++ + #include "util/util_map.h" + #include "util/util_windows.h" + diff --git a/graphics/goxel/pkg-descr b/graphics/goxel/pkg-descr new file mode 100644 index 000000000000..915c619ae2e6 --- /dev/null +++ b/graphics/goxel/pkg-descr @@ -0,0 +1,3 @@ +A 3D program that lets you create voxel volumes, a bit similar to minecraft. + +WWW: https://guillaumechereau.github.io/goxel/ diff --git a/graphics/goxel/pkg-plist b/graphics/goxel/pkg-plist new file mode 100644 index 000000000000..12fd45320092 --- /dev/null +++ b/graphics/goxel/pkg-plist @@ -0,0 +1,4 @@ +bin/goxel +share/icons/hicolor/32x32/apps/goxel.png +share/icons/hicolor/64x64/apps/goxel.png +share/icons/hicolor/256x256/apps/goxel.png