diff --git a/.gitignore b/.gitignore index 903f3d4..ed1230a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ wings-1.2.tar.bz2 /wings-2.0.2.tar.gz /wings-2.0.3.tar.gz /wings-2.0.4.tar.gz +/wings-2.1.5.tar.gz diff --git a/sources b/sources index a01fc0e..51b5a14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f47d9dfd76ca9cfeaa222cfeee815a19 wings-2.0.4.tar.gz -c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf +SHA512 (wings-2.1.5.tar.gz) = daae9ea40b350685045b513e60d290881e8c9dcb27327644451189097cb9d3da51641c4dd4061d1ece71478e335552c49a31b90202326731fd33b39899e0c376 +SHA512 (wings3d_manual1.6.1.pdf) = 6b3bcd25b091ff95bf02ac45e4f24a54317732e44592f8116b4745cd908570489f376130368c13289388130d193385dbfa050bff3ab1d174f73c2bc1ef3e705c diff --git a/wings-0001-Respect-CFLAGS.patch b/wings-0001-Respect-CFLAGS.patch index 4a4458f..e275739 100644 --- a/wings-0001-Respect-CFLAGS.patch +++ b/wings-0001-Respect-CFLAGS.patch @@ -5,35 +5,35 @@ Subject: [PATCH] Respect CFLAGS Signed-off-by: Peter Lemenkov diff --git a/plugins_src/accel/Makefile b/plugins_src/accel/Makefile -index 7ccee18..9bd3b49 100644 +index 05d6ddd9..e272e05b 100644 --- a/plugins_src/accel/Makefile +++ b/plugins_src/accel/Makefile -@@ -30,9 +30,6 @@ ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),init:stop().' | erl +@@ -38,9 +38,6 @@ ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),init:stop().' | erl ERL_INC = "$(ERL_DIR)/usr/include" BEAM = $(LIBDIR)/wpc_pick.beam -UNIVERSAL_FLAGS = --COMMON_CFLAGS = -Wall -Werror -O3 +-COMMON_CFLAGS = -Wall - - ifdef USEMINGWGCC + ifeq ($(UseMCL),true) + OUT = -Fe: SO_EXT = dll - LIBS = -shared -@@ -47,8 +44,7 @@ else - GL_LIBS = - else - LIBS = -shared -fpic -- GL_LIBS = -L/usr/local/lib -lGLU -lGL -- CFLAGS = $(COMMON_CFLAGS) -+ GL_LIBS = -lGLU -lGL +@@ -62,8 +59,7 @@ else + GL_LIBS = + else + LIBS = -shared -fpic +- GL_LIBS = -L/usr/local/lib -lGLU -lGL +- CFLAGS = $(COMMON_CFLAGS) -Werror -O3 ++ GL_LIBS = -lGLU -lGL + endif endif endif - -@@ -71,7 +67,7 @@ $(LIBDIR)/%.beam: %.erl +@@ -87,7 +83,7 @@ $(LIBDIR)/%.beam: %.erl $(LIBDIR)/%.$(SO_EXT): %.c install -d $(LIBDIR) -- $(GCC) $(COMMON_CFLAGS) -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS) +- $(GCC) $(CFLAGS) -I$(ERL_INC) $(OUT) $@ $< $(LIBS) $(GL_LIBS) + $(GCC) $(CFLAGS) -fPIC -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS) clean: - rm -f $(TARGET_FILES) + rm -f $(TARGET_FILES) vc*.pdb wings_pick_drv.obj diff --git a/wings-0002-Fix-include-paths.patch b/wings-0002-Fix-include-paths.patch index e1d7c5d..d2f3784 100644 --- a/wings-0002-Fix-include-paths.patch +++ b/wings-0002-Fix-include-paths.patch @@ -4,8 +4,21 @@ Subject: [PATCH] Fix include paths Signed-off-by: Peter Lemenkov +diff --git a/icons/Makefile b/icons/Makefile +index 8622b383..90714caa 100644 +--- a/icons/Makefile ++++ b/icons/Makefile +@@ -32,7 +32,7 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS))) + # FLAGS + # ---------------------------------------------------- + ERL_FLAGS += -pa ../ebin +-ERL_COMPILE_FLAGS += -Werror +debug_info ++ERL_COMPILE_FLAGS += -Werror +debug_info -pa $(shell pwd)/../../wings*/ebin + + # ---------------------------------------------------- + # Targets diff --git a/plugins_src/Makefile b/plugins_src/Makefile -index fb2fd95..2481717 100644 +index fb2fd953..352496e9 100644 --- a/plugins_src/Makefile +++ b/plugins_src/Makefile @@ -33,7 +33,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) @@ -13,379 +26,72 @@ index fb2fd95..2481717 100644 # FLAGS # ---------------------------------------------------- -ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -I $(WINGS_INTL) -+ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -I $(WINGS_INTL) -I ../e3d ++ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin -I $(WINGS_INTL) # ---------------------------------------------------- # Targets -diff --git a/plugins_src/autouv/auv_mapping.erl b/plugins_src/autouv/auv_mapping.erl -index 5b2937a..92e58e6 100644 ---- 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_lib("wings.hrl"). - -include("auv.hrl"). ---include_lib("wings/e3d/e3d.hrl"). -+-include_lib("e3d.hrl"). - - -import(lists, [foldl/3,reverse/1]). - -diff --git a/plugins_src/autouv/auv_seg_ui.erl b/plugins_src/autouv/auv_seg_ui.erl -index 985bc69..2d581dc 100644 ---- 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_lib("wings.hrl"). - -include("auv.hrl"). - - -import(lists, [sort/1,map/2,member/2,foldl/3,reverse/1]). -diff --git a/plugins_src/autouv/auv_segment.erl b/plugins_src/autouv/auv_segment.erl -index 7a7af8f..28caa18 100644 ---- 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_lib("wings.hrl"). - -include("auv.hrl"). - - -import(lists, [reverse/1,mapfoldl/3,sort/1,foldl/3]). -diff --git a/plugins_src/autouv/auv_texture.erl b/plugins_src/autouv/auv_texture.erl -index 5f38c0d..12a9567 100644 ---- 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_lib("wings.hrl"). -+-include_lib("e3d_image.hrl"). -+-include_lib("e3d.hrl"). - -include("auv.hrl"). - - -import(lists, [foreach/2,reverse/1,sort/1,foldl/3,member/2]). -diff --git a/plugins_src/autouv/wpc_autouv.erl b/plugins_src/autouv/wpc_autouv.erl -index fb431c6..3cbc6aa 100644 ---- 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_lib("wings.hrl"). -+-include_lib("e3d_image.hrl"). - -include("auv.hrl"). - - -export([init/0,menu/2,command/2,redraw/1]). -diff --git a/plugins_src/commands/ambocc_gl2.erl b/plugins_src/commands/ambocc_gl2.erl -index 041b65e..b4479c5 100644 ---- a/plugins_src/commands/ambocc_gl2.erl -+++ b/plugins_src/commands/ambocc_gl2.erl -@@ -14,8 +14,8 @@ - -export([ambient_occlusion/1]). - - -define(NEED_OPENGL, 1). ---include_lib("wings/src/wings.hrl"). ---include_lib("wings/e3d/e3d_image.hrl"). -+-include_lib("wings.hrl"). -+-include_lib("e3d_image.hrl"). - - -record(ao, {df, vabs, fbo, tex, cleanup_fbo, buf}). - -define(TEX_SZ, 1024). -diff --git a/plugins_src/commands/wpc_absolute_move.erl b/plugins_src/commands/wpc_absolute_move.erl -index da536da..981ad59 100644 ---- 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_lib("wings.hrl"). - - -export([init/0,menu/2,command/2]). - -diff --git a/plugins_src/commands/wpc_circularise.erl b/plugins_src/commands/wpc_circularise.erl -index ae78721..60d600d 100644 ---- 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_lib("wings.hrl"). - - init() -> - true. -diff --git a/plugins_src/commands/wpc_connect_tool.erl b/plugins_src/commands/wpc_connect_tool.erl -index 8445d84..c6b25a0 100644 ---- 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_lib("wings.hrl"). - - %% State info - -record(cs, {v=[], %% Connected vertices -diff --git a/plugins_src/commands/wpc_constraints.erl b/plugins_src/commands/wpc_constraints.erl -index fcfd270..e8d4359 100644 ---- 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_lib("wings.hrl"). - -include("e3d.hrl"). - -define(NONZERO, 1.0e-6). - -diff --git a/plugins_src/import_export/wpc_hlines.erl b/plugins_src/import_export/wpc_hlines.erl -index 1e771e9..6fee5aa 100755 ---- 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_lib("wings.hrl"). -+-include_lib("e3d.hrl"). - - -define(EPS, 1.0e-6). - -define(EPS1, 1.0e-5). -diff --git a/plugins_src/import_export/wpc_lwo.erl b/plugins_src/import_export/wpc_lwo.erl -index c4b7b73..2694b32 100644 ---- 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_lib("e3d.hrl"). - - init() -> - true. -diff --git a/plugins_src/import_export/wpc_pov.erl b/plugins_src/import_export/wpc_pov.erl -index 9703a45..92fc450 100644 ---- 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_lib("wings.hrl"). -+-include_lib("e3d.hrl"). -+-include_lib("e3d_image.hrl"). - - -define(TAG, povray36). - -define(KEY(K), {?TAG, (K)}). -diff --git a/plugins_src/primitives/wpc_bbox.erl b/plugins_src/primitives/wpc_bbox.erl -index b2f001a..3b01fe5 100644 ---- 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_lib("wings.hrl"). - - init() -> true. - -diff --git a/plugins_src/primitives/wpc_cylinder.erl b/plugins_src/primitives/wpc_cylinder.erl -index 3d2fe87..06d9bf9 100644 ---- 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_lib("wings.hrl"). - -import(math, [cos/1,sin/1,pi/0]). - - init() -> true. -diff --git a/plugins_src/primitives/wpc_geodome.erl b/plugins_src/primitives/wpc_geodome.erl -index a1154fb..3e9ad46 100644 ---- 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_lib("wings.hrl"). - - init() -> true. - -diff --git a/plugins_src/primitives/wpc_image.erl b/plugins_src/primitives/wpc_image.erl -index 56cb105..f1d9bf0 100644 ---- 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_lib("wings.hrl"). - - -include("e3d.hrl"). - -include("e3d_image.hrl"). -diff --git a/plugins_src/primitives/wpc_knot.erl b/plugins_src/primitives/wpc_knot.erl -index 23fb8ec..0b0a030 100644 ---- 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_lib("wings_intl.hrl"). - - init() -> true. - -diff --git a/plugins_src/primitives/wpc_ncube.erl b/plugins_src/primitives/wpc_ncube.erl -index 97b9498..f92f2e1 100644 ---- 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_lib("wings.hrl"). - - init() -> true. - -diff --git a/plugins_src/primitives/wpc_plane.erl b/plugins_src/primitives/wpc_plane.erl -index 0570913..1deb210 100644 ---- 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_lib("wings_intl.hrl"). - - init() -> true. - -diff --git a/plugins_src/primitives/wpc_spiral.erl b/plugins_src/primitives/wpc_spiral.erl -index 6458f0a..72ae14b 100644 ---- 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_lib("wings_intl.hrl"). - - init() -> - true. -diff --git a/plugins_src/primitives/wpc_torus.erl b/plugins_src/primitives/wpc_torus.erl -index 6a06f4e..b475dec 100644 ---- 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_lib("wings_intl.hrl"). - - init() -> true. - -diff --git a/plugins_src/primitives/wpc_tt.erl b/plugins_src/primitives/wpc_tt.erl -index a6662f6..adf4c14 100644 ---- 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_lib("wings.hrl"). -+-include_lib("e3d.hrl"). - - -record(ttfont, - {nglyph, % number of glyphs -diff --git a/plugins_src/wp9_dialogs.erl b/plugins_src/wp9_dialogs.erl -index ea6a1e2..8b9a194 100644 ---- a/plugins_src/wp9_dialogs.erl -+++ b/plugins_src/wp9_dialogs.erl -@@ -15,8 +15,8 @@ - -export([init/1]). - -import(lists, [sort/1]). - ---include_lib("wings/intl_tools/wings_intl.hrl"). ---include_lib("wings/e3d/e3d_image.hrl"). -+-include_lib("intl_tools/wings_intl.hrl"). -+-include_lib("e3d_image.hrl"). - -include_lib("wx/include/wx.hrl"). %% includes wx headers - - init(Next) -> -diff --git a/src/wings_dialog.erl b/src/wings_dialog.erl -index 12721f0..56aab60 100644 ---- 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_lib("e3d_image.hrl"). - - -export([init/0, - info/3, -diff --git a/src/wings_image_viewer.erl b/src/wings_image_viewer.erl -index d2eddb4..1b19e8a 100644 ---- a/src/wings_image_viewer.erl -+++ b/src/wings_image_viewer.erl -@@ -22,7 +22,7 @@ - -behaviour(wx_object). +diff --git a/plugins_src/autouv/Makefile b/plugins_src/autouv/Makefile +index 27e9ab6e..65474e3c 100644 +--- a/plugins_src/autouv/Makefile ++++ b/plugins_src/autouv/Makefile +@@ -45,7 +45,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) + # ---------------------------------------------------- + # FLAGS + # ---------------------------------------------------- +-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info ++ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info - -include("wings.hrl"). ---include_lib("wings/e3d/e3d_image.hrl"). -+-include_lib("e3d_image.hrl"). + # ---------------------------------------------------- + # Targets +diff --git a/plugins_src/commands/Makefile b/plugins_src/commands/Makefile +index 3b2ac121..7b644836 100644 +--- a/plugins_src/commands/Makefile ++++ b/plugins_src/commands/Makefile +@@ -70,7 +70,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) + # ---------------------------------------------------- + ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -I $(WINGS_SRC) \ + -I $(WINGS_E3D) $(TYPE_FLAGS) \ +- +debug_info -pa $(WINGS_INTL) -I $(WINGS_INTL) ++ +debug_info -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) - %%%%%%%% API %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + # ---------------------------------------------------- + # Targets +diff --git a/plugins_src/import_export/Makefile b/plugins_src/import_export/Makefile +index 031a0287..cfe1f225 100644 +--- a/plugins_src/import_export/Makefile ++++ b/plugins_src/import_export/Makefile +@@ -53,7 +53,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) + # FLAGS + # ---------------------------------------------------- + ERL_COMPILE_FLAGS += -Werror \ +- -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_INTL) \ ++ -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) \ + -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info -diff --git a/src/wings_text.erl b/src/wings_text.erl -index e90ad2f..7a52425 100644 ---- a/src/wings_text.erl -+++ b/src/wings_text.erl -@@ -19,7 +19,7 @@ + # ---------------------------------------------------- +diff --git a/plugins_src/primitives/Makefile b/plugins_src/primitives/Makefile +index 9b96d825..a9a01963 100644 +--- a/plugins_src/primitives/Makefile ++++ b/plugins_src/primitives/Makefile +@@ -45,7 +45,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) + # FLAGS + # ---------------------------------------------------- + ERL_COMPILE_FLAGS += -Werror -I $(WINGS_SRC) -I $(WINGS_E3D) \ +- $(TYPE_FLAGS) -pa $(WINGS_INTL) -I $(WINGS_INTL) +debug_info ++ $(TYPE_FLAGS) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) +debug_info - -define(NEED_OPENGL, 1). - -include("wings.hrl"). ---include_lib("wings/intl_tools/wings_chars.hrl"). -+-include_lib("intl_tools/wings_chars.hrl"). - -compile({parse_transform,ms_transform}). + # ---------------------------------------------------- + # Targets +diff --git a/src/Makefile b/src/Makefile +index f7af240b..e12dd3ec 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -139,7 +139,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) + # FLAGS + # ---------------------------------------------------- + ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \ +-'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) $(USE_WX) ++'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin $(USE_WX) - -import(lists, [reverse/1]). + # ---------------------------------------------------- + # Targets diff --git a/wings-0003-Don-t-assume-we-have-installed-Wings.patch b/wings-0003-Don-t-assume-we-have-installed-Wings.patch index a6980ae..8e36dd8 100644 --- a/wings-0003-Don-t-assume-we-have-installed-Wings.patch +++ b/wings-0003-Don-t-assume-we-have-installed-Wings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't assume we have installed Wings Signed-off-by: Peter Lemenkov diff --git a/tools/release b/tools/release -index 20a2240..e0f8718 100755 +index 6e9a1edb..a859692d 100755 --- a/tools/release +++ b/tools/release @@ -32,7 +32,11 @@ main(_) -> diff --git a/wings-0004-Don-t-build-release.patch b/wings-0004-Don-t-build-release.patch index e3d15d2..a6d9c24 100644 --- a/wings-0004-Don-t-build-release.patch +++ b/wings-0004-Don-t-build-release.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't build release Signed-off-by: Peter Lemenkov diff --git a/Makefile b/Makefile -index a6f1acd..66e91d4 100644 +index a6f1acd1..66e91d43 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,6 @@ macosx: all lang diff --git a/wings.sh b/wings.sh index a5bc73b..280fbba 100755 --- a/wings.sh +++ b/wings.sh @@ -1,2 +1,2 @@ #!/bin/bash -exec /usr/bin/erl -smp disable -noinput -run wings_start start_halt ${1+"$@"} +exec /usr/bin/erl -noinput -run wings_start start_halt ${1+"$@"} diff --git a/wings.spec b/wings.spec index 4284827..f0016ac 100644 --- a/wings.spec +++ b/wings.spec @@ -2,8 +2,8 @@ Name: wings -Version: 2.0.4 -Release: 4%{?dist} +Version: 2.1.5 +Release: 1%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -23,9 +23,15 @@ Patch2: wings-0002-Fix-include-paths.patch Patch3: wings-0003-Don-t-assume-we-have-installed-Wings.patch # Fedora/EPEL specific patch Patch4: wings-0004-Don-t-build-release.patch -BuildRequires: erlang BuildRequires: erlang-cl +BuildRequires: erlang-erts +BuildRequires: erlang-kernel +BuildRequires: erlang-lfe BuildRequires: erlang-rpm-macros +BuildRequires: erlang-stdlib +BuildRequires: erlang-tools +BuildRequires: erlang-wx +BuildRequires: erlang-xmerl BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: desktop-file-utils @@ -33,8 +39,6 @@ BuildRequires: desktop-file-utils Provides: wings-povray = %{version}-%{release} Obsoletes: wings-povray -%{?__erlang_drv_version:Requires: %{__erlang_drv_version}} - %description Wings 3D is a subdivision modeler with an user interface that is easy @@ -52,13 +56,9 @@ Documentation for Wings 3D. %prep -%setup -q +%autosetup -p1 cp %{SOURCE1} . cp %{SOURCE4} . -%patch1 -p1 -b .respect_cflags -%patch2 -p1 -b .fix_includes -%patch3 -p1 -b .fresh -%patch4 -p1 -b .norel # Add version info echo %{version} > ./version @@ -118,6 +118,9 @@ install -D -p -m 0644 unix/wings.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/ %changelog +* Fri Aug 25 2017 Peter Lemenkov - 2.1.5-1 +- Ver. 2.1.5 + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild