* [gentoo-commits] repo/gentoo:master commit in: media-libs/libxspf/, media-libs/libxspf/files/
@ 2018-01-12 22:17 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-01-12 22:17 UTC (permalink / raw
To: gentoo-commits
commit: ad2999b9867ced55409b0a23860de10a637468c4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 20:28:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 22:16:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2999b9
media-libs/libxspf: Drop USE=doc, depends on qthelp:4
Closes: https://bugs.gentoo.org/398881
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch | 8 ++---
media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch | 4 +--
media-libs/libxspf/libxspf-1.2.0.ebuild | 42 +++++++++++-----------
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
index fa16b589df3..668e8af1be1 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/261604
---- test/OfficialSuite.cpp
-+++ test/OfficialSuite.cpp
+--- a/test/OfficialSuite.cpp
++++ b/test/OfficialSuite.cpp
@@ -21,6 +21,7 @@
* Sebastian Pipping, sping@xiph.org
*/
@@ -10,8 +10,8 @@ http://bugs.gentoo.org/261604
#include "OfficialSuite.h"
#include <xspf/XspfReaderCallback.h>
using namespace Xspf;
---- test/ProjectOpus/ProjectOpusSuite.cpp
-+++ test/ProjectOpus/ProjectOpusSuite.cpp
+--- a/test/ProjectOpus/ProjectOpusSuite.cpp
++++ b/test/ProjectOpus/ProjectOpusSuite.cpp
@@ -21,6 +21,7 @@
* Sebastian Pipping, sping@xiph.org
*/
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
index b408416e7ef..76c0dca755f 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/421745
---- examples/read/read.cpp
-+++ examples/read/read.cpp
+--- a/examples/read/read.cpp
++++ b/examples/read/read.cpp
@@ -43,6 +43,7 @@
#include <cstdio>
#include <cstdlib> // MAX_PATH
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
index a7c71fb4d12..fa7f0ecfa6f 100644
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit eutils
+EAPI=6
+
+inherit xdg-utils
DESCRIPTION="Playlist handling library"
HOMEPAGE="http://libspiff.sourceforge.net/"
@@ -11,38 +12,39 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
LICENSE="BSD LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc static-libs test"
+IUSE="static-libs test"
-RDEPEND=">=dev-libs/expat-2
+RDEPEND="
+ >=dev-libs/expat-2
>=dev-libs/uriparser-0.7.5"
DEPEND="${RDEPEND}
virtual/pkgconfig
- doc? (
- >=app-doc/doxygen-1.5.8
- media-gfx/graphviz
- dev-qt/qthelp:4
- )
test? ( >=dev-util/cpptest-1.1 )"
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc44.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gcc44.patch \
- "${FILESDIR}"/${P}-gcc47.patch
+ default
+ xdg_environment_reset
+
+ # do not install missing files
+ sed -e 's/gif,//' -i doc/Makefile* \
+ -i bindings/c/doc/Makefile* || die "sed failed"
}
src_configure() {
- export XDG_CONFIG_HOME="${T}" #398881#c2
-
econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --disable-doc \
$(use_enable static-libs static) \
- $(use_enable test) \
- $(use_enable doc)
+ $(use_enable test)
}
src_install() {
default
- prune_libtool_files
+ find "${D}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libxspf/, media-libs/libxspf/files/
@ 2021-07-01 8:49 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-07-01 8:49 UTC (permalink / raw
To: gentoo-commits
commit: 1f27c5cc49e81078ddff50f13679e7a693ec9337
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 1 08:49:19 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jul 1 08:49:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f27c5cc
media-libs/libxspf: removed obsolete 1.2.0-r1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/libxspf/Manifest | 1 -
.../libxspf/files/libxspf-1.2.0-autotools.patch | 191 ---------------------
media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch | 22 ---
media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch | 12 --
media-libs/libxspf/libxspf-1.2.0-r1.ebuild | 46 -----
5 files changed, 272 deletions(-)
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index 84cfb9edf43..4fbd4368c9e 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,2 +1 @@
-DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
DIST libxspf-1.2.1.tar.bz2 479581 BLAKE2B dccae0d88af421e869034ca5fa5c1306bfdfb0d4c6bf6e5d555cfcbb1ac6032e64d6bbd6fe7e4d6a7c0d51fe10a5dbb74fc0f8ba1e7e30ced4a961add3d5a3cc SHA512 e2ac7c56fe71536c198caffac654056c48c619ca0b8bd97905d564ec7aebb60e74b3cdc94b3a2ae3ca6f195fd56034e0483503dc091f1f4d5808d72d086d2613
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch b/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
deleted file mode 100644
index 93a4c1c7f2e..00000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
+++ /dev/null
@@ -1,191 +0,0 @@
---- a/bindings/c/doc/configure.ac
-+++ b/bindings/c/doc/configure.ac
-@@ -1,8 +1,8 @@
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(Doxyfile.in)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([../../../build-aux])
--AM_INIT_AUTOMAKE(xspf_c-doc, 1.2.0)
-+AM_INIT_AUTOMAKE
-
-
- ## Doxygen
---- a/bindings/c/doc/Makefile.am
-+++ b/bindings/c/doc/Makefile.am
-@@ -28,7 +28,7 @@
- ## Install doc files
- install-data-local:
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
- $(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,16 +1,15 @@
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(src/XspfReader.cpp)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE(libxspf, 1.2.0)
-+AM_INIT_AUTOMAKE
-
--AC_PROG_LIBTOOL
--AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_CXX
- PKG_PROG_PKG_CONFIG
-
- AC_HEADER_STDC
-+LT_INIT
-
-
-
-@@ -29,40 +28,6 @@
-
-
-
--# Expat
--AC_ARG_WITH(expat, [
--===========================================================================
--Extra options:
--AS_HELP_STRING([--with-expat=DIR], [override path of Expat])
--AS_HELP_STRING([], [("/lib" and "/include" is appended)]
--)], [
-- if test "x${withval}" = "x"; then
-- AC_MSG_ERROR([No path given for option --with-expat])
-- fi
-- LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-- CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
--], [])
--
--AC_ARG_WITH(expat-inc, [AS_HELP_STRING(
-- [--with-expat-inc=DIR], [override include path of Expat]
--)], [
-- if test "x${withval}" = "x"; then
-- AC_MSG_ERROR([No path given for option --with-expat-inc])
-- fi
-- CPPFLAGS="-I${withval} ${CPPFLAGS}"
--], [])
--
--AC_ARG_WITH(expat-lib, [AS_HELP_STRING(
-- [--with-expat-lib=DIR], [override library path of Expat]
--)], [
-- if test "x${withval}" = "x"; then
-- AC_MSG_ERROR([No path given for option --with-expat-lib])
-- fi
-- LDFLAGS="-L${withval} ${LDFLAGS}"
--], [])
--
--
--
- # uriparser
- AC_ARG_WITH(uriparser, [AS_HELP_STRING(
- [--with-uriparser=DIR], [override path of uriparser])
-@@ -110,29 +75,8 @@
-
-
-
--# Local headers must come very first. Otherwise we
--# risk including headers of an already installed
--# libxspf version if its path is in CPPFLAGS
--CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
--
--
--
--# Append $prefix as a fallback at the very end
--if test "x${prefix}" != "xNONE"; then
-- WORKING_PREFIX=${prefix}
--else
-- WORKING_PREFIX=${ac_default_prefix}
--fi
--LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
--CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
--
--
--
- # Check presence
--EXPAT_MISSING="Please install expat 1.95.8 or later.
-- On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
--AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
--AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
-+PKG_CHECK_MODULES([EXPAT], [expat])
-
- PKG_CHECK_MODULES([URIPARSER], [
- liburiparser >= 0.7.5
---- a/doc/configure.ac
-+++ b/doc/configure.ac
-@@ -1,8 +1,8 @@
- ## Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(Doxyfile.in)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([../build-aux])
--AM_INIT_AUTOMAKE(libxspf-doc, 1.2.0)
-+AM_INIT_AUTOMAKE
-
-
- ## Doxygen
-@@ -30,7 +30,6 @@
- fi
- AC_SUBST(GENERATE_HTMLHELP)
- AC_SUBST(QHG_LOCATION)
--AC_SUBST(srcdir, [${ac_abs_confdir}])
-
-
- AC_CONFIG_FILES([
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -26,7 +26,7 @@
- ## Install doc files
- install-data-local:
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
- $(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,8 +1,10 @@
- ## Process this file with automake to produce Makefile.in
--AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects
-+AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 subdir-objects
-
- ACLOCAL_AMFLAGS = -I m4
-
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
- if GENERATE_DOC
- SUBDIRS = \
- . \
-@@ -39,9 +41,10 @@
- endif
-
-
--libxspf_la_CFLAGS = @URIPARSER_CFLAGS@
-+libxspf_la_CFLAGS = $(URIPARSER_CFLAGS) $(EXPAT_CFLAGS)
-+libxspf_la_LIBADD = $(URIPARSER_LIBS) $(EXPAT_LIBS)
-
--libxspf_la_LDFLAGS = @URIPARSER_LIBS@ -version-info 4:1:0
-+libxspf_la_LDFLAGS = -version-info 4:1:0
-
- libxspf_la_SOURCES = \
- src/XspfChunkCallback.cpp \
-@@ -146,11 +149,9 @@
- if XSPF_TEST_ENABLED
- test_xspf_test_CFLAGS = @CPPTEST_CFLAGS@
-
--test_xspf_test_LDFLAGS = @CPPTEST_LIBS@
--
--test_xspf_test_LDADD = libxspf.la
-+test_xspf_test_LDADD = libxspf.la @CPPTEST_LIBS@
-
--test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\"
-+test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\" -I$(top_srcdir)/include
-
- test_xspf_test_SOURCES = \
- test/ProjectOpus/ProjectOpusSuite.cpp \
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
deleted file mode 100644
index 668e8af1be1..00000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/261604
-
---- a/test/OfficialSuite.cpp
-+++ b/test/OfficialSuite.cpp
-@@ -21,6 +21,7 @@
- * Sebastian Pipping, sping@xiph.org
- */
-
-+#include <cstdio>
- #include "OfficialSuite.h"
- #include <xspf/XspfReaderCallback.h>
- using namespace Xspf;
---- a/test/ProjectOpus/ProjectOpusSuite.cpp
-+++ b/test/ProjectOpus/ProjectOpusSuite.cpp
-@@ -21,6 +21,7 @@
- * Sebastian Pipping, sping@xiph.org
- */
-
-+#include <cstdio>
- #include "ProjectOpusSuite.h"
- #include <xspf/XspfReader.h>
- #include <xspf/XspfTrack.h>
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
deleted file mode 100644
index 76c0dca755f..00000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/421745
-
---- a/examples/read/read.cpp
-+++ b/examples/read/read.cpp
-@@ -43,6 +43,7 @@
- #include <cstdio>
- #include <cstdlib> // MAX_PATH
- #include <climits> // PATH_MAX
-+#include <unistd.h> // getcwd
-
-
- #if defined(__WIN32__) || defined(WIN32)
diff --git a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
deleted file mode 100644
index 2d587d5b770..00000000000
--- a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Playlist handling library"
-HOMEPAGE="http://libspiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/expat-2
- >=dev-libs/uriparser-0.7.5"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cpptest-1.1 )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc44.patch
- "${FILESDIR}"/${P}-gcc47.patch
- "${FILESDIR}"/${P}-autotools.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-doc \
- --disable-static \
- $(use_enable test)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-01 8:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-12 22:17 [gentoo-commits] repo/gentoo:master commit in: media-libs/libxspf/, media-libs/libxspf/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-07-01 8:49 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox