Attachment 187472 Details for Bug 222711 – instant-meshes.patch v3

[patch] instant-meshes.patch v3

instant-meshes.patch (text/plain), 7.01 KB, created by Val Packett on 2017-10-25 19:50:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2017-10-25 19:50:19 UTC

Size: 7.01 KB

patch

obsolete

>diff --git c/graphics/instant-meshes/Makefile w/graphics/instant-meshes/Makefile
>new file mode 100644
>index 000000000000..008b9d5b6b74
>--- /dev/null
>+++ w/graphics/instant-meshes/Makefile
>@@ -0,0 +1,67 @@
>+# $FreeBSD$
>+
>+PORTNAME=	instant-meshes
>+DISTVERSION=	0.0-42
>+DISTVERSIONSUFFIX=	-g4a083f4
>+CATEGORIES=	graphics
>+
>+MAINTAINER=	greg@unrelenting.technology
>+COMMENT=	Interactive field-aligned mesh generator
>+
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>+
>+BUILD_DEPENDS=	convert:graphics/ImageMagick
>+RUN_DEPENDS=	zenity:x11/zenity
>+
>+USES=		cmake:outsource compiler:c++11-lang pkgconfig
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	wjakob
>+GH_TUPLE=	wjakob:nanogui:2a61f03:nanogui/ext/nanogui \
>+	libigl:eigen:c34a913:eigen \
>+	wjakob:glfw:0ff30d6:glfw \
>+	wjakob:nanovg:ac15b84:nanovg \
>+	pybind:pybind11:c01a1c1:pybind11 \
>+	wjakob:pcg32:0ef13e6:pcg32/ext/pcg32 \
>+	wjakob:dset:7967ef0:dset/ext/dset \
>+	wjakob:tbb:550c18b:tbb/ext/tbb \
>+	wjakob:pss:a91da33:pss/ext/pss
>+
>+USE_GL=	gl
>+USE_XORG+=	xxf86vm xrandr xinerama xcursor xi x11
>+
>+PLIST_FILES=		"bin/Instant Meshes"
>+DESKTOP_ENTRIES=	"Instant Meshes" \
>+		"An interactive field-aligned mesh generator" \
>+		"${PORTNAME}" \
>+		"env LIBGL_DRI3_DISABLE=1 \"Instant Meshes\"" \
>+		"Graphics;3DGraphics;" \
>+		true
>+# radeonsi_dri crash with DRI3
>+
>+post-extract:
>+	${MV} ${WRKSRC_eigen}/* ${WRKSRC}/ext/nanogui/ext/eigen
>+	${MV} ${WRKSRC_glfw}/* ${WRKSRC}/ext/nanogui/ext/glfw
>+	${MV} ${WRKSRC_nanovg}/* ${WRKSRC}/ext/nanogui/ext/nanovg
>+	${MV} ${WRKSRC_pybind11}/* ${WRKSRC}/ext/nanogui/ext/pybind11
>+
>+post-build:
>+	convert -verbose -resize 500x500 -gravity center -background none -extent 512x512 \
>+		${WRKSRC}/resources/icon.png ${WRKDIR}/icon_512x512.png
>+.for size in 128x128 192x192 256x256
>+	convert -verbose -resize ${size} ${WRKDIR}/icon_512x512.png ${WRKDIR}/icon_${size}.png
>+.endfor
>+.for size in 16x16 24x24 32x32 48x48 64x64 96x96
>+	convert -verbose -resize ${size} ${WRKDIR}/icon_512x512.png -unsharp 0x6 ${WRKDIR}/icon_${size}.png
>+.endfor
>+
>+post-install:
>+.for size in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 192x192 256x256 512x512
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}/apps
>+	${INSTALL_DATA} ${WRKDIR}/icon_${size}.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}/apps/${PORTNAME}.png
>+	${ECHO_CMD} share/icons/hicolor/${size}/apps/${PORTNAME}.png >>${TMPPLIST}
>+.endfor
>+
>+.include <bsd.port.mk>
>diff --git c/graphics/instant-meshes/distinfo w/graphics/instant-meshes/distinfo
>new file mode 100644
>index 000000000000..78c1c4a26872
>--- /dev/null
>+++ w/graphics/instant-meshes/distinfo
>@@ -0,0 +1,21 @@
>+TIMESTAMP = 1508960792
>+SHA256 (wjakob-instant-meshes-0.0-42-g4a083f4_GH0.tar.gz) = 8fbde93e36a8f8007463b6a34c15b755e3bb9856944f63a61773708021396e10
>+SIZE (wjakob-instant-meshes-0.0-42-g4a083f4_GH0.tar.gz) = 3001873
>+SHA256 (wjakob-nanogui-2a61f03_GH0.tar.gz) = 449ec1c4510377a651de5357b18b7540f9cc4bbf2cac6b1b36d28ceff045a6b3
>+SIZE (wjakob-nanogui-2a61f03_GH0.tar.gz) = 2420569
>+SHA256 (libigl-eigen-c34a913_GH0.tar.gz) = 4727123dc498f0762748d9eaeb462a2f5b3da8f315e0a4bd4f0b39c53aa35d4e
>+SIZE (libigl-eigen-c34a913_GH0.tar.gz) = 1518424
>+SHA256 (wjakob-glfw-0ff30d6_GH0.tar.gz) = 31bd08bd1d8061a3f62ff970561994b6c90d2db7ab955134cef71ee0eda5d165
>+SIZE (wjakob-glfw-0ff30d6_GH0.tar.gz) = 471108
>+SHA256 (wjakob-nanovg-ac15b84_GH0.tar.gz) = b7971a9c4ae472c39190ed6b24d98622fec3ace0e744362fa8b540dba212a4ff
>+SIZE (wjakob-nanovg-ac15b84_GH0.tar.gz) = 2014793
>+SHA256 (pybind-pybind11-c01a1c1_GH0.tar.gz) = 84cd4dc4c0b703a43d8d547c8ddadcf30d3c26e45e3a1565bd9d5ef5040fcf7d
>+SIZE (pybind-pybind11-c01a1c1_GH0.tar.gz) = 360503
>+SHA256 (wjakob-pcg32-0ef13e6_GH0.tar.gz) = 4043b476e24158b5fc157428f2c09eea342a8f03e77fa9d57609e220e8605b9e
>+SIZE (wjakob-pcg32-0ef13e6_GH0.tar.gz) = 5320
>+SHA256 (wjakob-dset-7967ef0_GH0.tar.gz) = 5f9361a6760b327cacbe77e9260bc3b121c35ff740c61d235aff7079efaa4423
>+SIZE (wjakob-dset-7967ef0_GH0.tar.gz) = 2492
>+SHA256 (wjakob-tbb-550c18b_GH0.tar.gz) = 7a7294be306aed32895622cd6305dc1d96f7b28a909e3c75e275b85de01f53df
>+SIZE (wjakob-tbb-550c18b_GH0.tar.gz) = 2836486
>+SHA256 (wjakob-pss-a91da33_GH0.tar.gz) = e2dc7fd87c44971ea53d0c7436daa70ae3caba77facff7b5554fdb5a3d67c1b5
>+SIZE (wjakob-pss-a91da33_GH0.tar.gz) = 3476
>diff --git c/graphics/instant-meshes/files/patch-CMakeLists.txt w/graphics/instant-meshes/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..d35667961129
>--- /dev/null
>+++ w/graphics/instant-meshes/files/patch-CMakeLists.txt
>@@ -0,0 +1,21 @@
>+--- CMakeLists.txt.orig	2017-09-06 16:18:14 UTC
>++++ CMakeLists.txt
>+@@ -114,6 +114,11 @@ include_directories(
>+   ${CMAKE_CURRENT_BINARY_DIR}
>+ )
>+ 
>++if (${CMAKE_SYSTEM_NAME} MATCHES "BSD")
>++  include_directories(/usr/local/include)
>++  link_directories(/usr/local/lib)
>++endif()
>++
>+ # Run bin2c on resource files
>+ set(PNG_FILES
>+   ${CMAKE_CURRENT_SOURCE_DIR}/resources/comb.png
>+@@ -198,3 +203,6 @@ endif()
>+ if (UNIX AND NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
>+   add_custom_command(TARGET InstantMeshes POST_BUILD COMMAND strip $<TARGET_FILE:InstantMeshes>)
>+ endif()
>++
>++install(TARGETS InstantMeshes
>++        RUNTIME DESTINATION bin)
>diff --git c/graphics/instant-meshes/files/patch-ext_nanogui_CMakeLists.txt w/graphics/instant-meshes/files/patch-ext_nanogui_CMakeLists.txt
>new file mode 100644
>index 000000000000..867b99bb3c76
>--- /dev/null
>+++ w/graphics/instant-meshes/files/patch-ext_nanogui_CMakeLists.txt
>@@ -0,0 +1,16 @@
>+--- ext/nanogui/CMakeLists.txt.orig	2016-10-15 20:12:12 UTC
>++++ ext/nanogui/CMakeLists.txt
>+@@ -174,13 +174,6 @@ if (NANOGUI_BUILD_SHARED)
>+   endif()
>+ endif()
>+ 
>+-# Always use libc++ on Clang
>+-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
>+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
>+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
>+-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
>+-endif()
>+-
>+ if (NANOGUI_USE_GLAD)
>+   # Build and include GLAD on Windows
>+   list(APPEND LIBNANOGUI_EXTRA_SOURCE
>diff --git c/graphics/instant-meshes/files/patch-ext_nanogui_src_common.cpp w/graphics/instant-meshes/files/patch-ext_nanogui_src_common.cpp
>new file mode 100644
>index 000000000000..d1b743bf5c1f
>--- /dev/null
>+++ w/graphics/instant-meshes/files/patch-ext_nanogui_src_common.cpp
>@@ -0,0 +1,11 @@
>+--- ext/nanogui/src/common.cpp.orig	2017-10-01 00:15:16 UTC
>++++ ext/nanogui/src/common.cpp
>+@@ -248,7 +248,7 @@ std::string file_dialog(const std::vector<std::pair<st
>+     return std::string(ofn.lpstrFile);
>+ #else
>+     char buffer[FILE_DIALOG_MAX_BUFFER];
>+-    std::string cmd = "/usr/bin/zenity --file-selection ";
>++    std::string cmd = "zenity --file-selection ";
>+     if (save)
>+         cmd += "--save ";
>+     cmd += "--file-filter=\"";
>diff --git c/graphics/instant-meshes/pkg-descr w/graphics/instant-meshes/pkg-descr
>new file mode 100644
>index 000000000000..b5a02120aae9
>--- /dev/null
>+++ w/graphics/instant-meshes/pkg-descr
>@@ -0,0 +1,4 @@
>+Interactive 3D mesh retopology software developed as part of the publication
>+"Instant Field-Aligned Meshes".
>+
>+WWW: https://igl.ethz.ch/projects/instant-meshes/

Actions: View | Diff

Attachments on bug 222711: 186825 | 186843 | 187472 | 187840