1 |
commit: f5fb3bbbabcb12914894e6cd21dc84f929a11bc8 |
2 |
Author: Jonathan Vasquez <jvasquez1011 <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Oct 24 01:26:47 2016 +0000 |
4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 31 14:19:29 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fb3bbb |
7 |
|
8 |
dev-tcltk/tcl3d version bump to 0.5.0 and added x86 support |
9 |
|
10 |
Gentoo-Bug: 469304,514300 |
11 |
|
12 |
dev-tcltk/tcl3d/Manifest | 1 + |
13 |
...tcl3d-0.5.0-include-tk-dir-and-permissive.patch | 72 ++++++++++++++++++++++ |
14 |
dev-tcltk/tcl3d/metadata.xml | 1 + |
15 |
dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 71 +++++++++++++++++++++ |
16 |
4 files changed, 145 insertions(+) |
17 |
|
18 |
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest |
19 |
index a5c60e4..a1f72dd 100644 |
20 |
--- a/dev-tcltk/tcl3d/Manifest |
21 |
+++ b/dev-tcltk/tcl3d/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST tcl3d-src-0.4.0.zip 1501305 SHA256 f98bee3c2ca0189780125b683481949e1499018ee56ad1d21b4e3e594e058496 SHA512 a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5 WHIRLPOOL cbc1982df7a28b93249ff7877d0376b06b64261bb33f3df8c64b2c80600684529605b9eeff6f593c2e9f7c64c253066b226f0a0dae9cee21bec980f6782c7777 |
24 |
+DIST tcl3d-src-0.5.0.zip 3936271 SHA256 a2ecccbdb9c87fd02a7b969cc02abbf43aa51e619bd79e08dbffb8e376b6957c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29 WHIRLPOOL b2a1f3d81be1bed6476652bc6fd4ed2dd3bd85a2b895c950a1298f6ed998b05f0ac02937233f352bf794818112e114f22b3d2123c99be7a6458e464ee33e1604 |
25 |
|
26 |
diff --git a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch |
27 |
new file mode 100644 |
28 |
index 00000000..58efa18 |
29 |
--- /dev/null |
30 |
+++ b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch |
31 |
@@ -0,0 +1,72 @@ |
32 |
+diff -ru tcl3d/config_Linux tcl3d-m/config_Linux |
33 |
+--- tcl3d/config_Linux 2010-08-30 15:57:56.000000000 -0400 |
34 |
++++ tcl3d-m/config_Linux 2016-10-30 13:28:34.080601812 -0400 |
35 |
+@@ -74,6 +74,8 @@ |
36 |
+ TKINCDIR = $(TKDIR)/include |
37 |
+ TCLLIBDIR = $(TCLDIR)/lib |
38 |
+ TKLIBDIR = $(TKDIR)/lib |
39 |
++TCLLIBINCDIR = $(TCLLIBDIR)/tcl$(TCLVERSION)/include |
40 |
++TKLIBINCDIR = $(TCLLIBDIR)/tk$(TCLVERSION)/include |
41 |
+ TCLSTUBLIBS = $(TKLIBDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtclstub$(TCLVERSION)$(LIBEXT) |
42 |
+ TCLSTDLIBS = $(TKLIBDIR)/libtk$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtcl$(TCLVERSION)$(LIBEXT) |
43 |
+ TCLSH = tclsh$(TCLVERSION) |
44 |
+@@ -84,7 +86,13 @@ |
45 |
+ CPDIR = csh -f cpdir |
46 |
+ MKDIR = mkdir -p |
47 |
+ |
48 |
+-INCL = -I. -I$(TCLINCDIR) |
49 |
++INCL = \ |
50 |
++ -I. \ |
51 |
++ -I$(TCLINCDIR) \ |
52 |
++ -I$(TCLLIBINCDIR)/generic \ |
53 |
++ -I$(TCLLIBINCDIR)/unix \ |
54 |
++ -I$(TKLIBINCDIR)/generic \ |
55 |
++ -I$(TKLIBINCDIR)/unix |
56 |
+ |
57 |
+ ifdef WITH_STUBS |
58 |
+ TCLLIBS = $(TCLSTUBLIBS) |
59 |
+diff -ru tcl3d/config_Linux64 tcl3d-m/config_Linux64 |
60 |
+--- tcl3d/config_Linux64 2010-12-30 16:06:48.000000000 -0500 |
61 |
++++ tcl3d-m/config_Linux64 2016-10-30 13:08:33.326771912 -0400 |
62 |
+@@ -74,6 +74,8 @@ |
63 |
+ TKINCDIR = $(TKDIR)/include |
64 |
+ TCLLIBDIR = $(TCLDIR)/lib64 |
65 |
+ TKLIBDIR = $(TKDIR)/lib64 |
66 |
++TCLLIBINCDIR = $(TCLLIBDIR)/tcl$(TCLVERSION)/include |
67 |
++TKLIBINCDIR = $(TCLLIBDIR)/tk$(TCLVERSION)/include |
68 |
+ TCLSTUBLIBS = $(TKLIBDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtclstub$(TCLVERSION)$(LIBEXT) |
69 |
+ TCLSTDLIBS = $(TKLIBDIR)/libtk$(TCLVERSION)$(SHLIBEXT) $(TCLLIBDIR)/libtcl$(TCLVERSION)$(SHLIBEXT) |
70 |
+ TCLSH = tclsh$(TCLVERSION) |
71 |
+@@ -84,7 +86,13 @@ |
72 |
+ CPDIR = csh -f cpdir |
73 |
+ MKDIR = mkdir -p |
74 |
+ |
75 |
+-INCL = -I. -I$(TCLINCDIR) |
76 |
++INCL = \ |
77 |
++ -I. \ |
78 |
++ -I$(TCLINCDIR) \ |
79 |
++ -I$(TCLLIBINCDIR)/generic \ |
80 |
++ -I$(TCLLIBINCDIR)/unix \ |
81 |
++ -I$(TKLIBINCDIR)/generic \ |
82 |
++ -I$(TKLIBINCDIR)/unix |
83 |
+ |
84 |
+ ifdef WITH_STUBS |
85 |
+ TCLLIBS = $(TCLSTUBLIBS) |
86 |
+diff -ru tcl3d/tcl3dOsg/Makefile tcl3d-m/tcl3dOsg/Makefile |
87 |
+--- tcl3d/tcl3dOsg/Makefile 2010-09-30 16:20:28.000000000 -0400 |
88 |
++++ tcl3d-m/tcl3dOsg/Makefile 2016-10-30 13:12:53.367593401 -0400 |
89 |
+@@ -308,12 +308,13 @@ |
90 |
+ OPT += /Od |
91 |
+ endif |
92 |
+ CFLAGS = $(OPT) $(PPDEFS) -I$(GL_INCDIR) -Iinclude $(INCL) |
93 |
++CXXFLAGS = -fpermissive |
94 |
+ |
95 |
+ .SUFFIXES: # Delete the default suffixes. |
96 |
+ .SUFFIXES: .cpp $(OBJEXT) .h # Install our own suffixes. |
97 |
+ |
98 |
+ .cpp$(OBJEXT): |
99 |
+- $(CXX) $(CFLAGS) $< |
100 |
++ $(CXX) $(CFLAGS) $(CXXFLAGS) $< |
101 |
+ |
102 |
+ all: osg osganimation osgdb osgfx osgga osgmanipulator osgopenthreads \ |
103 |
+ osgparticle osgsim osgshadow osgterrain osgtext osgutil osgviewer \ |
104 |
|
105 |
diff --git a/dev-tcltk/tcl3d/metadata.xml b/dev-tcltk/tcl3d/metadata.xml |
106 |
index 5ae050b..851c8cb 100644 |
107 |
--- a/dev-tcltk/tcl3d/metadata.xml |
108 |
+++ b/dev-tcltk/tcl3d/metadata.xml |
109 |
@@ -20,6 +20,7 @@ tcl3dSDL Wrapper for the Simple DirectMedia Library. |
110 |
tcl3dFTGL Wrapper for the OpenGL Font Rendering Library. |
111 |
tcl3dGl2ps Wrapper for the OpenGL To Postscript library. * |
112 |
tcl3dOde Wrapper for the Open Dynamics Engine. |
113 |
+tcl3dOsg Wrapper for OpenSceneGraph |
114 |
tcl3dGauges Tcl3D package for displaying gauges. |
115 |
</longdescription> |
116 |
</pkgmetadata> |
117 |
|
118 |
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild |
119 |
new file mode 100644 |
120 |
index 00000000..fd106fc |
121 |
--- /dev/null |
122 |
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild |
123 |
@@ -0,0 +1,71 @@ |
124 |
+# Copyright 1999-2016 Gentoo Foundation |
125 |
+# Distributed under the terms of the GNU General Public License v2 |
126 |
+# $Id$ |
127 |
+ |
128 |
+EAPI=6 |
129 |
+ |
130 |
+inherit flag-o-matic toolchain-funcs |
131 |
+ |
132 |
+DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries" |
133 |
+HOMEPAGE="http://www.tcl3d.org" |
134 |
+SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip" |
135 |
+ |
136 |
+LICENSE="BSD" |
137 |
+SLOT="0" |
138 |
+KEYWORDS="~amd64 ~x86" |
139 |
+IUSE="debug" |
140 |
+ |
141 |
+DEPEND=" |
142 |
+ >=dev-lang/swig-1.3.38:0= |
143 |
+ dev-lang/tk:0= |
144 |
+ dev-lang/tcl:0= |
145 |
+ dev-games/ode |
146 |
+ dev-games/openscenegraph |
147 |
+ media-libs/libsdl |
148 |
+ media-libs/ftgl |
149 |
+ virtual/opengl |
150 |
+ x11-libs/libXmu |
151 |
+" |
152 |
+ |
153 |
+S="${WORKDIR}/${PN}" |
154 |
+PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" ) |
155 |
+ |
156 |
+src_prepare() { |
157 |
+ default |
158 |
+ |
159 |
+ local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') ) |
160 |
+ local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}" |
161 |
+ |
162 |
+ einfo "Configuring for Tcl ${_TCL_FV}" |
163 |
+ sed -i \ |
164 |
+ -e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${_TCL_V[0]}':' \ |
165 |
+ -e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${_TCL_V[1]}':' \ |
166 |
+ config_Linux* || die |
167 |
+ |
168 |
+ # Fix libSDL link |
169 |
+ sed -i -e 's:-lSDL-1\.2:-lSDL:g' tcl3dSDL/Makefile || die |
170 |
+} |
171 |
+ |
172 |
+src_compile() { |
173 |
+ append-flags -fPIC |
174 |
+ use debug || append-flags -DNDEBUG |
175 |
+ |
176 |
+ # Restricting build to -j1 since it seems that if we build it in parallel, |
177 |
+ # it fails with the "tcl3dOsg" project attempting to import glewdefs.i, |
178 |
+ # and not finding it. |
179 |
+ emake \ |
180 |
+ -j1 \ |
181 |
+ INSTDIR="/usr" \ |
182 |
+ OPT="${CFLAGS}" \ |
183 |
+ CC="$(tc-getCC) -c" \ |
184 |
+ CXX="$(tc-getCXX) -c" \ |
185 |
+ LD="$(tc-getLD)" \ |
186 |
+ WRAP_FTGL=1 \ |
187 |
+ WRAP_SDL=1 \ |
188 |
+ WRAP_GL2PS=0 \ |
189 |
+ WRAP_ODE=1 |
190 |
+} |
191 |
+ |
192 |
+src_install() { |
193 |
+ emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install |
194 |
+} |