Compare commits

..

No commits in common. "rawhide" and "f22" have entirely different histories.

9 changed files with 464 additions and 3 deletions

8
.gitignore vendored Normal file
View file

@ -0,0 +1,8 @@
wings3d_manual1.6.1.pdf
wings-1.2.tar.bz2
/wings-1.2.tar.bz2
/wings3d_manual1.6.1.pdf
/dgud-wings-9a2473e.tar.gz
/wings-1.5.1.tar.gz
/wings-1.5.2.tar.gz
/wings-1.5.3.tar.gz

View file

@ -1,3 +0,0 @@
Retired: Fails to install
See https://pagure.io/releng/issue/11618

2
sources Normal file
View file

@ -0,0 +1,2 @@
5ad9b0a3ca9d1ec69a7baac2a80467f6 wings-1.5.3.tar.gz
c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf

View file

@ -0,0 +1,18 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 21 Mar 2013 18:45:25 +0400
Subject: [PATCH] Don't try to build installer
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/Makefile b/Makefile
index 51f2727..1335aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,6 @@ macosx: all lang
unix: all lang
(cd plugins_src/jpeg; $(MAKE))
(cd plugins_src/jpeg; $(MAKE) lang)
- unix/make_installer
#
# Build the source distribution.

View file

@ -0,0 +1,54 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 21 Mar 2013 18:53:10 +0400
Subject: [PATCH] Respect CFLAGS
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/plugins_src/accel/Makefile b/plugins_src/accel/Makefile
index 3439272..0848839 100644
--- a/plugins_src/accel/Makefile
+++ b/plugins_src/accel/Makefile
@@ -30,9 +30,6 @@ BEAM = $(LIBDIR)/wpc_pnoise.beam \
$(LIBDIR)/pnoise.beam \
$(LIBDIR)/wpc_pick.beam
-UNIVERSAL_FLAGS =
-COMMON_CFLAGS = -Wall -Werror -O3
-
ifdef USEMINGWGCC
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
endif
endif
@@ -72,7 +68,7 @@ $(LIBDIR)/%.beam: %.erl
$(LIBDIR)/%.$(SO_EXT): %.c
install -d $(LIBDIR)
- $(GCC) $(COMMON_CFLAGS) -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS)
+ $(GCC) $(CFLAGS) -fPIC -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS)
clean:
rm -f $(TARGET_FILES)
diff --git a/plugins_src/jpeg/Makefile b/plugins_src/jpeg/Makefile
index 6707f35..43eb52f 100644
--- a/plugins_src/jpeg/Makefile
+++ b/plugins_src/jpeg/Makefile
@@ -73,9 +73,7 @@ else
$(LIBDIR)/wings_jpeg_image_drv.so: wings_jpeg_image_drv.c
install -d $(LIBDIR)
- $(GCC) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \
- -I/usr/local/include -L/usr/local/lib \
- wings_jpeg_image_drv.c $(LIBS) -ljpeg
+ $(GCC) $(CFLAGS) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) wings_jpeg_image_drv.c $(LIBS) -ljpeg
endif

View file

