commit f195eadde88bbb450efa022984cf57a61062e0fc
Author: Peter Lemenkov <[email protected]>
Date: Sat Nov 2 15:20:55 2013 +0400
Ver. 1.5.1
Signed-off-by: Peter Lemenkov <[email protected]>
.gitignore | 1 +
sources | 2 +-
...> wings-0001-Don-t-try-to-build-installer.patch | 8 +-
wings-0001-No-Erlang-OpenCL-support-for-now.patch | 1583 --------------------
...-0002-No-such-function-lists-delete_nth-2.patch | 34 -
...CFLAGS.patch => wings-0002-Respect-CFLAGS.patch | 37 +-
wings-0003-Fix-SDL-includes.patch | 40 -
...nt-handling-and-stop-using-parameterized-.patch | 578 -------
wings.sh | 2 -
wings.spec | 59 +-
10 files changed, 51 insertions(+), 2293 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31b0bd9..2b0bd59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ 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
diff --git a/sources b/sources
index a71f463..d9fd247 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cb37c9a2259b00acd0d534422a88b091 dgud-wings-9a2473e.tar.gz
+7c4583eccd294cf6f2f7d5bc4925eb03 wings-1.5.1.tar.gz
c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf
diff --git a/wings-0005-Don-t-try-to-build-installer.patch
b/wings-0001-Don-t-try-to-build-installer.patch
similarity index 74%
rename from wings-0005-Don-t-try-to-build-installer.patch
rename to wings-0001-Don-t-try-to-build-installer.patch
index 7e39016..128bcff 100644
--- a/wings-0005-Don-t-try-to-build-installer.patch
+++ b/wings-0001-Don-t-try-to-build-installer.patch
@@ -1,7 +1,7 @@
-From 6c3ab1b2f3cc71b9bf54bff1a3ae5083e766d2c4 Mon Sep 17 00:00:00 2001
+From f5b08d51ea3010b844918fcd03e87f14aaba22a6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <[email protected]>
Date: Thu, 21 Mar 2013 18:45:25 +0400
-Subject: [PATCH 5/6] Don't try to build installer
+Subject: [PATCH 1/2] Don't try to build installer
Signed-off-by: Peter Lemenkov <[email protected]>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <[email protected]>
1 file changed, 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 713ef4e..017a43a 100644
+index 51f2727..1335aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,6 @@ macosx: all lang
@@ -21,5 +21,5 @@ index 713ef4e..017a43a 100644
#
# Build the source distribution.
--
-1.8.1.4
+1.8.3.1
diff --git a/wings-0006-Respect-CFLAGS.patch b/wings-0002-Respect-CFLAGS.patch
similarity index 58%
rename from wings-0006-Respect-CFLAGS.patch
rename to wings-0002-Respect-CFLAGS.patch
index 55b6add..54a724d 100644
--- a/wings-0006-Respect-CFLAGS.patch
+++ b/wings-0002-Respect-CFLAGS.patch
@@ -1,27 +1,29 @@
-From 438bbf8c8f5b73b145972d06672edebf7bbc2174 Mon Sep 17 00:00:00 2001
+From 2ffdacceba53e93d9e9da2ef8c710ed47762aa03 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <[email protected]>
Date: Thu, 21 Mar 2013 18:53:10 +0400
-Subject: [PATCH 6/6] Respect CFLAGS
+Subject: [PATCH 2/2] Respect CFLAGS
Signed-off-by: Peter Lemenkov <[email protected]>
---
- plugins_src/accel/Makefile | 6 ++----
- plugins_src/jpeg/Makefile | 3 +--
- 2 files changed, 3 insertions(+), 6 deletions(-)
+ plugins_src/accel/Makefile | 8 ++------
+ plugins_src/jpeg/Makefile | 4 +---
+ 2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/plugins_src/accel/Makefile b/plugins_src/accel/Makefile
-index 17eedb0..14de88f 100644
+index 3439272..0848839 100644
--- a/plugins_src/accel/Makefile
+++ b/plugins_src/accel/Makefile
-@@ -28,7 +28,6 @@ BEAM = $(LIBDIR)/wpc_pnoise.beam \
+@@ -30,9 +30,6 @@ BEAM = $(LIBDIR)/wpc_pnoise.beam \
$(LIBDIR)/pnoise.beam \
$(LIBDIR)/wpc_pick.beam
--COMMON_CFLAGS = -Wall -O3
-
+-UNIVERSAL_FLAGS =
+-COMMON_CFLAGS = -Wall -Werror -O3
+-
ifdef USEMINGWGCC
SO_EXT = dll
-@@ -45,8 +44,7 @@ else
+ LIBS = -shared
+@@ -47,8 +44,7 @@ else
GL_LIBS =
else
LIBS = -shared -fpic
@@ -31,7 +33,7 @@ index 17eedb0..14de88f 100644
endif
endif
-@@ -66,7 +64,7 @@ $(LIBDIR)/%.beam: %.erl
+@@ -72,7 +68,7 @@ $(LIBDIR)/%.beam: %.erl
$(LIBDIR)/%.$(SO_EXT): %.c
install -d $(LIBDIR)
@@ -41,19 +43,20 @@ index 17eedb0..14de88f 100644
clean:
rm -f $(TARGET_FILES)
diff --git a/plugins_src/jpeg/Makefile b/plugins_src/jpeg/Makefile
-index 9fdc29f..85f5cf4 100644
+index 6707f35..43eb52f 100644
--- a/plugins_src/jpeg/Makefile
+++ b/plugins_src/jpeg/Makefile
-@@ -66,8 +66,7 @@ else
+@@ -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) \
+- $(GCC) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \
- -I/usr/local/include -L/usr/local/lib \
-+ gcc $(CFLAGS) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \
- wings_jpeg_image_drv.c $(LIBS) -ljpeg
+- 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
+
--
-1.8.1.4
+1.8.3.1
diff --git a/wings.spec b/wings.spec
index d940840..06b84a0 100644
--- a/wings.spec
+++ b/wings.spec
@@ -1,7 +1,3 @@
-%global realname wings
-%global upstream dgud
-%global git_tag 9a2473e
-%global patchnumber 0
%{?filter_setup:
%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
%filter_setup
@@ -11,37 +7,28 @@
%global wingsdir $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{name}-%{version}
-%global esdldir `%{_libdir}/erlang/bin/erl -noshell -eval 'io:format("~s",
[code:lib_dir(esdl)]), halt().'`
+%global esdldir `/usr/bin/erl -noshell -eval 'io:format("~s",
[code:lib_dir(esdl)]), halt().'`
Name: wings
-Version: 1.4.1
-Release: 8.git%{git_tag}%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
Summary: 3D Subdivision Modeler
Group: Applications/Multimedia
License: MIT
URL: http://www.wings3d.com
-# wget --content-disposition https://github.com/dgud/wings/tarball/9a2473e
-Source0: %{upstream}-%{realname}-%{git_tag}.tar.gz
+VCS: 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
-Source2: wings.sh
Source3: wings.png
Source4: wings.desktop
# Fedora/EPEL specific patch
-# No erlang-cl for now - see https://github.com/tonyrog/cl
-Patch1: wings-0001-No-Erlang-OpenCL-support-for-now.patch
-# backported from upstream
-Patch2: wings-0002-No-such-function-lists-delete_nth-2.patch
-# Will be proposed for inclusion to upstream
-Patch3: wings-0003-Fix-SDL-includes.patch
-# backported from upstream
-Patch4:
wings-0004-Simplify-font-handling-and-stop-using-parameterized-.patch
+Patch1: wings-0001-Don-t-try-to-build-installer.patch
# Fedora/EPEL specific patch
-Patch5: wings-0005-Don-t-try-to-build-installer.patch
-# Fedora/EPEL specific patch
-Patch6: wings-0006-Respect-CFLAGS.patch
+Patch2: wings-0002-Respect-CFLAGS.patch
BuildRequires: erlang
+BuildRequires: erlang-cl
BuildRequires: erlang-esdl
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -51,12 +38,11 @@ BuildRequires: libjpeg-devel
Provides: wings-povray = %{version}-%{release}
Obsoletes: wings-povray
-Requires: erlang-dialyzer%{?_isa}
+Requires: erlang-cl%{?_isa}
Requires: erlang-erts%{?_isa}
Requires: erlang-esdl%{?_isa}
Requires: erlang-kernel%{?_isa}
Requires: erlang-stdlib%{?_isa}
-Requires: erlang-tools%{?_isa}
Requires: erlang-wx%{?_isa}
%{?__erlang_drv_version:Requires: %{__erlang_drv_version}}
@@ -77,19 +63,17 @@ Documentation for Wings 3D.
%prep
-%setup -q -n %{upstream}-%{name}-%{git_tag}
+%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 %{SOURCE2} .
cp %{SOURCE4} .
sed -i -e "s,%LIBDIR%,%{_libdir},g" wings.sh
-%patch1 -p1 -b .no_opencl
-%patch2 -p1 -b .no_lists_delete_nth
-%patch3 -p1 -b .fix_SDL_includes
-%patch4 -p1 -b .R16B
-%patch5 -p1 -b .no_installer
-%patch6 -p1 -b .respect_cflags
+%patch1 -p1 -b .no_installer
+%patch2 -p1 -b .respect_cflags
# Add version info
-echo %{version}.git%{git_tag} > ./version
+echo %{version} > ./version
%build
@@ -108,7 +92,9 @@ cp -rf plugins/* %{wingsdir}/plugins/default
cp -rf fonts %{wingsdir}
cp intl_tools/tools.beam %{wingsdir}/ebin
-# see - https://bugzilla.redhat.com/664148
+# 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
@@ -135,7 +121,7 @@ desktop-file-install \
%{_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
OLD-NOTES README README.jp license.terms
+%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
@@ -143,6 +129,11 @@ desktop-file-install \
%changelog
+* Sat Nov 02 2013 Peter Lemenkov <[email protected]> - 1.5.1-1
+- Ver. 1.5.1
+- Dropped upstreamed patches
+- Restored OpenCL support
+
* Fri Oct 25 2013 Peter Lemenkov <[email protected]> - 1.4.1-8.git9a2473e
- Rebuild with new __erlang_drv_version
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
