media-gfx/wings: Version bump.

Package-Manager: portage-2.3.2

3 files changed, 129 insertions, 0 deletions

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 051527c010ac..38657d2e3b0d 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,3 +1,4 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3 WHIRLPOOL 9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f WHIRLPOOL 1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1 WHIRLPOOL 51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab4834444407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
+DIST wings-2.1.tar.bz2 2647932 SHA256 9a878a76f4003d8ea54b17ed492b7aad68b3f191169e4a140b9ff7d981927a34 SHA512 92a8b7b749117f382add0c724aad1996dfd7b57034557e354d5ebf7f7d7355df84cb708e7decbeadb573d4bc93a1e3c39a7afbde0fe949f07c5016079c712313 WHIRLPOOL 1ba9c19a168ea5b3ecabc720b437cccf78015e42bb2bc81e5efd9f330dcbefa1544b8551b59553249202fb6b5bc4f0f05375d85341f6ec972fa3dbb9f7993142
diff --git a/media-gfx/wings/files/wings-2.1-wx.patch b/media-gfx/wings/files/wings-2.1-wx.patch
new file mode 100644
index 000000000000..b59449d4aabf
--- /dev/null
+++ b/media-gfx/wings/files/wings-2.1-wx.patch
@@ -0,0 +1,69 @@
+diff --git a/icons/Makefile b/icons/Makefile
+index 4e5a43d..8622b38 100644
+--- a/icons/Makefile
++++ b/icons/Makefile
+@@ -31,7 +31,7 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS)))
+ # ----------------------------------------------------
+ # FLAGS
+ # ----------------------------------------------------
+-ERL_FLAGS += 
++ERL_FLAGS += -pa ../ebin
+ ERL_COMPILE_FLAGS += -Werror +debug_info
+ 
+ # ----------------------------------------------------
+diff --git a/icons/collect_bmp.erl b/icons/collect_bmp.erl
+index 073fe73..e29d232 100644
+--- a/icons/collect_bmp.erl
++++ b/icons/collect_bmp.erl
+@@ -13,23 +13,21 @@
+ 
+ -module(collect_bmp).
+ -export([start/0,start/1]).
+--import(lists, [reverse/1]).
++
++-include_lib("wings/e3d/e3d_image.hrl").
+ 
+ start() ->
+     start(["icons","wings_icon.bundle"]).
+ 
+ start(Args) ->
+-    io:put_chars("Loading"),
+     do_start(Args, []).
+ 
+ do_start([InDir|[_|_]=T], Files) ->
+     do_start(T, add_files(InDir, Files));
+ do_start([OutFile], Files) ->
+-    wx:new(),
+     Icons = load_icons(Files),
+-    io:nl(),
+     Bin = term_to_binary(Icons, [compressed]),
+-    io:format("Writing ~s\n", [OutFile]),
++    %% io:format("Writing ~s\n", [OutFile]),
+     ok = file:write_file(OutFile, Bin).
+ 
+ add_files(Dir, Acc) ->
+@@ -42,14 +40,16 @@ load_icons([Name|Ns]) ->
+ load_icons([]) -> [].
+ 
+ load_icon(Name) ->
+-    Image = wxImage:new(Name),
+-    wxImage:ok(Image) orelse exit({failed_to_load, Name}),
+-    W = wxImage:getWidth(Image),
+-    H = wxImage:getHeight(Image),
+-    RGB = wxImage:getData(Image),
+-    case wxImage:hasAlpha(Image) of
+-	true ->  {4,W,H,RGB,wxImage:getAlpha(Image)};
+-	false -> {3,W,H,RGB, <<>>}
++    case e3d_image:load(Name) of
++        #e3d_image{bytes_pp=4, width=W, height=H} = I ->
++            #e3d_image{image=RGB} = e3d_image:convert(I, r8g8b8, 1, upper_left),
++            #e3d_image{image=Alpha} = e3d_image:convert(I, a8, 1, upper_left),
++            {4,W,H,RGB,Alpha};
++        #e3d_image{bytes_pp=3, width=W, height=H} = I ->
++            #e3d_image{image=RGB} = e3d_image:convert(I, r8g8b8, 1, upper_left),
++            {3,W,H,RGB,<<>>};
++        _ ->
++            exit({failed_to_load, Name})
+     end.
+ 
+ 
diff --git a/media-gfx/wings/wings-2.1.ebuild b/media-gfx/wings/wings-2.1.ebuild
new file mode 100644
index 000000000000..c441d9d78cfc
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-lang/erlang-18.1[smp,wxwidgets]
+	dev-libs/cl
+	media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1-wx.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e '/include_lib/s|"wings/|"../|' \
+		$(find . -name '*'.erl) \
+		|| die
+
+	default
+}
+
+src_configure() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+	# Work around parallel make issues
+	emake vsn.mk
+	for subdir in intl_tools src e3d icons plugins_src; do
+		emake -C ${subdir}
+	done
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS README
+}