@ -0,0 +1,102 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 29 Aug 2014 16:38:06 +0400
Subject: [PATCH] Revert "Fix new type specs requires OTP-17.0"
This reverts commit 0e64eba1de0214edcaa7abda6ea635e8f0c6f1e7.
diff --git a/src/wings.hrl b/src/wings.hrl
index c7fa9e2..003a0d6 100644
--- a/src/wings.hrl
+++ b/src/wings.hrl
@@ -133,16 +133,16 @@
%% State and records
%% Main state record containing all objects and other important state.
-record(st,
- {shapes=gb_trees:empty() :: gb_trees:tree(),%All visible objects
+ {shapes=gb_trees:empty() :: gb_tree(), %All visible objects
selmode=face :: sel_mode(), %Selection mode.
sh=false :: boolean(), %Smart highlighting active.
sel=[], %Current sel: [{Id,GbSet}]
- ssels=gb_trees:empty() :: gb_trees:tree(), %Saved selections:
+ ssels=gb_trees:empty() :: gb_tree(), %Saved selections:
%% Selection only temporary?
temp_sel=none :: 'none' | {sel_mode(),boolean()},
- mat=gb_trees:empty() :: gb_trees:tree(),%Defined materials (GbTree).
+ mat=gb_trees:empty() :: gb_tree(), %Defined materials (GbTree).
pal=[], %Palette
file, %Current filename.
saved=false :: 'false' | 'true' | 'auto' | integer(),
@@ -154,7 +154,7 @@
edge_loop=none, %Previous edge loop.
views={0,{}}, %{Current,TupleOfViews}
- pst=gb_trees:empty() :: gb_trees:tree(), %Plugin State Info
+ pst=gb_trees:empty() :: gb_tree(), %Plugin State Info
% gb_tree where key is plugin module
%% Previous commands.
@@ -168,7 +168,7 @@
%% Undo information.
last_cmd=empty_scene, %Last command.
- undo=queue:new() :: queue:queue(), %Undo (de)queue.
+ undo=queue:new() :: queue(), %Undo (de)queue.
next_is_undo=true :: boolean(), %State of undo/redo toggle.
undone=[] :: list() %States that were undone.
}).
@@ -185,14 +185,14 @@
% The GbSet contains the
% object's selection.
name="" :: string() | tuple(), %Name. (AutoUV stores other things here.)
- es=array:new() :: array:array(), %array containing edges
- lv=none :: 'none' | array:array(), %Left vertex attributes
- rv=none :: 'none' | array:array(), %Right vertex attributes,
- fs :: gb_trees:tree(), %Faces
- he=gb_sets:empty() :: gb_sets:set(), %Hard edges
- vc :: array:array(), %Connection info (=incident edge)
+ es=array:new() :: array(), %array containing edges
+ lv=none :: 'none' | array(), %Left vertex attributes
+ rv=none :: 'none' | array(), %Right vertex attributes,
+ fs :: gb_tree(), %Faces
+ he=gb_sets:empty() :: gb_set(), %Hard edges
+ vc :: array(), %Connection info (=incident edge)
% for vertices.
- vp=array:new() :: array:array(), %Vertex positions.
+ vp=array:new() :: array(), %Vertex positions.
pst=gb_trees:empty(), %Plugin State Info,
% gb_tree where key is plugin module
mat=default, %Materials.
diff --git a/src/wings_sel.erl b/src/wings_sel.erl
index 0038d9e..1fb46de 100644
--- a/src/wings_sel.erl
+++ b/src/wings_sel.erl
@@ -122,7 +122,7 @@ mapfold_1(_F, Acc, [], Shs, _St, ShsAcc) ->
-type filter_fun() :: fun((visible_face_num() | edge_num() | vertex_num() | 0,
#we{}) -> boolean()).
-spec make(filter_fun(), sel_mode(), #st{}) ->
- #st{sel::[{non_neg_integer(),gb_sets:set()}]}.
+ #st{sel::[{non_neg_integer(),gb_set()}]}.
make(Filter, Mode, #st{shapes=Shapes}=St) when is_function(Filter, 2) ->
Sel0 = gb_trees:values(Shapes),
diff --git a/src/wings_undo.erl b/src/wings_undo.erl
index 58df968..b6a8d4a 100644
--- a/src/wings_undo.erl
+++ b/src/wings_undo.erl
@@ -30,12 +30,12 @@
%% The essential part of the state record.
-record(est,
- {shapes=[] :: list(#we{}) | gb_trees:tree(),
+ {shapes=[] :: list(#we{}) | gb_tree(),
selmode=face :: sel_mode(),
sel=[] :: list(),
onext=1 :: elem_num(),
mat=wings_material:default(),
- pst=gb_trees:empty() :: gb_trees:tree(),
+ pst=gb_trees:empty() :: gb_tree(),
%% For the Develop menu.
cmd,

10
wings.desktop Normal file
View file

@ -0,0 +1,10 @@
[Desktop Entry]
Name=Wings 3D
Comment=Wings 3D polygon mesh modeler
Exec=wings
Icon=wings.png
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
StartupNotify=true
StartupWMClass=Wings 3D

BIN
wings.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

270
wings.spec Normal file
View file

@ -0,0 +1,270 @@
%{?filter_setup:
%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
%filter_setup
}
%{expand: %(NIF_VER=`rpm -q erlang-erts --provides | grep --color=no erl_nif_version` ; if [ "$NIF_VER" != "" ]; then echo %%global __erlang_nif_version $NIF_VER ; fi)}
%{expand: %(DRV_VER=`rpm -q erlang-erts --provides | grep --color=no erl_drv_version` ; if [ "$DRV_VER" != "" ]; then echo %%global __erlang_drv_version $DRV_VER ; fi)}
%global wingsdir $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{name}-%{version}
%global esdldir `/usr/bin/erl -noshell -eval 'io:format("~s", [code:lib_dir(esdl)]), halt().'`
Name: wings
Version: 1.5.3
Release: 2%{?dist}
Summary: 3D Subdivision Modeler
Group: Applications/Multimedia
License: MIT
URL: http://www.wings3d.com
VCS: scm:git:https://github.com/dgud/wings.git
Source0: https://github.com/dgud/wings/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf
Source3: wings.png
Source4: wings.desktop
# Fedora/EPEL specific patch
Patch1: wings-0001-Don-t-try-to-build-installer.patch
# Fedora/EPEL specific patch
Patch2: wings-0002-Respect-CFLAGS.patch
# Revert fix for Erlang 17.x.x
Patch3: wings-0003-Revert-Fix-new-type-specs-requires-OTP-17.0.patch
BuildRequires: erlang
BuildRequires: erlang-cl
BuildRequires: erlang-esdl
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: desktop-file-utils
BuildRequires: libjpeg-devel
Provides: wings-povray = %{version}-%{release}
Obsoletes: wings-povray
Requires: erlang-cl%{?_isa}
Requires: erlang-erts%{?_isa}
Requires: erlang-esdl%{?_isa}
Requires: erlang-kernel%{?_isa}
Requires: erlang-stdlib%{?_isa}
Requires: erlang-wx%{?_isa}
%{?__erlang_drv_version:Requires: %{__erlang_drv_version}}
%description
Wings 3D is a subdivision modeler with an user interface that is easy
to use for both beginners and advanced users (inspired by Nendo and
Mirai from Izware).
%package docs
Group: Applications/Multimedia
Summary: Documentation for Wings 3D
%description docs
Documentation for Wings 3D.
%prep
%setup -q
echo "#!/bin/bash
exec /usr/bin/erl -smp disable -noinput -pa %{esdldir}/ebin -run wings_start start_halt \${1+\"\$@\"}" > ./wings.sh
chmod 755 ./wings.sh
cp %{SOURCE1} .
cp %{SOURCE4} .
sed -i -e "s,%LIBDIR%,%{_libdir},g" wings.sh
%patch1 -p1 -b .no_installer
%patch2 -p1 -b .respect_cflags
%if 0%{?fc19}%{?fc20}
%patch3 -p1 -b .revert_r17
%endif
# Add version info
echo %{version} > ./version
%build
# %%{?_smp_mflags} breaks the build
CFLAGS="%{optflags}" ESDL_PATH="%{esdldir}" make unix
%install
# Install the wings binaries
mkdir -p %{wingsdir}/plugins/default
cp -rf ebin %{wingsdir}
cp -rf fonts %{wingsdir}
cp -rf textures %{wingsdir}
cp -rf shaders %{wingsdir}
cp -rf plugins/* %{wingsdir}/plugins/default
cp -rf fonts %{wingsdir}
cp intl_tools/tools.beam %{wingsdir}/ebin
# See - https://bugzilla.redhat.com/664148
# ./src/wings_toolbar.erl:227
# ./src/wings_toolbar.erl:240
rm -f %{wingsdir}/ebin/user_default.beam
find $RPM_BUILD_ROOT -name 'README' | xargs rm -f
find $RPM_BUILD_ROOT -name '*.txt' | xargs chmod 0644
find $RPM_BUILD_ROOT -name '*.auv' | xargs chmod 0644
find $RPM_BUILD_ROOT -name '*.fs' | xargs chmod 0644
find $RPM_BUILD_ROOT -name '*.vs' | xargs chmod 0644
# Install main startup script
install -D -p -m 0755 wings.sh $RPM_BUILD_ROOT%{_bindir}/wings
# Install icon
install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/wings.png
# Install desktop entry
desktop-file-install \
--add-category Graphics \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
wings.desktop
%files
%{_bindir}/wings
%{_libdir}/erlang/lib/%{name}-%{version}
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%doc AUTHORS NOTES-1.0 NOTES-1.1 NOTES-1.2 NOTES-1.3 NOTES-1.4 NOTES-1.4.1 NOTES-1.5 OLD-NOTES README README.jp license.terms
%files docs
%doc wings3d_manual1.6.1.pdf
%changelog
* Tue Nov 04 2014 Peter Lemenkov <lemenkov@gmail.com> - 1.5.3-2
- Rebuild with Erlang 17.3.3
* Fri Aug 29 2014 Peter Lemenkov <lemenkov@gmail.com> - 1.5.3-1
- Ver. 1.5.3
- Fix building with Erlang 17.x.x
* Thu Aug 28 2014 Peter Lemenkov <lemenkov@gmail.com> - 1.5.2-4
- Rebuild with Erlang 17.2.1
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Dec 27 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.5.2-2
- Ver. 1.5.2
* Sat Nov 02 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.5.1-1
- Ver. 1.5.1
- Dropped upstreamed patches
- Restored OpenCL support
* Fri Oct 25 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.4.1-8.git9a2473e
- Rebuild with new __erlang_drv_version
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-7.git9a2473e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Mar 22 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.4.1-6.git9a2473e
- Actually remove user_default.beam file from distribution (see rhbz #664148).
* Fri Mar 22 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.4.1-5.git9a2473e
- Added localizations (closes rhbz #698630).
- Added requires on Erlang driver's API version
- Remove user_defaults.beam file from distribution (see rhbz #664148).
* Fri Mar 15 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.4.1-4.git9a2473e
- Fixed missing function
- Cleaned up spec-file
* Sat Feb 09 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.4.1-3.git9a2473e
- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
- Cleanup spec as per recently changed packaging guidelines
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2.git9a2473e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu May 10 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.4.1-1.git9a2473e
- Ver. 1.4.1.git9a2473e (post-release shapshot for 1.4.1)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Dec 9 2010 Peter Lemenkov <lemenkov@gmail.com> - 1.2.0-3
- Explicitly use erl installed into /usr/bin
* Tue Nov 16 2010 Peter Lemenkov <lemenkov@gmail.com> - 1.2.0-2
- Drop erlang-wx dependency
- Fixed startup failure (rhbz #653720)
* Mon Jul 12 2010 Peter Lemenkov <lemenkov@gmail.com> - 1.2.0-1
- Ver. 1.2.0
- Docs subpackage no longer requires main package
* Tue Aug 11 2009 Gerard Milmeister <gemi@bluewin.ch> - 1.0.1-1
- new release 1.0.1
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.05-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.05-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Oct 30 2008 Gerard Milmeister <gemi@bluewin.ch> - 0.99.05-2
- new release 0.99.05
* Sat Sep 6 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.99.02-2
- fix license tag
* Thu Mar 27 2008 Gerard Milmeister <gemi@bluewin.ch> - 0.99.02-1
- new releae 0.99.02
* Sun Apr 8 2007 Gerard Milmeister <gemi@bluewin.ch> - 0.98.36-1
- new version 0.98.36
* Thu Feb 15 2007 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-11
- add optflags (bugzilla 228925)
* Sun Dec 10 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-10
- split off povray plug-in
* Mon Aug 28 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-9
- Rebuild for FE6
* Wed Jun 7 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-8
- revert to use erlang R10B
* Thu May 18 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-7
- rebuilt for erlang R11B
* Thu Apr 27 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-5
- split off docs package
* Tue Apr 25 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-3
- build against erlang-esdl-devel
* Sun Dec 18 2005 Gerard Milmeister <gemi@bluewin.ch> - 0.98.32b-1
- New Version 0.98.32b
* Sun Mar 6 2005 Gerard Milmeister <gemi@bluewin.ch> - 0.98.27b-1
- New Version 0.98.27b
* Sun Feb 13 2005 Gerard Milmeister <gemi@bluewin.ch> - 0:0.98.27a-1
- New Version 0.98.27a
* Mon Dec 27 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:0.98.26-0.fdr.1.b
- New Version 0.98.26b
* Sat Jul 17 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:0.98.24-0.fdr.1
- New Version 0.98.24
* Fri Jun 4 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:0.98.23a-0.fdr.1
- New Version 0.98.23a
* Thu May 6 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:0.98.22c-0.fdr.1
- New Version 0.98.22c
* Sun Apr 11 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:0.98.20c-0.fdr.1
- First Fedora release