* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/
@ 2016-06-12 8:37 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-06-12 8:37 UTC (permalink / raw
To: gentoo-commits
commit: ea8a91afdf24a71f531ac482560e04569c6ee2b9
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 08:37:04 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 08:37:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8a91af
media-gfx/wings: Fix include_lib (wx) (bug #585654).
Package-Manager: portage-2.3.0_rc1
media-gfx/wings/files/wings-2.0.4-wx.patch | 10 ++++++++++
media-gfx/wings/wings-2.0.4.ebuild | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/media-gfx/wings/files/wings-2.0.4-wx.patch b/media-gfx/wings/files/wings-2.0.4-wx.patch
new file mode 100644
index 0000000..a50f3d5
--- /dev/null
+++ b/media-gfx/wings/files/wings-2.0.4-wx.patch
@@ -0,0 +1,10 @@
+--- a/plugins_src/primitives/wpc_tt.erl
++++ b/plugins_src/primitives/wpc_tt.erl
+@@ -21,6 +21,7 @@
+
+ -include_lib("wings/src/wings.hrl").
+ -include_lib("wings/e3d/e3d.hrl").
++-include_lib("wx/include/wx.hrl").
+
+ -record(ttfont,
+ {nglyph, % number of glyphs
diff --git a/media-gfx/wings/wings-2.0.4.ebuild b/media-gfx/wings/wings-2.0.4.ebuild
index 67b2700..e295638 100644
--- a/media-gfx/wings/wings-2.0.4.ebuild
+++ b/media-gfx/wings/wings-2.0.4.ebuild
@@ -20,7 +20,13 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-wx.patch
+)
+
src_prepare() {
+ default
+
sed -i \
-e '/include_lib/s|wings/|../|' \
plugins_src/primitives/wpc_knot.erl \
@@ -54,7 +60,7 @@ src_install() {
find -name 'Makefile*' -exec rm -f '{}' \;
insinto ${WINGS_PATH}
- doins -r e3d ebin fonts icons plugins psd shaders src textures tools
+ doins -r e3d ebin icons plugins psd shaders src textures tools
dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
dosym ${ESDL_PATH} ${ERL_PATH}/esdl
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/
@ 2016-07-02 11:28 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-07-02 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 822eb3ec491e77960fa27f4495bc19677817b11c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 11:27:49 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 11:27:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822eb3ec
media-gfx/wings: Use sh instead of bash.
Package-Manager: portage-2.3.0
media-gfx/wings/files/wings.sh | 2 +-
media-gfx/wings/files/wings.sh-r1 | 2 +-
media-gfx/wings/{wings-1.5.4-r1.ebuild => wings-1.5.4-r2.ebuild} | 0
media-gfx/wings/{wings-2.0.4-r3.ebuild => wings-2.0.4-r4.ebuild} | 0
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/wings/files/wings.sh b/media-gfx/wings/files/wings.sh
index e542588..3fcebe4 100644
--- a/media-gfx/wings/files/wings.sh
+++ b/media-gfx/wings/files/wings.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
ESDL_ROOT="/usr/lib/erlang/lib/esdl"
WINGS_ROOT="/usr/lib/erlang/lib/wings"
exec erl -smp disable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
diff --git a/media-gfx/wings/files/wings.sh-r1 b/media-gfx/wings/files/wings.sh-r1
index 0816756..9cf1f26 100644
--- a/media-gfx/wings/files/wings.sh-r1
+++ b/media-gfx/wings/files/wings.sh-r1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
ESDL_ROOT="/usr/lib/erlang/lib/esdl"
WINGS_ROOT="/usr/lib/erlang/lib/wings"
exec erl -smp enable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
diff --git a/media-gfx/wings/wings-1.5.4-r1.ebuild b/media-gfx/wings/wings-1.5.4-r2.ebuild
similarity index 100%
rename from media-gfx/wings/wings-1.5.4-r1.ebuild
rename to media-gfx/wings/wings-1.5.4-r2.ebuild
diff --git a/media-gfx/wings/wings-2.0.4-r3.ebuild b/media-gfx/wings/wings-2.0.4-r4.ebuild
similarity index 100%
rename from media-gfx/wings/wings-2.0.4-r3.ebuild
rename to media-gfx/wings/wings-2.0.4-r4.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/
@ 2016-10-17 13:49 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-10-17 13:49 UTC (permalink / raw
To: gentoo-commits
commit: dcdfe6d393e185ac1c0e6949d950c571eca62e7f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 13:47:41 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 13:47:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcdfe6d3
media-gfx/wings: Version bump.
Package-Manager: portage-2.3.2
media-gfx/wings/Manifest | 1 +
media-gfx/wings/files/wings-2.1-wx.patch | 69 ++++++++++++++++++++++++++++++++
media-gfx/wings/wings-2.1.ebuild | 59 +++++++++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 051527c..38657d2 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 00000000..b59449d
--- /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 00000000..c441d9d
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/
@ 2016-11-18 22:20 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-11-18 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 07db1e5e6836b3434299e6b7db374f6c3f8c5cbe
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 22:20:12 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 22:20:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07db1e5e
media-gfx/wings: Old.
Package-Manager: portage-2.3.2
media-gfx/wings/Manifest | 1 -
media-gfx/wings/files/wings-2.1-wx.patch | 69 --------------------------------
media-gfx/wings/wings-2.1.ebuild | 59 ---------------------------
3 files changed, 129 deletions(-)
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 06b56d5..51fccf2 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 b59449d..00000000
--- 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 ae450f3..00000000
--- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/
@ 2024-10-20 11:31 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2024-10-20 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 0b147716b72e43f34176510ecdf55e83ed5ae817
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 11:30:29 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 11:31:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b147716
media-gfx/wings: add 2.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
media-gfx/wings/Manifest | 1 +
media-gfx/wings/files/wings-2.3-nogit.patch | 13 ++++++
media-gfx/wings/wings-2.3.ebuild | 62 +++++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 3dca7377222e..a06c09c103b1 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1 +1,2 @@
DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
+DIST wings-2.3.tar.bz2 3561319 BLAKE2B 0f3dce900dcae74516b57555f188aa578a5ea138d0e55e2b15ba946581652e470f5f596bd7e7661394674d437c8cbbe395bbf2e769af2a77d6940fddab1c86df SHA512 b5b054d974af2443cbe7d46a32cb8dfb7641054fa68aea9245e3d3100b21d223f443171572c3f371f25d937dca8cdb11870c61ba21e28632afef7886b4b2487b
diff --git a/media-gfx/wings/files/wings-2.3-nogit.patch b/media-gfx/wings/files/wings-2.3-nogit.patch
new file mode 100644
index 000000000000..734fbbeb717d
--- /dev/null
+++ b/media-gfx/wings/files/wings-2.3-nogit.patch
@@ -0,0 +1,13 @@
+--- a/Makefile 2024-10-20 12:12:36.987424596 +0200
++++ b/Makefile 2024-10-20 12:13:55.487467140 +0200
+@@ -14,10 +14,8 @@
+ # Check if OpenCL package is as external dependency
+ CL_PATH = $(shell $(ERL) -noshell -eval 'erlang:display(code:which(cl))' -s erlang halt)
+ ifneq (,$(findstring non_existing, $(CL_PATH)))
+-DEPS=cl
+ endif
+
+-DEPS += libigl eigen
+ SUBDIRS=c_src intl_tools src e3d plugins_src icons
+
+ #
diff --git a/media-gfx/wings/wings-2.3.ebuild b/media-gfx/wings/wings-2.3.ebuild
new file mode 100644
index 000000000000..a822318d4c2a
--- /dev/null
+++ b/media-gfx/wings/wings-2.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >dev-lang/erlang-21[wxwidgets]
+ dev-libs/cl
+ media-libs/glu
+ media-libs/libsdl[opengl]
+ virtual/opengl
+ dev-cpp/eigen
+ sci-libs/libigl
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${P}-nogit.patch )
+
+src_prepare() {
+ sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die
+ sed -i \
+ -e "s|IGL_INCLUDE = .*$|IGL_INCLUDE=-I/usr/include/eigen3|" \
+ c_src/Makefile \
+ || die
+ default
+}
+
+src_compile() {
+ export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+ tc-export CC
+ # Work around parallel make issues
+ # Set ER_LIBS to the top source directory
+ emake vsn.mk
+ for subdir in intl_tools e3d src plugins_src icons; do
+ emake -C ${subdir} opt ERL_LIBS="${S}"
+ done
+ default
+}
+
+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 priv psd shaders src textures tools
+
+ newbin "${FILESDIR}"/wings.sh-r1 wings
+ dodoc AUTHORS
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-20 11:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-12 8:37 [gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2016-07-02 11:28 Jeroen Roovers
2016-10-17 13:49 Jeroen Roovers
2016-11-18 22:20 Jeroen Roovers
2024-10-20 11:31 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox