diff --git a/graphics/goxel/Makefile b/graphics/goxel/Makefile index 7468a9da7edd..293f4e78d9d7 100644 --- a/graphics/goxel/Makefile +++ b/graphics/goxel/Makefile @@ -1,36 +1,35 @@ PORTNAME= goxel -PORTVERSION= 0.11.0 +PORTVERSION= 0.12.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 0bf33d32dba8..0bf9d3f90236 100644 --- a/graphics/goxel/distinfo +++ b/graphics/goxel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660638635 -SHA256 (guillaumechereau-goxel-v0.11.0_GH0.tar.gz) = 660030e1b3b33a3e909d8189780a192cba059774af57b042ecb63297f2a6d0fc -SIZE (guillaumechereau-goxel-v0.11.0_GH0.tar.gz) = 2718621 +TIMESTAMP = 1680336268 +SHA256 (guillaumechereau-goxel-v0.12.0_GH0.tar.gz) = e3825625e1af9f58593695b0129e39f68a8f3c7d5696c096b8ed2d8b9ac69430 +SIZE (guillaumechereau-goxel-v0.12.0_GH0.tar.gz) = 3276773 diff --git a/graphics/goxel/files/patch-SConstruct b/graphics/goxel/files/patch-SConstruct index 58485b0130ac..4c6f80575996 100644 --- a/graphics/goxel/files/patch-SConstruct +++ b/graphics/goxel/files/patch-SConstruct @@ -1,41 +1,30 @@ --- SConstruct.orig 2022-08-16 08:30:35 UTC +++ SConstruct -@@ -45,10 +45,6 @@ if os.environ.get('CC') == 'clang': - if os.environ.get('CC') == 'clang': - env.Replace(CC='clang', CXX='clang++') - --# Hack for gcc <= 5, since pragma diagnostic push doesn't seem to work. --if env['CCVERSION'] and int(env['CCVERSION'].split('.')[0]) <= 5: -- env.Append(CCFLAGS=['-Wno-unused-function']) -- - # Asan & Ubsan (need to come first). - if env['mode'] == 'debug' and target_os == 'posix': - env.Append(CCFLAGS=['-fsanitize=address', '-fsanitize=undefined'], @@ -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']) # 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_quickjs_quickjs-libc.c b/graphics/goxel/files/patch-ext__src_quickjs_quickjs-libc.c new file mode 100644 index 000000000000..7d072a65ff09 --- /dev/null +++ b/graphics/goxel/files/patch-ext__src_quickjs_quickjs-libc.c @@ -0,0 +1,13 @@ +--- ext_src/quickjs/quickjs-libc.c.orig 2023-04-01 08:04:28 UTC ++++ ext_src/quickjs/quickjs-libc.c +@@ -47,6 +47,10 @@ + #include + #include + ++#if defined(__FreeBSD__) ++typedef sig_t sighandler_t; ++extern char **environ; ++#endif + #if defined(__APPLE__) + typedef sig_t sighandler_t; + #if !defined(environ)