[Pkg-erlang-commits] r1896 - in wings3d/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sun Jan 22 08:51:14 UTC 2017
Author: sgolovan
Date: 2017-01-22 08:51:13 +0000 (Sun, 22 Jan 2017)
New Revision: 1896
Added:
wings3d/trunk/debian/patches/include.diff
Removed:
wings3d/trunk/debian/patches/build.diff
wings3d/trunk/debian/patches/e3d_hrl.diff
wings3d/trunk/debian/patches/jpeg.diff
wings3d/trunk/debian/patches/lang.diff
wings3d/trunk/debian/patches/r19.diff
wings3d/trunk/debian/patches/wx.diff
Modified:
wings3d/trunk/debian/changelog
wings3d/trunk/debian/control
wings3d/trunk/debian/patches/series
wings3d/trunk/debian/rules
Log:
[wings3d]
* New upstream release. Refreshed patches, removed irrelevant ones.
Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/changelog 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,8 +1,8 @@
-wings3d (1.5.4-3) UNRELEASED; urgency=medium
+wings3d (2.1.5-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release. Refreshed patches, removed irrelevant ones.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 03 Sep 2016 14:26:30 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 22 Jan 2017 11:49:09 +0300
wings3d (1.5.4-2) unstable; urgency=medium
Modified: wings3d/trunk/debian/control
===================================================================
--- wings3d/trunk/debian/control 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/control 2017-01-22 08:51:13 UTC (rev 1896)
@@ -4,7 +4,7 @@
Section: graphics
Priority: optional
Build-Depends: debhelper (>= 8.0.0), grep-dctrl,
- erlang-dev (>= 1:18.0), erlang-esdl-dev (>= 1.2), erlang-cl,
+ erlang-dev (>= 1:18.0), erlang-esdl-dev (>= 1.2), erlang-cl, erlang-wx,
libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libjpeg-dev
Standards-Version: 3.9.8
Homepage: http://www.wings3d.com
Deleted: wings3d/trunk/debian/patches/build.diff
===================================================================
--- wings3d/trunk/debian/patches/build.diff 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/build.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,26 +0,0 @@
---- a/plugins_src/Makefile
-+++ b/plugins_src/Makefile
-@@ -51,6 +51,7 @@
- (cd primitives; $(MAKE))
- (cd commands; $(MAKE))
- (cd autouv; $(MAKE))
-+ (cd jpeg; $(MAKE) ESDL_PATH=. LIBS="-fPIC -shared -ljpeg")
-
- template: opt
- erl -pa $(WINGS_INTL) -noinput -run tools generate_template_files $(EBIN)
-@@ -64,6 +65,7 @@
- (cd primitives; $(MAKE) lang)
- (cd commands; $(MAKE) lang)
- (cd autouv; $(MAKE) lang)
-+ (cd jpeg; $(MAKE) lang)
-
- clean: subdirs_clean
- rm -f $(TARGET_FILES)
-@@ -75,6 +77,7 @@
- (cd primitives; $(MAKE) clean)
- (cd commands; $(MAKE) clean)
- (cd autouv; $(MAKE) clean)
-+ (cd jpeg; $(MAKE) clean)
-
- $(EBIN)/%.beam: $(ESRC)/%.erl
- $(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
Deleted: wings3d/trunk/debian/patches/e3d_hrl.diff
===================================================================
--- wings3d/trunk/debian/patches/e3d_hrl.diff 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/e3d_hrl.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,16 +0,0 @@
-Author: Sergei Golovan
-Description: Patch uses ordinary -include() directive instead of -include_lib() which
- searches for "e3d.hrl" in system wide directories instead of local directory.
-Last-Modified: Mon, 16 Nov 2015 13:07:05 +0300
-
---- wings-1.5.4/plugins_src/import_export/wpc_lwo.erl 2015-08-06 13:38:19.000000000 +0300
-+++ wings-1.5.3/plugins_src/import_export/wpc_lwo.erl 2014-04-13 12:03:46.000000000 +0400
-@@ -13,7 +13,7 @@
-
- -module(wpc_lwo).
- -export([init/0, menu/2, command/2, export/1]).
---include_lib("wings/e3d/e3d.hrl").
-+-include("e3d.hrl").
-
- init() ->
- true.
Added: wings3d/trunk/debian/patches/include.diff
===================================================================
--- wings3d/trunk/debian/patches/include.diff (rev 0)
+++ wings3d/trunk/debian/patches/include.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -0,0 +1,429 @@
+Author: Sergei Golovan
+Description: Patch uses ordinary -include() directive instead of -include_lib() which
+ searches for "e3d.hrl", "wings.hrl" etc. in system wide directories instead of
+ local directory.
+Last-Modified: Sun, 22 Jan 2017 11:49:25 +0300
+
+--- a/plugins_src/import_export/wpc_lwo.erl
++++ b/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("e3d.hrl").
+
+ init() ->
+ true.
+--- a/src/wings_image_viewer.erl
++++ b/src/wings_image_viewer.erl
+@@ -22,7 +22,7 @@
+ -behaviour(wx_object).
+
+ -include("wings.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("e3d_image.hrl").
+
+ %%%%%%%% API %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+--- a/src/wings_text.erl
++++ b/src/wings_text.erl
+@@ -19,7 +19,7 @@
+
+ -define(NEED_OPENGL, 1).
+ -include("wings.hrl").
+--include_lib("wings/intl_tools/wings_chars.hrl").
++-include("../intl_tools/wings_chars.hrl").
+ -compile({parse_transform,ms_transform}).
+
+ -import(lists, [reverse/1]).
+--- a/src/wings_dialog.erl
++++ b/src/wings_dialog.erl
+@@ -12,7 +12,7 @@
+ -module(wings_dialog).
+ -define(NEED_ESDL, 1). %% Needs to send mouseevents to camera
+ -include("wings.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("e3d_image.hrl").
+
+ -export([init/0,
+ info/3,
+--- a/plugins_src/wp9_dialogs.erl
++++ b/plugins_src/wp9_dialogs.erl
+@@ -14,7 +14,7 @@
+ -module(wp9_dialogs).
+ -export([init/1]).
+
+--include_lib("wings/src/wings.hrl").
++-include("../src/wings.hrl").
+
+ init(Next) ->
+ wpa:pref_set_default(?MODULE, utf8, true),
+--- a/icons/collect_bmp.erl
++++ b/icons/collect_bmp.erl
+@@ -14,7 +14,7 @@
+ -module(collect_bmp).
+ -export([start/0,start/1]).
+
+--include_lib("wings/e3d/e3d_image.hrl").
++-include_lib("../e3d/e3d_image.hrl").
+
+ start() ->
+ start(["icons","wings_icon.bundle"]).
+--- a/plugins_src/commands/wpc_circularise.erl
++++ b/plugins_src/commands/wpc_circularise.erl
+@@ -13,7 +13,7 @@
+
+ -module(wpc_circularise).
+ -export([init/0,menu/2,command/2]).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ init() ->
+ true.
+--- a/plugins_src/commands/wpc_connect_tool.erl
++++ b/plugins_src/commands/wpc_connect_tool.erl
+@@ -18,7 +18,7 @@
+ -define(NEED_ESDL, 1).
+ -define(NEED_OPENGL, 1).
+
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ %% State info
+ -record(cs, {v=[], %% Connected vertices
+--- a/plugins_src/commands/wpc_constraints.erl
++++ b/plugins_src/commands/wpc_constraints.erl
+@@ -14,7 +14,7 @@
+ -module(wpc_constraints).
+ -export([init/0,menu/2,command/2]).
+ -define(NEED_ESDL, 1).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+ -include("e3d.hrl").
+ -define(NONZERO, 1.0e-6).
+
+--- a/plugins_src/commands/wpc_doosabin.erl
++++ b/plugins_src/commands/wpc_doosabin.erl
+@@ -15,7 +15,7 @@
+
+ -export([init/0,menu/2,command/2]).
+
+--include_lib("wings.hrl").
++-include("wings.hrl").
+
+ init() ->
+ true.
+--- a/plugins_src/commands/wpc_sel_win.erl
++++ b/plugins_src/commands/wpc_sel_win.erl
+@@ -21,7 +21,7 @@
+ ]).
+
+ -define(WIN_NAME, {plugin, sel_groups}).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ %%%
+ %%% Selection groups window.
+--- a/plugins_src/commands/wpc_views_win.erl
++++ b/plugins_src/commands/wpc_views_win.erl
+@@ -21,7 +21,7 @@
+ ]).
+
+ -define(WIN_NAME, {plugin,saved_views}).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ %%%
+ %%% Saved Views window.
+--- a/plugins_src/import_export/collada_import.erl
++++ b/plugins_src/import_export/collada_import.erl
+@@ -12,7 +12,7 @@
+ %%
+ -module(collada_import).
+ -export([import/1]).
+--include_lib("wings/e3d/e3d.hrl").
++-include("e3d.hrl").
+ %% Sigh using local function in state machine
+ -compile(export_all).
+
+--- a/plugins_src/import_export/wpc_collada.erl
++++ b/plugins_src/import_export/wpc_collada.erl
+@@ -16,9 +16,9 @@
+
+ -define(DEF_IMAGE_TYPE, ".png").
+
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("wings.hrl").
++-include("e3d.hrl").
++-include("e3d_image.hrl").
+ -include_lib("xmerl/include/xmerl.hrl").
+
+ %% Collada export state record
+--- a/plugins_src/import_export/wpc_hlines.erl
++++ b/plugins_src/import_export/wpc_hlines.erl
+@@ -38,8 +38,8 @@
+ keysort/2,
+ keyreplace/4
+ ]).
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d.hrl").
++-include("wings.hrl").
++-include("e3d.hrl").
+
+ -define(EPS, 1.0e-6).
+ -define(EPS1, 1.0e-5).
+--- a/plugins_src/import_export/wpc_ply.erl
++++ b/plugins_src/import_export/wpc_ply.erl
+@@ -17,8 +17,8 @@
+
+ -export([import/1]). %% ,export/2,export/3]).
+
+--include_lib("wings/e3d/e3d.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("e3d.hrl").
++-include("e3d_image.hrl").
+
+ -import(lists, [reverse/1,reverse/2,sort/1,keysearch/3,foreach/2,
+ map/2,foldl/3]).
+--- a/plugins_src/import_export/wpc_pov.erl
++++ b/plugins_src/import_export/wpc_pov.erl
+@@ -16,9 +16,9 @@
+
+ -export([init/0, menu/2, command/2, dialog/2]).
+
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("wings.hrl").
++-include("e3d.hrl").
++-include("e3d_image.hrl").
+
+ -define(TAG, povray36).
+ -define(KEY(K), {?TAG, (K)}).
+--- a/plugins_src/primitives/wpc_bbox.erl
++++ b/plugins_src/primitives/wpc_bbox.erl
+@@ -13,7 +13,7 @@
+
+ -module(wpc_bbox).
+ -export([init/0,menu/2,command/2]).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ init() -> true.
+
+--- a/plugins_src/primitives/wpc_cylinder.erl
++++ b/plugins_src/primitives/wpc_cylinder.erl
+@@ -14,7 +14,7 @@
+
+ -module(wpc_cylinder).
+ -export([init/0,menu/2,command/2]).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+ -import(math, [cos/1,sin/1,pi/0]).
+
+ init() -> true.
+--- a/plugins_src/primitives/wpc_geodome.erl
++++ b/plugins_src/primitives/wpc_geodome.erl
+@@ -13,7 +13,7 @@
+
+ -module(wpc_geodome).
+ -export([init/0, menu/2, command/2]).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ init() -> true.
+
+--- a/plugins_src/primitives/wpc_image.erl
++++ b/plugins_src/primitives/wpc_image.erl
+@@ -15,7 +15,7 @@
+ -export([init/0,menu/2,command/2]).
+
+ -define(NEED_OPENGL,1).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ -include("e3d.hrl").
+ -include("e3d_image.hrl").
+--- a/plugins_src/primitives/wpc_knot.erl
++++ b/plugins_src/primitives/wpc_knot.erl
+@@ -14,7 +14,7 @@
+ -module(wpc_knot).
+ -export([init/0,menu/2,command/2]).
+
+--include_lib("wings/intl_tools/wings_intl.hrl").
++-include("wings_intl.hrl").
+
+ init() -> true.
+
+--- a/plugins_src/primitives/wpc_ncube.erl
++++ b/plugins_src/primitives/wpc_ncube.erl
+@@ -13,7 +13,7 @@
+ -module(wpc_ncube).
+ -export([init/0,menu/2,command/2]).
+ -import(math, [cos/1,sin/1,pi/0]).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ init() -> true.
+
+--- a/plugins_src/primitives/wpc_plane.erl
++++ b/plugins_src/primitives/wpc_plane.erl
+@@ -14,7 +14,7 @@
+ -module(wpc_plane).
+ -export([init/0,menu/2,command/2]).
+ -import(math, [sqrt/1,cos/1,pi/0,pow/2,exp/1]).
+--include_lib("wings/intl_tools/wings_intl.hrl").
++-include("wings_intl.hrl").
+
+ init() -> true.
+
+--- a/plugins_src/primitives/wpc_spiral.erl
++++ b/plugins_src/primitives/wpc_spiral.erl
+@@ -15,7 +15,7 @@
+ -export([init/0,menu/2,command/2]).
+
+ -import(math, [cos/1,sin/1,pi/0]).
+--include_lib("wings/intl_tools/wings_intl.hrl").
++-include("wings_intl.hrl").
+
+ init() ->
+ true.
+--- a/plugins_src/primitives/wpc_torus.erl
++++ b/plugins_src/primitives/wpc_torus.erl
+@@ -23,7 +23,7 @@
+ -export([init/0,menu/2,command/2]).
+
+ -import(math, [cos/1,sin/1,pi/0]).
+--include_lib("wings/intl_tools/wings_intl.hrl").
++-include("wings_intl.hrl").
+
+ init() -> true.
+
+--- a/plugins_src/primitives/wpc_tt.erl
++++ b/plugins_src/primitives/wpc_tt.erl
+@@ -19,8 +19,8 @@
+ mapfoldl/3,foldl/3,sublist/3,map/2,last/1,seq/2,seq/3,
+ flatten/1,sum/1,append/1]).
+
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d.hrl").
++-include("wings.hrl").
++-include("e3d.hrl").
+
+ -record(ttfont,
+ {nglyph, % number of glyphs
+--- a/plugins_src/commands/wpc_absolute_move.erl
++++ b/plugins_src/commands/wpc_absolute_move.erl
+@@ -12,7 +12,7 @@
+ %%
+ -module(wpc_absolute_move).
+
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ -export([init/0,menu/2,command/2]).
+
+--- a/plugins_src/commands/wpc_ambocc.erl
++++ b/plugins_src/commands/wpc_ambocc.erl
+@@ -19,8 +19,8 @@
+ -export([init/0,menu/2,command/2]).
+
+ -define(NEED_OPENGL, 1).
+--include_lib("wings.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("wings.hrl").
++-include("e3d_image.hrl").
+
+ init() ->
+ true.
+--- a/plugins_src/commands/wpc_sculpt.erl
++++ b/plugins_src/commands/wpc_sculpt.erl
+@@ -17,7 +17,7 @@
+
+ -define(NEED_OPENGL, 1).
+ -define(NEED_ESDL, 1).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+
+ -import(lists, [foldl/3,sort/1,reverse/1,member/2]).
+
+--- a/plugins_src/autouv/auv_mapping.erl
++++ b/plugins_src/autouv/auv_mapping.erl
+@@ -48,9 +48,9 @@
+ find_pinned_from_edges/2,
+ split_edges_1/2]).
+
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+ -include("auv.hrl").
+--include_lib("wings/e3d/e3d.hrl").
++-include("e3d.hrl").
+
+ -import(lists, [foldl/3,reverse/1]).
+
+--- a/plugins_src/autouv/auv_seg_ui.erl
++++ b/plugins_src/autouv/auv_seg_ui.erl
+@@ -15,7 +15,7 @@
+ -export([start/4]).
+
+ -define(NEED_ESDL, 1).
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+ -include("auv.hrl").
+
+ -import(lists, [sort/1,map/2,member/2,foldl/3,reverse/1]).
+--- a/plugins_src/autouv/auv_segment.erl
++++ b/plugins_src/autouv/auv_segment.erl
+@@ -21,7 +21,7 @@
+ -export([degrees/0, find_features/3, build_seeds/2]). %% Debugging
+ -endif.
+
+--include_lib("wings/src/wings.hrl").
++-include("wings.hrl").
+ -include("auv.hrl").
+
+ -import(lists, [reverse/1,mapfoldl/3,sort/1,foldl/3]).
+--- a/plugins_src/autouv/auv_texture.erl
++++ b/plugins_src/autouv/auv_texture.erl
+@@ -17,9 +17,9 @@
+ -define(NEED_OPENGL, 1).
+ -define(NEED_ESDL, 1).
+ -define(ERROR, error_msg(?LINE)).
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
+--include_lib("wings/e3d/e3d.hrl").
++-include("wings.hrl").
++-include("e3d_image.hrl").
++-include("e3d.hrl").
+ -include("auv.hrl").
+
+ -import(lists, [foreach/2,reverse/1,sort/1,foldl/3,member/2]).
+--- a/plugins_src/autouv/wpc_autouv.erl
++++ b/plugins_src/autouv/wpc_autouv.erl
+@@ -16,8 +16,8 @@
+ -define(NEED_OPENGL, 1).
+ -define(NEED_ESDL, 1).
+
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("wings.hrl").
++-include("e3d_image.hrl").
+ -include("auv.hrl").
+
+ -export([init/0,menu/2,command/2,redraw/1]).
+--- a/plugins_src/autouv/wpc_snap.erl
++++ b/plugins_src/autouv/wpc_snap.erl
+@@ -15,8 +15,8 @@
+
+ -define(NEED_OPENGL, 1).
+
+--include_lib("wings/src/wings.hrl").
+--include_lib("wings/e3d/e3d_image.hrl").
++-include("wings.hrl").
++-include("e3d_image.hrl").
+
+ -define(HUGE, 1.0E307).
+
Deleted: wings3d/trunk/debian/patches/jpeg.diff
===================================================================
--- wings3d/trunk/debian/patches/jpeg.diff 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/jpeg.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,9 +0,0 @@
---- a/plugins_src/jpeg/Makefile
-+++ b/plugins_src/jpeg/Makefile
-@@ -79,3 +79,6 @@
-
- endif
-
-+clean:
-+ rm -f $(BEAM) $(DRV)
-+
Deleted: wings3d/trunk/debian/patches/lang.diff
===================================================================
--- wings3d/trunk/debian/patches/lang.diff 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/lang.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,11 +0,0 @@
---- a/intl_tools/tools.erl
-+++ b/intl_tools/tools.erl
-@@ -47,7 +47,7 @@
- end;
- diff_files_1([], Acc) ->
- io:format("Processing: "),
-- prun(Acc),
-+ lists:foreach(fun(F) -> F() end, Acc),
- io:nl().
-
- prun(Fs) ->
Deleted: wings3d/trunk/debian/patches/r19.diff
===================================================================
--- wings3d/trunk/debian/patches/r19.diff 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/r19.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,160 +0,0 @@
-From: Dan Gudmundsson <dgud at users.sourceforge.net>
-Date: Wed, 6 Apr 2016 18:28:01 +0200
-Subject: Patch from upstream fixes building Wings3D with Erlang R19
- by replacing deprecated calls, fixing a macro and non-matching function
- clause.
-
---- a/e3d/e3d_qbvh.erl
-+++ b/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(_, <<>>, 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
---- a/e3d/e3d_util.erl
-+++ b/e3d/e3d_util.erl
-@@ -53,7 +53,7 @@
- New = {sublist(Key, Max-1)++sublist(Orig, Max+1, 999999),Orig},
- remove_chars(T, Max, [New|Acc]);
- remove_chars([{Key,Orig}|T], Max, Acc) ->
-- C = trunc($a+random:uniform(26)),
-+ C = trunc($a+rand:uniform(26)),
- remove_chars(T, Max, [{[C|Key],Orig}|Acc]);
- remove_chars([], Max, Acc) ->
- L0 = [{sublist(Key, Max),Key} || {Key,_} <- Acc],
---- a/intl_tools/tools.erl
-+++ b/intl_tools/tools.erl
-@@ -261,7 +261,7 @@
- %%%
-
- -define(STRINGS, wings_lang_transform_strings).
---define(FUNCTION_NAME, wings_lang_transform_function_name).
-+-define(FUNCTION, wings_lang_transform_function_name).
- -define(ERRORS, wings_lang_transform_errors).
- -define(FILENAME, wings_lang_transform_filename).
-
-@@ -286,12 +286,12 @@
- put(?FILENAME, Filename),
- Form;
- transform({function,L,Name,Arity,Cs}) ->
-- put(?FUNCTION_NAME, Name),
-+ put(?FUNCTION, Name),
- {function,L,Name,Arity,transform(Cs)};
- transform({call,L,{remote,_,{atom,_,wings_lang},{atom,_,str}}=Rem,
- [{tuple,_,[{atom,_,M}=Mod,Key]},
- {string,_,S}=Str]}) ->
-- FunName = get(?FUNCTION_NAME),
-+ FunName = get(?FUNCTION),
- K = literal_key(Key),
- add_string({{M,FunName,K},{S,L}}),
- {call,L,Rem,[{tuple,L,[Mod,{atom,L,FunName},Key]},Str]};
---- a/plugins_src/autouv/auv_mapping.erl
-+++ b/plugins_src/autouv/auv_mapping.erl
-@@ -1030,9 +1030,6 @@
- wings_pb:start(?__(1,"optimizing")),
- wings_pb:update(0.01, ?__(2,"initializing")),
-
-- {_,R1,R2} = os:timestamp(),
-- random:seed(R2, R1, 128731),
--
- %% {FaceToStretchMean, FaceToStretchWorst,FaceToVerts,VertToFaces,VertToUvs}
- {F2S2,_F2S8,Uvs,State,Scale} = stretch_setup(Fs,We0,OVs),
-
-@@ -1103,8 +1100,8 @@
- {V2S, F2S2, Uvs}.
-
- random_line() ->
-- X = random:uniform()-0.5,
-- Y = random:uniform()-0.5,
-+ X = rand:uniform()-0.5,
-+ Y = rand:uniform()-0.5,
- Len = math:sqrt(X*X+Y*Y),
- {X/Len,Y/Len}.
-
---- a/src/wings_deform.erl
-+++ b/src/wings_deform.erl
-@@ -128,14 +128,14 @@
- wings_drag:setup(Tvs, [{percent,{-20.0,20.0}}], St).
-
- crumple(normal, Vs0, #we{id=Id}=We, Acc) ->
-- {Sa,Sb,Sc} = os:timestamp(),
-+ ExpSeed = rand:export_seed_s(rand:seed_s(exs64)),
- Vs = gb_sets:to_list(Vs0),
- VsPos0 = wings_util:add_vpos(Vs, We),
- VsPos = [{V,Pos,wings_vertex:normal(V, We)} || {V,Pos} <- VsPos0],
- Fun = fun([Dx], A) ->
-- random:seed(Sa, Sb, Sc),
-+ rand:seed(ExpSeed),
- foldl(fun({V,Pos0,N}, VsAcc) ->
-- {R1,_,_} = rnd(Dx/10),
-+ R1 = rand:normal()*Dx/10,
- Pos = e3d_vec:add_prod(Pos0, N, R1),
- [{V,Pos}|VsAcc]
- end, A, VsPos)
-@@ -143,11 +143,11 @@
- [{Id,{Vs,Fun}}|Acc];
- crumple(Dir, Vs0, #we{id=Id}=We, Acc) ->
- {Xmask,Ymask,Zmask} = crumple_mask(Dir),
-- {Sa,Sb,Sc} = os:timestamp(),
-+ ExpSeed = rand:export_seed_s(rand:seed_s(exs64)),
- Vs = gb_sets:to_list(Vs0),
- VsPos = wings_util:add_vpos(Vs, We),
- Fun = fun([Dx], A) ->
-- random:seed(Sa, Sb, Sc),
-+ rand:seed(ExpSeed),
- foldl(fun({V,{X0,Y0,Z0}}, VsAcc) ->
- {R1,R2,R3} = rnd(Dx/4),
- X = X0 + R1*Xmask,
-@@ -164,20 +164,7 @@
- crumple_mask(random) -> {1,1,1}.
-
- rnd(Sc) when is_float(Sc) ->
-- %% Use Box-Muller's method for generation of normally-distributed
-- %% random numbers.
-- X1 = random:uniform(),
-- X2 = random:uniform(),
-- A1 = 2*?PI*X2,
-- R1 = math:sqrt(-2.0*math:log(X1)),
-- Y1 = R1*math:cos(A1),
-- Y2 = R1*math:sin(A1),
--
-- X3 = random:uniform(),
-- X4 = random:uniform(),
-- Y3 = math:sqrt(-2.0*math:log(X3))*math:cos(2*?PI*X4),
--
-- {Sc*(Y1-0.5),Sc*(Y2-0.5),Sc*(Y3-0.5)}.
-+ {Sc*rand:normal(),Sc*rand:normal(),Sc*rand:normal()}.
-
- %%
- %% The Inflate deformer.
---- a/src/wings_sel_cmd.erl
-+++ b/src/wings_sel_cmd.erl
-@@ -884,12 +884,12 @@
- random(Percent, #st{selmode=Mode, sel=[]}=St) ->
- P = Percent / 100,
- wings_pref:set_value(random_select, Percent),
-- {save_state, wings_sel:make(fun(_, _) -> random:uniform() < P end, Mode, St)};
-+ {save_state, wings_sel:make(fun(_, _) -> rand:uniform() < P end, Mode, St)};
- random(Percent, St) ->
- P = Percent / 100,
- NewSel = wings_sel:fold(fun(Sel0, #we{id=Id}, Acc) ->
- Sel1 = gb_sets:to_list(Sel0),
-- Sel2 = [Elem || Elem <- Sel1, random:uniform() < P ],
-+ Sel2 = [Elem || Elem <- Sel1, rand:uniform() < P ],
- case Sel2 of
- [] -> Acc;
- _ -> [{Id,gb_sets:from_list(Sel2)}|Acc]
Modified: wings3d/trunk/debian/patches/series
===================================================================
--- wings3d/trunk/debian/patches/series 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/series 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,8 +1,3 @@
-build.diff
autouv.diff
-jpeg.diff
-#lang.diff
-wx.diff
stl.diff
-e3d_hrl.diff
-r19.diff
+include.diff
Deleted: wings3d/trunk/debian/patches/wx.diff
===================================================================
--- wings3d/trunk/debian/patches/wx.diff 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/patches/wx.diff 2017-01-22 08:51:13 UTC (rev 1896)
@@ -1,15 +0,0 @@
-Author: Sergei Golovan
-Description: Patch declares wx target as a phony one.
-Last-Modified: Thu, 17 Oct 2013 16:01:13 +0400
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,7 @@
- # See the file "license.terms" for information on usage and redistribution
- # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- #
--.PHONY: all debug clean lang
-+.PHONY: all wx debug clean lang
-
- all:
- (cd intl_tools; $(MAKE))
Modified: wings3d/trunk/debian/rules
===================================================================
--- wings3d/trunk/debian/rules 2017-01-19 07:02:36 UTC (rev 1895)
+++ wings3d/trunk/debian/rules 2017-01-22 08:51:13 UTC (rev 1896)
@@ -6,7 +6,7 @@
DIR := debian/wings3d
LIBDIR := /usr/lib/erlang/lib/wings-$(WINGS_VSN)
LINTIANDIR := /usr/share/lintian/overrides
-SUBDIRS := ebin fonts plugins shaders textures
+SUBDIRS := ebin plugins shaders textures
%:
dh $@
@@ -38,7 +38,7 @@
>> debian/wings3d.substvars
get-orig-source:
- wget -O wings3d_1.5.4.orig.tar.bz2 \
- http://prdownloads.sourceforge.net/wings/wings-1.5.4.tar.bz2
+ wget -O wings3d_2.1.5.orig.tar.bz2 \
+ http://prdownloads.sourceforge.net/wings/wings-2.1.5.tar.bz2
.PHONY: override_dh_clean override_dh_auto_build override_dh_install get-orig-source
More information about the Pkg-erlang-commits
mailing list