diff options
author | Jeroen Roovers <jer@gentoo.org> | 2016-11-18 23:20:12 +0100 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2016-11-18 23:20:29 +0100 |
commit | 07db1e5e6836b3434299e6b7db374f6c3f8c5cbe (patch) | |
tree | b2761440f702d45cf1ff67526b38ae0cb3d739b9 /media-gfx | |
parent | 4e4d484a83eae078772dd1f3ed1cabd31f2e1102 (diff) | |
download | gentoo-07db1e5e6836b3434299e6b7db374f6c3f8c5cbe.tar.gz gentoo-07db1e5e6836b3434299e6b7db374f6c3f8c5cbe.tar.xz |
media-gfx/wings: Old.
Package-Manager: portage-2.3.2
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/wings/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/wings/files/wings-2.1-wx.patch | 69 | ||||
-rw-r--r-- | media-gfx/wings/wings-2.1.ebuild | 59 |
3 files changed, 0 insertions, 129 deletions
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest index 06b56d52bfe..51fccf286ed 100644 --- a/media-gfx/wings/Manifest +++ b/media-gfx/wings/Manifest @@ -3,4 +3,3 @@ DIST wings-1.5.4.tar.bz2 6213585 SHA256 bd04ca1c1237f3a6f29ce3f653015e21142b849b DIST wings-2.0.5.tar.bz2 2455836 SHA256 318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1 WHIRLPOOL 51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab4834444407d4c7e037523485f021d92d030f261fb4e614813540178a1bb DIST wings-2.1.2.tar.bz2 2650466 SHA256 855fd2466a9b5a85e7913ed7cb5fdb67c794ca4a305a199cc29f0b4960694f65 SHA512 fd4ad597583061167e274351459110efabe7d558fc6cdb22256caa22a3357f815f14f6cbc0529adec337f5c10e8dc75b26f63453b42218e04bda54ff9af92ecd WHIRLPOOL 3271edf8f2cf9109c3f4a70790772232e0b1f97432916833d56d17133f4d2ea67c247ea1073d33a1cb09c8b0ff13a20602de235d47245224b9d7a3f3a6833827 DIST wings-2.1.3.tar.bz2 2651435 SHA256 065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c WHIRLPOOL c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e -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 deleted file mode 100644 index b59449d4aab..00000000000 --- a/media-gfx/wings/files/wings-2.1-wx.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 deleted file mode 100644 index ae450f3ddeb..00000000000 --- a/media-gfx/wings/wings-2.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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() { - default - - sed -i \ - -e '/include_lib/s|"wings/|"../|' \ - $(find . -name '*'.erl) \ - || die -} - -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 -} |