svn commit: r429815 - in head/graphics/wings: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Dec 28 19:09:07 UTC 2016
Author: amdmi3
Date: Wed Dec 28 19:09:06 2016
New Revision: 429815
URL: https://svnweb.freebsd.org/changeset/ports/429815
Log:
- Update to 1.5.4
PR: 213938
Reported by: yuri at rawbw.com
Added:
head/graphics/wings/files/patch-e3d_e3d__qbvh.erl (contents, props changed)
head/graphics/wings/files/patch-plugins__src_import_export_wpc_lwo.erl (contents, props changed)
Deleted:
head/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c
head/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c
head/graphics/wings/files/patch-src_array.erl
head/graphics/wings/files/patch-src_wings.hrl
head/graphics/wings/files/patch-src_wings____font.erl
head/graphics/wings/files/patch-src_wings__menu.erl
head/graphics/wings/files/patch-src_wings__sel.erl
head/graphics/wings/files/patch-src_wings__text.erl
head/graphics/wings/files/patch-src_wings__undo.erl
Modified:
head/graphics/wings/Makefile
head/graphics/wings/distinfo
head/graphics/wings/pkg-plist
Modified: head/graphics/wings/Makefile
==============================================================================
--- head/graphics/wings/Makefile Wed Dec 28 18:41:28 2016 (r429814)
+++ head/graphics/wings/Makefile Wed Dec 28 19:09:06 2016 (r429815)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= wings
-PORTVERSION= 1.4.1
-PORTREVISION= 6
+PORTVERSION= 1.5.4
CATEGORIES= graphics
MASTER_SITES= SF
DIST_SUBDIR= erlang
@@ -17,12 +16,14 @@ LICENSE_FILE= ${WRKSRC}/license.terms
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= erl:lang/erlang \
- erlang-esdl>0:devel/erlang-esdl
+ erlang-esdl>0:devel/erlang-esdl \
+ erlang-cl>0:devel/erlang-cl
RUN_DEPENDS:= ${BUILD_DEPENDS}
MAKE_ENV= ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
PLIST_SUB= VERSION="${PORTVERSION}"
MAKE_JOBS_UNSAFE=yes
+USE_GL= gl glu
SUB_FILES= ${PORTNAME}.sh
@@ -40,6 +41,11 @@ DESKTOP_ENTRIES="Wings" \
post-patch:
@${REINPLACE_CMD} -e 's|$$(GCC)|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib|g' \
${WRKSRC}/plugins_src/accel/Makefile
+ @${REINPLACE_CMD} -e 's|random:|rand:|' \
+ ${WRKSRC}/src/wings_deform.erl \
+ ${WRKSRC}/src/wings_sel_cmd.erl \
+ ${WRKSRC}/e3d/e3d_util.erl \
+ ${WRKSRC}/plugins_src/autouv/auv_mapping.erl
@${FIND} ${WRKSRC} -name "*.orig" -delete
do-install:
Modified: head/graphics/wings/distinfo
==============================================================================
--- head/graphics/wings/distinfo Wed Dec 28 18:41:28 2016 (r429814)
+++ head/graphics/wings/distinfo Wed Dec 28 19:09:06 2016 (r429815)
@@ -1,2 +1,3 @@
-SHA256 (erlang/wings-1.4.1.tar.bz2) = 51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a
-SIZE (erlang/wings-1.4.1.tar.bz2) = 3904369
+TIMESTAMP = 1479231639
+SHA256 (erlang/wings-1.5.4.tar.bz2) = bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663
+SIZE (erlang/wings-1.5.4.tar.bz2) = 6213585
Added: head/graphics/wings/files/patch-e3d_e3d__qbvh.erl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/wings/files/patch-e3d_e3d__qbvh.erl Wed Dec 28 19:09:06 2016 (r429815)
@@ -0,0 +1,21 @@
+--- e3d/e3d_qbvh.erl.orig 2015-08-06 10:38:19 UTC
++++ e3d/e3d_qbvh.erl
+@@ -40,6 +40,7 @@
+
+ -define(F32, 32/float-native).
+ -define(I32, 32/signed-native).
++-define(U32, 32/unsigned-native).
+ -define(QNODE_SZ, ((24+4)*4)).
+ -define(QTRI_SZ, ((12*3+4)*4)).
+
+@@ -118,8 +119,8 @@ convert_to_image(W, <<BBs:(24*4)/binary,
+ convert_to_image(_, <<>>, Acc) -> Acc.
+
+ convert_children(4, _W, Qns, Acc) -> {Qns, Acc};
+-convert_children(J, W, <<16#ffffffff:?I32, Qns/binary>>, Acc) -> %% EMPTY
+- convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?I32>>);
++convert_children(J, W, <<16#ffffffff:?U32, Qns/binary>>, Acc) -> %% EMPTY
++ convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?U32>>);
+ convert_children(J, W, <<C0:?I32, Qns/binary>>, Acc) when C0 < 0 -> %% IS_LEAF
+ Count = first_quad(C0) * 10,
+ X = (Count rem W) div 10, %% "div 10" in order to not waste bits
Added: head/graphics/wings/files/patch-plugins__src_import_export_wpc_lwo.erl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/wings/files/patch-plugins__src_import_export_wpc_lwo.erl Wed Dec 28 19:09:06 2016 (r429815)
@@ -0,0 +1,11 @@
+--- plugins_src/import_export/wpc_lwo.erl.orig 2015-08-06 10:38:19 UTC
++++ plugins_src/import_export/wpc_lwo.erl
+@@ -13,7 +13,7 @@
+
+ -module(wpc_lwo).
+ -export([init/0, menu/2, command/2, export/1]).
+--include_lib("wings/e3d/e3d.hrl").
++-include_lib("e3d.hrl").
+
+ init() ->
+ true.
Modified: head/graphics/wings/pkg-plist
==============================================================================
--- head/graphics/wings/pkg-plist Wed Dec 28 18:41:28 2016 (r429814)
+++ head/graphics/wings/pkg-plist Wed Dec 28 19:09:06 2016 (r429815)
@@ -1,6 +1,5 @@
bin/wings
lib/erlang/lib/wings
-lib/erlang/lib/wings-%%VERSION%%/ebin/array.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__bmp.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__meshclean.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__png.beam
@@ -21,14 +20,15 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/e3
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_transform.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_util.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_vec.beam
-lib/erlang/lib/wings-%%VERSION%%/ebin/orig_kd3.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/user_default.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings.beam
-lib/erlang/lib/wings-%%VERSION%%/ebin/wings__font.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_align.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ask.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_body.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_camera.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc_ref.beam
+lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cl.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_collapse.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_color.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_console.beam
@@ -51,7 +51,6 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wi
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_ndo.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_wings.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_file.beam
-lib/erlang/lib/wings-%%VERSION%%/ebin/wings_font_table.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_gl.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_help.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_hotkey.beam
@@ -120,6 +119,9 @@ lib/erlang/lib/wings-%%VERSION%%/fonts/6
lib/erlang/lib/wings-%%VERSION%%/fonts/7x14.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-12.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-16.wingsfont
+lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB14.wingsfont
+lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB16.wingsfont
+lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB24.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica11.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica14.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica20.wingsfont
@@ -181,11 +183,13 @@ lib/erlang/lib/wings-%%VERSION%%/plugins
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_region.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_rotate_unconstrained.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sculpt.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sel_win.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shear.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shift.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sweep_extrude.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_turnedge.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_untriangulate.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_views_win.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_weld.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/default/README
lib/erlang/lib/wings-%%VERSION%%/plugins/default/wp9_dialogs.beam
@@ -209,7 +213,7 @@ lib/erlang/lib/wings-%%VERSION%%/plugins
lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_yafray.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/README
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_bbox.beam
-lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_gear.beam
+lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_cylinder.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_geodome.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_image.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_knot.beam
@@ -220,6 +224,7 @@ lib/erlang/lib/wings-%%VERSION%%/plugins
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_tt.beam
lib/erlang/lib/wings-%%VERSION%%/shaders/brick.fs
lib/erlang/lib/wings-%%VERSION%%/shaders/brick.vs
+lib/erlang/lib/wings-%%VERSION%%/shaders/cc_subdiv.cl
lib/erlang/lib/wings-%%VERSION%%/shaders/depth.fs
lib/erlang/lib/wings-%%VERSION%%/shaders/depth.vs
lib/erlang/lib/wings-%%VERSION%%/shaders/envmap.fs
@@ -245,16 +250,17 @@ lib/erlang/lib/wings-%%VERSION%%/shaders
lib/erlang/lib/wings-%%VERSION%%/shaders/xray.fs
lib/erlang/lib/wings-%%VERSION%%/shaders/xray.vs
lib/erlang/lib/wings-%%VERSION%%/src/Makefile
-lib/erlang/lib/wings-%%VERSION%%/src/array.erl
lib/erlang/lib/wings-%%VERSION%%/src/user_default.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings.hrl
lib/erlang/lib/wings-%%VERSION%%/src/wings.icon
-lib/erlang/lib/wings-%%VERSION%%/src/wings__font.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_align.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_ask.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_body.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_camera.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_cc.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_cc_ref.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_cl.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_collapse.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_color.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_console.erl
@@ -262,6 +268,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/win
lib/erlang/lib/wings-%%VERSION%%/src/wings_cs.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_de.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl.bak
lib/erlang/lib/wings-%%VERSION%%/src/wings_develop.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_dissolve.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_dl.erl
@@ -281,7 +288,6 @@ lib/erlang/lib/wings-%%VERSION%%/src/win
lib/erlang/lib/wings-%%VERSION%%/src/wings_ff_wings.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_fi.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_file.erl
-lib/erlang/lib/wings-%%VERSION%%/src/wings_font_table.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_fr.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_gl.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_help.erl
@@ -294,6 +300,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/win
lib/erlang/lib/wings-%%VERSION%%/src/wings_io_wx.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_it.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_job.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_jp.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_ko.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_lang.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_light.erl
@@ -320,6 +327,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/win
lib/erlang/lib/wings-%%VERSION%%/src/wings_scale.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl
+lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl.bak
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_conv.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_shaders.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_shape.erl
@@ -351,4 +359,5 @@ lib/erlang/lib/wings-%%VERSION%%/src/win
lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl
lib/erlang/lib/wings-%%VERSION%%/textures/brand.png
lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png
+lib/erlang/lib/wings-%%VERSION%%/textures/ip_helper.png
share/pixmaps/wings.ico
More information about the svn-ports-head
mailing list