diff --git a/graphics/goxel/Makefile b/graphics/goxel/Makefile index d01dc3a16bf6..da578d77d189 100644 --- a/graphics/goxel/Makefile +++ b/graphics/goxel/Makefile @@ -1,36 +1,35 @@ PORTNAME= goxel -PORTVERSION= 0.12.0 +PORTVERSION= 0.13.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org COMMENT= Free and open-source 3D voxel editor WWW= https://goxel.xyz/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libglfw.so:graphics/glfw \ libpng.so:graphics/png USES= compiler:c++17-lang gl gnome pkgconfig scons USE_GITHUB= yes GH_ACCOUNT= guillaumechereau USE_GL= gl USE_GNOME= cairo gdkpixbuf2 gtk30 MAKE_ARGS= mode=release werror=false DESKTOP_ENTRIES="Goxel" "${COMMENT}" "${PORTNAME}" \ "${PORTNAME}" "Graphics;3DGraphics;" false do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for n in 16 32 64 128 512 256 1024 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps ${INSTALL_DATA} ${WRKSRC}/osx/goxel/goxel/Assets.xcassets/AppIcon.appiconset/${n}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/goxel.png .endfor .include diff --git a/graphics/goxel/distinfo b/graphics/goxel/distinfo index 0bf9d3f90236..774ed67475e1 100644 --- a/graphics/goxel/distinfo +++ b/graphics/goxel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680336268 -SHA256 (guillaumechereau-goxel-v0.12.0_GH0.tar.gz) = e3825625e1af9f58593695b0129e39f68a8f3c7d5696c096b8ed2d8b9ac69430 -SIZE (guillaumechereau-goxel-v0.12.0_GH0.tar.gz) = 3276773 +TIMESTAMP = 1703647244 +SHA256 (guillaumechereau-goxel-v0.13.0_GH0.tar.gz) = 33f92578bbd53c426ab577411aeba971f5164a0b7853ace1bad60386ebbb589e +SIZE (guillaumechereau-goxel-v0.13.0_GH0.tar.gz) = 3087165 diff --git a/graphics/goxel/files/patch-SConstruct b/graphics/goxel/files/patch-SConstruct index 4c6f80575996..4714c01d0b9b 100644 --- a/graphics/goxel/files/patch-SConstruct +++ b/graphics/goxel/files/patch-SConstruct @@ -1,30 +1,30 @@ --- SConstruct.orig 2022-08-16 08:30:35 UTC +++ SConstruct @@ -70,7 +66,7 @@ if env['mode'] not in ['debug', 'analyze']: env.Append(CCFLAGS='-Werror') if env['mode'] not in ['debug', 'analyze']: - env.Append(CPPDEFINES='NDEBUG', CCFLAGS='-Ofast') + env.Append(CPPDEFINES='NDEBUG') if env['mode'] == 'debug': env.Append(CCFLAGS=['-O0']) @@ -88,16 +84,14 @@ for root, dirnames, filenames in os.walk('src'): if filename.endswith('.c') or filename.endswith('.cpp'): sources.append(os.path.join(root, filename)) -# Check for libpng. -if conf.CheckLibWithHeader('libpng', 'png.h', 'c'): - env.Append(CPPDEFINES='HAVE_LIBPNG=1') - # Linux compilation support. if target_os == 'posix': + env.Append(CPPDEFINES='HAVE_LIBPNG=1') - env.Append(LIBS=['GL', 'm']) + env.Append(LIBS=['GL', 'm', 'dl']) # Note: add '--static' to link with all the libs needed by glfw3. env.ParseConfig('pkg-config --libs glfw3') env.ParseConfig('pkg-config --cflags --libs gtk+-3.0') + env.ParseConfig('pkg-config --libs libpng') # Windows compilation support. if target_os == 'msys': diff --git a/graphics/goxel/files/patch-ext__src_yocto_ext_filesystem.hpp b/graphics/goxel/files/patch-ext__src_yocto_ext_filesystem.hpp deleted file mode 100644 index 36a411cc8cc7..000000000000 --- a/graphics/goxel/files/patch-ext__src_yocto_ext_filesystem.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ext_src/yocto/ext/filesystem.hpp.orig 2022-08-16 08:30:35 UTC -+++ ext_src/yocto/ext/filesystem.hpp -@@ -1525,7 +1525,7 @@ GHC_INLINE std::string systemErrorText(ErrorNumber cod - std::string msg = toUtf8(std::wstring((LPWSTR)msgBuf)); - LocalFree(msgBuf); - return msg; --#elif defined(GHC_OS_MACOS) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || (defined(GHC_OS_ANDROID) && __ANDROID_API__ < 23) || defined(EMSCRIPTEN) -+#elif defined(GHC_OS_MACOS) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || (defined(GHC_OS_ANDROID) && __ANDROID_API__ < 23) || defined(EMSCRIPTEN) || defined(__FreeBSD__) - char buffer[512]; - int rc = strerror_r(code ? code : errno, buffer, sizeof(buffer)); - return rc == 0 ? (const char*)buffer : "Error in strerror_r!";