1 |
commit: 0c21aa91719e657db66aaa170ae3e0be77e99e50 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 1 21:36:55 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 1 21:52:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c21aa91 |
7 |
|
8 |
media-libs/lib3ds: Drop old 1.x |
9 |
|
10 |
This package almost certainly should have been slotted. It is only |
11 |
required by opencollada now and that expects 2.0.0_rc1. |
12 |
|
13 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
15 |
|
16 |
media-libs/lib3ds/Manifest | 1 - |
17 |
.../lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch | 17 ---- |
18 |
.../lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch | 94 ---------------------- |
19 |
media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild | 24 ------ |
20 |
4 files changed, 136 deletions(-) |
21 |
|
22 |
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest |
23 |
index 3fda88065c6..3c8d779efec 100644 |
24 |
--- a/media-libs/lib3ds/Manifest |
25 |
+++ b/media-libs/lib3ds/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac |
28 |
DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87 |
29 |
|
30 |
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch |
31 |
deleted file mode 100644 |
32 |
index 1455660596b..00000000000 |
33 |
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch |
34 |
+++ /dev/null |
35 |
@@ -1,17 +0,0 @@ |
36 |
-diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c |
37 |
---- lib3ds-1.3.0.orig/lib3ds/mesh.c 2007-06-20 19:04:08.000000000 +0200 |
38 |
-+++ lib3ds-1.3.0/lib3ds/mesh.c 2010-09-14 06:34:39.987807911 +0200 |
39 |
-@@ -87,8 +87,11 @@ |
40 |
- faces=lib3ds_io_read_word(io); |
41 |
- for (i=0; i<faces; ++i) { |
42 |
- index=lib3ds_io_read_word(io); |
43 |
-- ASSERT(index<mesh->faces); |
44 |
-- strcpy(mesh->faceL[index].material, name); |
45 |
-+ if (index<mesh->faces) { |
46 |
-+ strncpy(mesh->faceL[index].material, name, 64); |
47 |
-+ } else { |
48 |
-+ // TODO warning |
49 |
-+ } |
50 |
- } |
51 |
- } |
52 |
- break; |
53 |
|
54 |
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch |
55 |
deleted file mode 100644 |
56 |
index 41f658e5311..00000000000 |
57 |
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch |
58 |
+++ /dev/null |
59 |
@@ -1,94 +0,0 @@ |
60 |
-diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in |
61 |
---- lib3ds-1.2.0.orig/lib3ds-config.in 2000-05-23 14:13:08.000000000 +0200 |
62 |
-+++ lib3ds-1.2.0/lib3ds-config.in 2007-10-21 06:37:48.000000000 +0200 |
63 |
-@@ -1,9 +1,5 @@ |
64 |
- #!/bin/sh |
65 |
- |
66 |
--prefix=@prefix@ |
67 |
--exec_prefix=@exec_prefix@ |
68 |
--exec_prefix_set=no |
69 |
-- |
70 |
- usage() |
71 |
- { |
72 |
- cat <<EOF |
73 |
-@@ -22,6 +18,8 @@ |
74 |
- usage 1 1>&2 |
75 |
- fi |
76 |
- |
77 |
-+PKG_CONFIG_ARGS= |
78 |
-+ |
79 |
- while test $# -gt 0; do |
80 |
- case "$1" in |
81 |
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; |
82 |
-@@ -30,23 +28,23 @@ |
83 |
- |
84 |
- case $1 in |
85 |
- --prefix=*) |
86 |
-- prefix=$optarg |
87 |
-+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg" |
88 |
- if test $exec_prefix_set = no ; then |
89 |
-- exec_prefix=$optarg |
90 |
-+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" |
91 |
- fi |
92 |
- ;; |
93 |
- --prefix) |
94 |
- echo_prefix=yes |
95 |
- ;; |
96 |
- --exec-prefix=*) |
97 |
-- exec_prefix=$optarg |
98 |
-+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg" |
99 |
- exec_prefix_set=yes |
100 |
- ;; |
101 |
- --exec-prefix) |
102 |
- echo_exec_prefix=yes |
103 |
- ;; |
104 |
- --version) |
105 |
-- echo @LIB3DS_VERSION@ |
106 |
-+ pkg-config --modversion lib3ds |
107 |
- ;; |
108 |
- --cflags) |
109 |
- echo_cflags=yes |
110 |
-@@ -62,23 +60,18 @@ |
111 |
- done |
112 |
- |
113 |
- if test "$echo_prefix" = "yes"; then |
114 |
-- echo $prefix |
115 |
-+ pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds |
116 |
- fi |
117 |
- |
118 |
- if test "$echo_exec_prefix" = "yes"; then |
119 |
-- echo $exec_prefix |
120 |
-+ pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds |
121 |
- fi |
122 |
- |
123 |
- if test "$echo_cflags" = "yes"; then |
124 |
-- if test @includedir@ != /usr/include ; then |
125 |
-- echo -I@includedir@ |
126 |
-- fi |
127 |
-+ pkg-config $PKG_CONFIG_ARGS --cflags lib3ds |
128 |
- fi |
129 |
- |
130 |
- if test "$echo_libs" = "yes"; then |
131 |
-- if test @libdir@ != /usr/lib ; then |
132 |
-- my_linker_flags="-L@libdir@" |
133 |
-- fi |
134 |
-- echo ${my_linker_flags} -l3ds |
135 |
--fi |
136 |
-+ pkg-config $PKG_CONFIG_ARGS --libs lib3ds |
137 |
-+fi |
138 |
- |
139 |
-diff -uNr lib3ds-1.2.0.orig/lib3ds.pc.in lib3ds-1.2.0/lib3ds.pc.in |
140 |
---- lib3ds-1.2.0.orig/lib3ds.pc.in 1970-01-01 01:00:00.000000000 +0100 |
141 |
-+++ lib3ds-1.2.0/lib3ds.pc.in 2007-10-21 06:23:53.000000000 +0200 |
142 |
-@@ -0,0 +1,11 @@ |
143 |
-+prefix=@prefix@ |
144 |
-+exec_prefix=@exec_prefix@ |
145 |
-+libdir=@libdir@ |
146 |
-+includedir=@includedir@ |
147 |
-+ |
148 |
-+Name: lib3ds |
149 |
-+Description: lib3ds |
150 |
-+Version: @VERSION@ |
151 |
-+Requires: |
152 |
-+Libs: -L${libdir} -l3ds -lm |
153 |
-+Cflags: -I${includedir} |
154 |
|
155 |
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild |
156 |
deleted file mode 100644 |
157 |
index 6bdace88421..00000000000 |
158 |
--- a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild |
159 |
+++ /dev/null |
160 |
@@ -1,24 +0,0 @@ |
161 |
-# Copyright 1999-2014 Gentoo Foundation |
162 |
-# Distributed under the terms of the GNU General Public License v2 |
163 |
- |
164 |
-EAPI="5" |
165 |
- |
166 |
-inherit autotools-utils |
167 |
- |
168 |
-DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files" |
169 |
-HOMEPAGE="https://code.google.com/p/lib3ds/" |
170 |
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip" |
171 |
- |
172 |
-LICENSE="LGPL-2.1" |
173 |
-SLOT="0" |
174 |
-KEYWORDS="amd64 ppc ppc64 x86" |
175 |
-IUSE="static-libs" |
176 |
- |
177 |
-RDEPEND="media-libs/freeglut |
178 |
- virtual/opengl" |
179 |
-DEPEND="${RDEPEND} |
180 |
- app-arch/unzip" |
181 |
-PATCHES=( |
182 |
- "${FILESDIR}/lib3ds-1.3.0-r1-pkgconfig.patch" |
183 |
- "${FILESDIR}/lib3ds-1.3.0-r1-mesh.c.patch" |
184 |
-) |