1 |
commit: 1f27c5cc49e81078ddff50f13679e7a693ec9337 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 1 08:49:19 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 1 08:49:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f27c5cc |
7 |
|
8 |
media-libs/libxspf: removed obsolete 1.2.0-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
media-libs/libxspf/Manifest | 1 - |
14 |
.../libxspf/files/libxspf-1.2.0-autotools.patch | 191 --------------------- |
15 |
media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch | 22 --- |
16 |
media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch | 12 -- |
17 |
media-libs/libxspf/libxspf-1.2.0-r1.ebuild | 46 ----- |
18 |
5 files changed, 272 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest |
21 |
index 84cfb9edf43..4fbd4368c9e 100644 |
22 |
--- a/media-libs/libxspf/Manifest |
23 |
+++ b/media-libs/libxspf/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491 |
26 |
DIST libxspf-1.2.1.tar.bz2 479581 BLAKE2B dccae0d88af421e869034ca5fa5c1306bfdfb0d4c6bf6e5d555cfcbb1ac6032e64d6bbd6fe7e4d6a7c0d51fe10a5dbb74fc0f8ba1e7e30ced4a961add3d5a3cc SHA512 e2ac7c56fe71536c198caffac654056c48c619ca0b8bd97905d564ec7aebb60e74b3cdc94b3a2ae3ca6f195fd56034e0483503dc091f1f4d5808d72d086d2613 |
27 |
|
28 |
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch b/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch |
29 |
deleted file mode 100644 |
30 |
index 93a4c1c7f2e..00000000000 |
31 |
--- a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch |
32 |
+++ /dev/null |
33 |
@@ -1,191 +0,0 @@ |
34 |
---- a/bindings/c/doc/configure.ac |
35 |
-+++ b/bindings/c/doc/configure.ac |
36 |
-@@ -1,8 +1,8 @@ |
37 |
- # Process this file with autoconf to produce a configure script. |
38 |
- AC_PREREQ(2.61) |
39 |
--AC_INIT(Doxyfile.in) |
40 |
-+AC_INIT(libxspf, 1.2.0) |
41 |
- AC_CONFIG_AUX_DIR([../../../build-aux]) |
42 |
--AM_INIT_AUTOMAKE(xspf_c-doc, 1.2.0) |
43 |
-+AM_INIT_AUTOMAKE |
44 |
- |
45 |
- |
46 |
- ## Doxygen |
47 |
---- a/bindings/c/doc/Makefile.am |
48 |
-+++ b/bindings/c/doc/Makefile.am |
49 |
-@@ -28,7 +28,7 @@ |
50 |
- ## Install doc files |
51 |
- install-data-local: |
52 |
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local |
53 |
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/" |
54 |
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" |
55 |
- $(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/" |
56 |
- |
57 |
- |
58 |
---- a/configure.ac |
59 |
-+++ b/configure.ac |
60 |
-@@ -1,16 +1,15 @@ |
61 |
- # Process this file with autoconf to produce a configure script. |
62 |
- AC_PREREQ(2.61) |
63 |
--AC_INIT(src/XspfReader.cpp) |
64 |
-+AC_INIT(libxspf, 1.2.0) |
65 |
- AC_CONFIG_AUX_DIR([build-aux]) |
66 |
--AM_INIT_AUTOMAKE(libxspf, 1.2.0) |
67 |
-+AM_INIT_AUTOMAKE |
68 |
- |
69 |
--AC_PROG_LIBTOOL |
70 |
--AC_PROG_INSTALL |
71 |
- AC_PROG_CC |
72 |
- AC_PROG_CXX |
73 |
- PKG_PROG_PKG_CONFIG |
74 |
- |
75 |
- AC_HEADER_STDC |
76 |
-+LT_INIT |
77 |
- |
78 |
- |
79 |
- |
80 |
-@@ -29,40 +28,6 @@ |
81 |
- |
82 |
- |
83 |
- |
84 |
--# Expat |
85 |
--AC_ARG_WITH(expat, [ |
86 |
--=========================================================================== |
87 |
--Extra options: |
88 |
--AS_HELP_STRING([--with-expat=DIR], [override path of Expat]) |
89 |
--AS_HELP_STRING([], [("/lib" and "/include" is appended)] |
90 |
--)], [ |
91 |
-- if test "x${withval}" = "x"; then |
92 |
-- AC_MSG_ERROR([No path given for option --with-expat]) |
93 |
-- fi |
94 |
-- LDFLAGS="-L${withval}/lib ${LDFLAGS}" |
95 |
-- CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |
96 |
--], []) |
97 |
-- |
98 |
--AC_ARG_WITH(expat-inc, [AS_HELP_STRING( |
99 |
-- [--with-expat-inc=DIR], [override include path of Expat] |
100 |
--)], [ |
101 |
-- if test "x${withval}" = "x"; then |
102 |
-- AC_MSG_ERROR([No path given for option --with-expat-inc]) |
103 |
-- fi |
104 |
-- CPPFLAGS="-I${withval} ${CPPFLAGS}" |
105 |
--], []) |
106 |
-- |
107 |
--AC_ARG_WITH(expat-lib, [AS_HELP_STRING( |
108 |
-- [--with-expat-lib=DIR], [override library path of Expat] |
109 |
--)], [ |
110 |
-- if test "x${withval}" = "x"; then |
111 |
-- AC_MSG_ERROR([No path given for option --with-expat-lib]) |
112 |
-- fi |
113 |
-- LDFLAGS="-L${withval} ${LDFLAGS}" |
114 |
--], []) |
115 |
-- |
116 |
-- |
117 |
-- |
118 |
- # uriparser |
119 |
- AC_ARG_WITH(uriparser, [AS_HELP_STRING( |
120 |
- [--with-uriparser=DIR], [override path of uriparser]) |
121 |
-@@ -110,29 +75,8 @@ |
122 |
- |
123 |
- |
124 |
- |
125 |
--# Local headers must come very first. Otherwise we |
126 |
--# risk including headers of an already installed |
127 |
--# libxspf version if its path is in CPPFLAGS |
128 |
--CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}" |
129 |
-- |
130 |
-- |
131 |
-- |
132 |
--# Append $prefix as a fallback at the very end |
133 |
--if test "x${prefix}" != "xNONE"; then |
134 |
-- WORKING_PREFIX=${prefix} |
135 |
--else |
136 |
-- WORKING_PREFIX=${ac_default_prefix} |
137 |
--fi |
138 |
--LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib" |
139 |
--CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include" |
140 |
-- |
141 |
-- |
142 |
-- |
143 |
- # Check presence |
144 |
--EXPAT_MISSING="Please install expat 1.95.8 or later. |
145 |
-- On a Debian-based system enter 'sudo apt-get install libexpat-dev'." |
146 |
--AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING})) |
147 |
--AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING})) |
148 |
-+PKG_CHECK_MODULES([EXPAT], [expat]) |
149 |
- |
150 |
- PKG_CHECK_MODULES([URIPARSER], [ |
151 |
- liburiparser >= 0.7.5 |
152 |
---- a/doc/configure.ac |
153 |
-+++ b/doc/configure.ac |
154 |
-@@ -1,8 +1,8 @@ |
155 |
- ## Process this file with autoconf to produce a configure script. |
156 |
- AC_PREREQ(2.61) |
157 |
--AC_INIT(Doxyfile.in) |
158 |
-+AC_INIT(libxspf, 1.2.0) |
159 |
- AC_CONFIG_AUX_DIR([../build-aux]) |
160 |
--AM_INIT_AUTOMAKE(libxspf-doc, 1.2.0) |
161 |
-+AM_INIT_AUTOMAKE |
162 |
- |
163 |
- |
164 |
- ## Doxygen |
165 |
-@@ -30,7 +30,6 @@ |
166 |
- fi |
167 |
- AC_SUBST(GENERATE_HTMLHELP) |
168 |
- AC_SUBST(QHG_LOCATION) |
169 |
--AC_SUBST(srcdir, [${ac_abs_confdir}]) |
170 |
- |
171 |
- |
172 |
- AC_CONFIG_FILES([ |
173 |
---- a/doc/Makefile.am |
174 |
-+++ b/doc/Makefile.am |
175 |
-@@ -26,7 +26,7 @@ |
176 |
- ## Install doc files |
177 |
- install-data-local: |
178 |
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local |
179 |
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/" |
180 |
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" |
181 |
- $(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/" |
182 |
- |
183 |
- |
184 |
---- a/Makefile.am |
185 |
-+++ b/Makefile.am |
186 |
-@@ -1,8 +1,10 @@ |
187 |
- ## Process this file with automake to produce Makefile.in |
188 |
--AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects |
189 |
-+AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 subdir-objects |
190 |
- |
191 |
- ACLOCAL_AMFLAGS = -I m4 |
192 |
- |
193 |
-+AM_CPPFLAGS = -I$(top_srcdir)/include |
194 |
-+ |
195 |
- if GENERATE_DOC |
196 |
- SUBDIRS = \ |
197 |
- . \ |
198 |
-@@ -39,9 +41,10 @@ |
199 |
- endif |
200 |
- |
201 |
- |
202 |
--libxspf_la_CFLAGS = @URIPARSER_CFLAGS@ |
203 |
-+libxspf_la_CFLAGS = $(URIPARSER_CFLAGS) $(EXPAT_CFLAGS) |
204 |
-+libxspf_la_LIBADD = $(URIPARSER_LIBS) $(EXPAT_LIBS) |
205 |
- |
206 |
--libxspf_la_LDFLAGS = @URIPARSER_LIBS@ -version-info 4:1:0 |
207 |
-+libxspf_la_LDFLAGS = -version-info 4:1:0 |
208 |
- |
209 |
- libxspf_la_SOURCES = \ |
210 |
- src/XspfChunkCallback.cpp \ |
211 |
-@@ -146,11 +149,9 @@ |
212 |
- if XSPF_TEST_ENABLED |
213 |
- test_xspf_test_CFLAGS = @CPPTEST_CFLAGS@ |
214 |
- |
215 |
--test_xspf_test_LDFLAGS = @CPPTEST_LIBS@ |
216 |
-- |
217 |
--test_xspf_test_LDADD = libxspf.la |
218 |
-+test_xspf_test_LDADD = libxspf.la @CPPTEST_LIBS@ |
219 |
- |
220 |
--test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\" |
221 |
-+test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\" -I$(top_srcdir)/include |
222 |
- |
223 |
- test_xspf_test_SOURCES = \ |
224 |
- test/ProjectOpus/ProjectOpusSuite.cpp \ |
225 |
|
226 |
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch |
227 |
deleted file mode 100644 |
228 |
index 668e8af1be1..00000000000 |
229 |
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch |
230 |
+++ /dev/null |
231 |
@@ -1,22 +0,0 @@ |
232 |
-http://bugs.gentoo.org/261604 |
233 |
- |
234 |
---- a/test/OfficialSuite.cpp |
235 |
-+++ b/test/OfficialSuite.cpp |
236 |
-@@ -21,6 +21,7 @@ |
237 |
- * Sebastian Pipping, sping@××××.org |
238 |
- */ |
239 |
- |
240 |
-+#include <cstdio> |
241 |
- #include "OfficialSuite.h" |
242 |
- #include <xspf/XspfReaderCallback.h> |
243 |
- using namespace Xspf; |
244 |
---- a/test/ProjectOpus/ProjectOpusSuite.cpp |
245 |
-+++ b/test/ProjectOpus/ProjectOpusSuite.cpp |
246 |
-@@ -21,6 +21,7 @@ |
247 |
- * Sebastian Pipping, sping@××××.org |
248 |
- */ |
249 |
- |
250 |
-+#include <cstdio> |
251 |
- #include "ProjectOpusSuite.h" |
252 |
- #include <xspf/XspfReader.h> |
253 |
- #include <xspf/XspfTrack.h> |
254 |
|
255 |
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch |
256 |
deleted file mode 100644 |
257 |
index 76c0dca755f..00000000000 |
258 |
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch |
259 |
+++ /dev/null |
260 |
@@ -1,12 +0,0 @@ |
261 |
-http://bugs.gentoo.org/421745 |
262 |
- |
263 |
---- a/examples/read/read.cpp |
264 |
-+++ b/examples/read/read.cpp |
265 |
-@@ -43,6 +43,7 @@ |
266 |
- #include <cstdio> |
267 |
- #include <cstdlib> // MAX_PATH |
268 |
- #include <climits> // PATH_MAX |
269 |
-+#include <unistd.h> // getcwd |
270 |
- |
271 |
- |
272 |
- #if defined(__WIN32__) || defined(WIN32) |
273 |
|
274 |
diff --git a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild |
275 |
deleted file mode 100644 |
276 |
index 2d587d5b770..00000000000 |
277 |
--- a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild |
278 |
+++ /dev/null |
279 |
@@ -1,46 +0,0 @@ |
280 |
-# Copyright 1999-2021 Gentoo Authors |
281 |
-# Distributed under the terms of the GNU General Public License v2 |
282 |
- |
283 |
-EAPI=7 |
284 |
- |
285 |
-inherit autotools |
286 |
- |
287 |
-DESCRIPTION="Playlist handling library" |
288 |
-HOMEPAGE="http://libspiff.sourceforge.net/" |
289 |
-SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2" |
290 |
- |
291 |
-LICENSE="BSD LGPL-2.1" |
292 |
-SLOT="0" |
293 |
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
294 |
-IUSE="test" |
295 |
-RESTRICT="!test? ( test )" |
296 |
- |
297 |
-RDEPEND=" |
298 |
- >=dev-libs/expat-2 |
299 |
- >=dev-libs/uriparser-0.7.5" |
300 |
-DEPEND="${RDEPEND} |
301 |
- test? ( >=dev-util/cpptest-1.1 )" |
302 |
-BDEPEND="virtual/pkgconfig" |
303 |
- |
304 |
-PATCHES=( |
305 |
- "${FILESDIR}"/${P}-gcc44.patch |
306 |
- "${FILESDIR}"/${P}-gcc47.patch |
307 |
- "${FILESDIR}"/${P}-autotools.patch |
308 |
-) |
309 |
- |
310 |
-src_prepare() { |
311 |
- default |
312 |
- eautoreconf |
313 |
-} |
314 |
- |
315 |
-src_configure() { |
316 |
- econf \ |
317 |
- --disable-doc \ |
318 |
- --disable-static \ |
319 |
- $(use_enable test) |
320 |
-} |
321 |
- |
322 |
-src_install() { |
323 |
- default |
324 |
- find "${ED}" -name '*.la' -delete || die |
325 |
-} |