1 |
commit: 7ade71dda7a3415dc63134e2491578733c008e44 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 6 20:45:39 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 7 09:15:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ade71dd |
7 |
|
8 |
media-libs/openctm: Drop 1.0.3 (r0), EAPI5-- |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/openctm/Manifest | 1 - |
14 |
.../openctm/files/openctm-fix-makefiles.patch | 191 --------------------- |
15 |
media-libs/openctm/files/openctm-no-strip.patch | 34 ---- |
16 |
media-libs/openctm/openctm-1.0.3.ebuild | 45 ----- |
17 |
4 files changed, 271 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest |
20 |
index 2ec444b8cda..91c50b4afff 100644 |
21 |
--- a/media-libs/openctm/Manifest |
22 |
+++ b/media-libs/openctm/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e |
25 |
-DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 BLAKE2B 446fedc14e646b7cfc0aaac2d4f9b224482d74bf4faadd866b7121392e3863e3e42fe57f35654d4e9d7c056b3b8069dfb4668660d97ce7266d7850026654a88c SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6 |
26 |
|
27 |
diff --git a/media-libs/openctm/files/openctm-fix-makefiles.patch b/media-libs/openctm/files/openctm-fix-makefiles.patch |
28 |
deleted file mode 100644 |
29 |
index 540b3cfa84f..00000000000 |
30 |
--- a/media-libs/openctm/files/openctm-fix-makefiles.patch |
31 |
+++ /dev/null |
32 |
@@ -1,191 +0,0 @@ |
33 |
- Makefile.linux | 18 ++++++++------- |
34 |
- lib/Makefile.linux | 23 ++++++++++++------- |
35 |
- tools/Makefile.linux | 64 ++++++++++++++++++++-------------------------------- |
36 |
- 3 files changed, 50 insertions(+), 55 deletions(-) |
37 |
- |
38 |
-diff --git a/Makefile.linux b/Makefile.linux |
39 |
-index 24ca137..51fc88c 100644 |
40 |
---- a/Makefile.linux |
41 |
-+++ b/Makefile.linux |
42 |
-@@ -47,19 +47,21 @@ documentation: |
43 |
- |
44 |
- |
45 |
- # Installation settings |
46 |
--LIBDIR = /usr/lib/ |
47 |
--INCDIR = /usr/local/include/ |
48 |
--BINDIR = /usr/local/bin/ |
49 |
--MAN1DIR = /usr/local/share/man/man1/ |
50 |
--CP = cp |
51 |
-+LIBDIR = $(DESTDIR)/usr/@GENTOO_LIBDIR@/$(DEB_HOST_MULTIARCH) |
52 |
-+INCDIR = $(DESTDIR)/usr/include/ |
53 |
-+BINDIR = $(DESTDIR)/usr/bin/ |
54 |
-+MAN1DIR = $(DESTDIR)/usr/share/man/man1/ |
55 |
-+CP = cp -P |
56 |
- MKDIR = mkdir -p |
57 |
- |
58 |
--install: |
59 |
-- $(CP) lib/libopenctm.so $(LIBDIR) |
60 |
-+$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR): |
61 |
-+ mkdir -p "$@" |
62 |
-+ |
63 |
-+install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR) |
64 |
-+ $(CP) lib/libopenctm.so* $(LIBDIR) |
65 |
- $(CP) lib/openctm.h $(INCDIR) |
66 |
- $(CP) lib/openctmpp.h $(INCDIR) |
67 |
- $(CP) tools/ctmconv $(BINDIR) |
68 |
- $(CP) tools/ctmviewer $(BINDIR) |
69 |
-- $(MKDIR) $(MAN1DIR) |
70 |
- $(CP) doc/ctmconv.1 $(MAN1DIR) |
71 |
- $(CP) doc/ctmviewer.1 $(MAN1DIR) |
72 |
-diff --git a/lib/Makefile.linux b/lib/Makefile.linux |
73 |
-index 7643127..1e622ec 100644 |
74 |
---- a/lib/Makefile.linux |
75 |
-+++ b/lib/Makefile.linux |
76 |
-@@ -27,13 +27,18 @@ |
77 |
- ############################################################################### |
78 |
- |
79 |
- LZMADIR = liblzma |
80 |
--CC = gcc |
81 |
--CFLAGS = -O3 -W -Wall -c -fPIC -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM -std=c99 -pedantic |
82 |
--CFLAGS_LZMA = -O3 -W -Wall -c -fPIC -DLZMA_PREFIX_CTM -std=c99 -pedantic |
83 |
-+CC ?= gcc |
84 |
-+CFLAGS += -W -Wall -c -fPIC -std=c99 -pedantic |
85 |
-+INCDEF = -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM |
86 |
-+INCDEF_LZMA = -DLZMA_PREFIX_CTM |
87 |
- RM = rm -f |
88 |
- DEPEND = $(CPP) -MM |
89 |
- |
90 |
--DYNAMICLIB = libopenctm.so |
91 |
-+VERSION = 1.0.3 |
92 |
-+SOVERSION = 1 |
93 |
-+LIBNAME = libopenctm.so |
94 |
-+SONAME = $(LIBNAME).$(SOVERSION) |
95 |
-+DYNAMICLIB = $(LIBNAME).$(VERSION) |
96 |
- |
97 |
- OBJS = openctm.o \ |
98 |
- stream.o \ |
99 |
-@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \ |
100 |
- all: $(DYNAMICLIB) |
101 |
- |
102 |
- clean: |
103 |
-- $(RM) $(DYNAMICLIB) $(OBJS) $(LZMA_OBJS) |
104 |
-+ $(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS) |
105 |
- |
106 |
- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS) |
107 |
-- gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm |
108 |
-+ $(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm |
109 |
-+ ln -s $(DYNAMICLIB) $(SONAME) |
110 |
-+ ln -s $(DYNAMICLIB) $(LIBNAME) |
111 |
- |
112 |
- %.o: %.c |
113 |
-- $(CC) $(CFLAGS) $< |
114 |
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF) $< |
115 |
- |
116 |
- %.o: $(LZMADIR)/%.c |
117 |
-- $(CC) $(CFLAGS_LZMA) $< |
118 |
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF_LZMA) $< |
119 |
- |
120 |
- depend: |
121 |
- $(DEPEND) $(SRCS) $(LZMA_SRCS) > make.depend |
122 |
-diff --git a/tools/Makefile.linux b/tools/Makefile.linux |
123 |
-index fa3e6e5..46276d1 100644 |
124 |
---- a/tools/Makefile.linux |
125 |
-+++ b/tools/Makefile.linux |
126 |
-@@ -26,49 +26,50 @@ |
127 |
- ############################################################################### |
128 |
- |
129 |
- OPENCTMDIR = ../lib |
130 |
--GLEWDIR = glew |
131 |
--JPEGDIR = jpeg |
132 |
-+# Use system libs if possible |
133 |
-+#GLEWDIR = glew |
134 |
-+GLEWDIR = /usr/include/GL |
135 |
-+#JPEGDIR = jpeg |
136 |
- RPLYDIR = rply |
137 |
--TINYXMLDIR = tinyxml |
138 |
--ZLIBDIR = zlib |
139 |
--PNGLITEDIR = pnglite |
140 |
-+# rply in libvxl1-dev is version 1.1, we need v. 1.01 |
141 |
-+#RPLYDIR = /usr/include/vxl/rply |
142 |
-+#TINYXMLDIR = tinyxml |
143 |
-+#ZLIBDIR = zlib |
144 |
-+#PNGLITEDIR = pnglite |
145 |
- |
146 |
--CPP = g++ |
147 |
--CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR) |
148 |
-+CXX ?= g++ |
149 |
-+CC ?= gcc |
150 |
-+CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR) |
151 |
- |
152 |
- MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o |
153 |
- CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS) |
154 |
--CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o glew.o pnglite.o $(MESHOBJS) |
155 |
-+CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o $(MESHOBJS) |
156 |
- CTMBENCHOBJS = ctmbench.o systimer.o |
157 |
- |
158 |
- all: ctmconv ctmviewer ctmbench |
159 |
- |
160 |
- clean: |
161 |
- rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h |
162 |
-- cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean |
163 |
-- cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean |
164 |
-- cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean |
165 |
- |
166 |
--libopenctm.so: $(OPENCTMDIR)/libopenctm.so |
167 |
-- cp $< $@ |
168 |
-+ctmconv: $(CTMCONVOBJS) |
169 |
-+ $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml |
170 |
- |
171 |
--ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so |
172 |
-- $(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml |
173 |
-+ctmviewer: $(CTMVIEWEROBJS) |
174 |
-+ $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \ |
175 |
-+ -ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \ |
176 |
-+ -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 |
177 |
- |
178 |
--ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so |
179 |
-- $(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut `pkg-config --libs gtk+-2.0` |
180 |
-- |
181 |
--ctmbench: $(CTMBENCHOBJS) libopenctm.so |
182 |
-- $(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm |
183 |
-+ctmbench: $(CTMBENCHOBJS) |
184 |
-+ $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm |
185 |
- |
186 |
- %.o: %.cpp |
187 |
-- $(CPP) $(CPPFLAGS) -o $@ $< |
188 |
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< |
189 |
- |
190 |
- ctmconv.o: ctmconv.cpp systimer.h convoptions.h mesh.h meshio.h |
191 |
- ctmviewer.o: ctmviewer.cpp common.h image.h systimer.h sysdialog.h mesh.h meshio.h phong_vert.h phong_frag.h icons/icon_open.h icons/icon_save.h icons/icon_help.h |
192 |
- ctmbench.o: ctmbench.cpp systimer.h |
193 |
- common.o: common.cpp common.h |
194 |
--image.o: image.cpp image.h common.h $(JPEGDIR)/libjpeg.a |
195 |
-+image.o: image.cpp image.h common.h |
196 |
- systimer.o: systimer.cpp systimer.h |
197 |
- sysdialog_gtk.o: sysdialog_gtk.cpp sysdialog.h |
198 |
- convoptions.o: convoptions.cpp convoptions.h |
199 |
-@@ -91,22 +92,7 @@ phong_frag.h: phong.frag bin2c |
200 |
- ./bin2c phong.frag phongFragSrc > $@ |
201 |
- |
202 |
- bin2c: bin2c.cpp |
203 |
-- $(CPP) -Os -W -Wall -o $@ $< |
204 |
-- |
205 |
--$(JPEGDIR)/libjpeg.a: |
206 |
-- cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a |
207 |
-- |
208 |
--$(ZLIBDIR)/libz.a: |
209 |
-- cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux |
210 |
-- |
211 |
--glew.o: $(GLEWDIR)/glew.c |
212 |
-- gcc -c -Os -W -I$(GLEWDIR) -o $@ $< |
213 |
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $< |
214 |
- |
215 |
- rply.o: $(RPLYDIR)/rply.c |
216 |
-- gcc -c -O2 -W -I$(RPLYDIR) -o $@ $< |
217 |
-- |
218 |
--pnglite.o: $(PNGLITEDIR)/pnglite.c |
219 |
-- gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $< |
220 |
-- |
221 |
--$(TINYXMLDIR)/libtinyxml.a: |
222 |
-- cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux |
223 |
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $< |
224 |
|
225 |
diff --git a/media-libs/openctm/files/openctm-no-strip.patch b/media-libs/openctm/files/openctm-no-strip.patch |
226 |
deleted file mode 100644 |
227 |
index 5e31d4017b6..00000000000 |
228 |
--- a/media-libs/openctm/files/openctm-no-strip.patch |
229 |
+++ /dev/null |
230 |
@@ -1,34 +0,0 @@ |
231 |
-diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux |
232 |
---- OpenCTM-1.0.3.old/lib/Makefile.linux 2014-08-20 09:39:00.614744990 +0200 |
233 |
-+++ OpenCTM-1.0.3/lib/Makefile.linux 2014-08-20 09:40:09.782667989 +0200 |
234 |
-@@ -72,7 +72,7 @@ |
235 |
- $(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS) |
236 |
- |
237 |
- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS) |
238 |
-- $(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm |
239 |
-+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm |
240 |
- ln -s $(DYNAMICLIB) $(SONAME) |
241 |
- ln -s $(DYNAMICLIB) $(LIBNAME) |
242 |
- |
243 |
-diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux |
244 |
---- OpenCTM-1.0.3.old/tools/Makefile.linux 2014-08-20 09:39:00.583745025 +0200 |
245 |
-+++ OpenCTM-1.0.3/tools/Makefile.linux 2014-08-20 09:40:09.751668023 +0200 |
246 |
-@@ -52,15 +52,15 @@ |
247 |
- rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h |
248 |
- |
249 |
- ctmconv: $(CTMCONVOBJS) |
250 |
-- $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml |
251 |
-+ $(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml |
252 |
- |
253 |
- ctmviewer: $(CTMVIEWEROBJS) |
254 |
-- $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \ |
255 |
-+ $(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \ |
256 |
- -ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \ |
257 |
- -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 |
258 |
- |
259 |
- ctmbench: $(CTMBENCHOBJS) |
260 |
-- $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm |
261 |
-+ $(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm |
262 |
- |
263 |
- %.o: %.cpp |
264 |
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< |
265 |
|
266 |
diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild |
267 |
deleted file mode 100644 |
268 |
index c257f62436f..00000000000 |
269 |
--- a/media-libs/openctm/openctm-1.0.3.ebuild |
270 |
+++ /dev/null |
271 |
@@ -1,45 +0,0 @@ |
272 |
-# Copyright 1999-2020 Gentoo Authors |
273 |
-# Distributed under the terms of the GNU General Public License v2 |
274 |
- |
275 |
-EAPI=5 |
276 |
- |
277 |
-inherit eutils multilib versionator flag-o-matic toolchain-funcs |
278 |
- |
279 |
-MY_PV=OpenCTM-${PV} |
280 |
- |
281 |
-DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh." |
282 |
-HOMEPAGE="http://openctm.sourceforge.net" |
283 |
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}+dfsg1.orig.tar.bz2" |
284 |
- |
285 |
-LICENSE="GPL-2" |
286 |
-SLOT="0" |
287 |
-KEYWORDS="~amd64 ~x86" |
288 |
-IUSE="" |
289 |
- |
290 |
-DEPEND="dev-libs/tinyxml |
291 |
- media-libs/freeglut |
292 |
- media-libs/glew |
293 |
- media-libs/pnglite |
294 |
- virtual/opengl |
295 |
- x11-libs/gtk+:2" |
296 |
-RDEPEND="${DEPEND}" |
297 |
- |
298 |
-S="${WORKDIR}/${MY_PV}" |
299 |
- |
300 |
-src_prepare() { |
301 |
- epatch \ |
302 |
- "${FILESDIR}"/openctm-fix-makefiles.patch \ |
303 |
- "${FILESDIR}"/openctm-no-strip.patch |
304 |
- mv Makefile.linux Makefile || die |
305 |
- sed \ |
306 |
- -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ |
307 |
- -i Makefile || die |
308 |
-} |
309 |
- |
310 |
-src_compile() { |
311 |
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) |
312 |
-} |
313 |
- |
314 |
-src_install() { |
315 |
- emake DESTDIR="${ED}" install |
316 |
-} |