* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/files/, media-sound/ncmpcpp/
@ 2021-05-17 6:53 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2021-05-17 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 73d4e7caa588c4c4528096d49801eda0f023613b
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 06:51:30 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 17 06:53:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d4e7ca
media-sound/ncmpcpp: Drop old
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-sound/ncmpcpp/Manifest | 2 -
.../ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch | 26 ---------
media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild | 65 ----------------------
media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild | 62 ---------------------
4 files changed, 155 deletions(-)
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 582cf8e9639..59fd0197c5d 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,3 +1 @@
-DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-DIST ncmpcpp-0.9.1.tar.bz2 474436 BLAKE2B 89f6a6d68baf54b0a0eca6d3df96dcd5bcd1346e6f93d0a580f2fbbe4b4246218b62e5332f3db2567c9a91ee30ceb367039a328fa7f491c2a756c2c03fed76c3 SHA512 8fa9f512ac09c144eab4e4721a9c54f3f411593fe13c26db12fbaa3ccf6b08d7cd54923e1e4148b2db45dc69431280611b2be2d153513c0d38eaf92af8ceb9fb
DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
deleted file mode 100644
index 466abceecfe..00000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Sat, 9 May 2020 14:31:52 +0200
-Subject: [PATCH] Fix build with GCC 10 by adding missing include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following error:
-./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
----
- src/mpdpp.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mpdpp.h b/src/mpdpp.h
-index a2bb79eb..abd3666c 100644
---- a/src/mpdpp.h
-+++ b/src/mpdpp.h
-@@ -25,6 +25,7 @@
- #include <exception>
- #include <random>
- #include <set>
-+#include <stdexcept>
- #include <vector>
-
- #include <mpd/client.h>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
deleted file mode 100644
index ae5b5d47d37..00000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
- !dev-libs/boost:0/1.57.0
- >=media-libs/libmpdclient-2.1
- dev-libs/boost:=[icu,nls,threads]
- dev-libs/icu:=
- net-misc/curl
- sys-libs/ncurses:=[unicode]
- sys-libs/readline:*
- taglib? ( media-libs/taglib )
- visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}"/${P}-gcc10.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
- sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
- econf \
- $(use_enable clock) \
- $(use_enable outputs) \
- $(use_enable visualizer) \
- $(use_with taglib) \
- $(use_with visualizer fftw)
-}
-
-src_install() {
- default
-
- dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files have been installed at"
- elog "${EROOT}/usr/share/doc/${PF}"
- elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
- elog "as user configuration files."
- echo
- if use visualizer; then
- elog "If you want to use the visualizer, you need mpd with fifo enabled."
- echo
- fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
deleted file mode 100644
index b5189ed2730..00000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
- !dev-libs/boost:0/1.57.0
- >=media-libs/libmpdclient-2.1
- dev-libs/boost:=[icu,nls,threads]
- dev-libs/icu:=
- net-misc/curl
- sys-libs/ncurses:=[unicode]
- sys-libs/readline:*
- taglib? ( media-libs/taglib )
- visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- default
-
- sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
- sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
- econf \
- $(use_enable clock) \
- $(use_enable outputs) \
- $(use_enable visualizer) \
- $(use_with taglib) \
- $(use_with visualizer fftw)
-}
-
-src_install() {
- default
-
- dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files have been installed at"
- elog "${EROOT}/usr/share/doc/${PF}"
- elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
- elog "as user configuration files."
- echo
- if use visualizer; then
- elog "If you want to use the visualizer, you need mpd with fifo enabled."
- echo
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/files/, media-sound/ncmpcpp/
@ 2022-11-11 21:57 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2022-11-11 21:57 UTC (permalink / raw
To: gentoo-commits
commit: ae090334ebdca9d0e905ea6fee6c25fca021af51
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 21:56:20 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 21:56:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae090334
media-sound/ncmpcpp: Patch to fix cross-compiling of 0.9.2
Avoids use of taglib-config. Sent upstream but not merged yet. May merge soon so
leaving out of 9999.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch | 56 ++++++++++++++++++
media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild | 71 +++++++++++++++++++++++
2 files changed, 127 insertions(+)
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
new file mode 100644
index 000000000000..3a3c55e923d9
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
@@ -0,0 +1,56 @@
+From 8796a4469795dfb067d02e19ddb3ae380d9b2fc3 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Thu, 10 Nov 2022 23:58:33 +0000
+Subject: [PATCH] Check for taglib with pkg-config before trying taglib-config
+
+Programs like taglib-config are not good when cross-compiling.
+---
+ configure.ac | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ef0c52b7..193840e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -257,19 +257,30 @@ PKG_CHECK_MODULES([libcurl], [libcurl], [
+
+ # taglib
+ if test "$taglib" != "no" ; then
+- AC_PATH_PROG(TAGLIB_CONFIG, taglib-config)
+- if test "$TAGLIB_CONFIG" != "" ; then
+- CPPFLAGS="$CPPFLAGS `$TAGLIB_CONFIG --cflags`"
+- LIBS="$LIBS `$TAGLIB_CONFIG --libs`"
++ PKG_CHECK_MODULES([taglib], [taglib], [
++ AC_SUBST(taglib_CFLAGS)
++ AC_SUBST(taglib_LIBS)
++ ], [
++ AC_PATH_PROG([TAGLIB_CONFIG], [taglib-config])
++ if test "$TAGLIB_CONFIG" != ""; then
++ taglib_CFLAGS=`$TAGLIB_CONFIG --cflags`
++ taglib_LIBS=`$TAGLIB_CONFIG --libs`
++ else
++ if test "$taglib" = "yes" ; then
++ AC_MSG_ERROR([could not find taglib.pc or taglib-config executable])
++ fi
++ fi
++ ])
++
++ if test "$TAGLIB_CONFIG$taglib_LIBS" != "" ; then
++ CPPFLAGS="$CPPFLAGS $taglib_CFLAGS"
++ LIBS="$LIBS $taglib_LIBS"
++
+ AC_CHECK_HEADERS([taglib.h], ,
+ if test "$taglib" = "yes" ; then
+ AC_MSG_ERROR([missing taglib.h header])
+ fi
+ )
+- else
+- if test "$taglib" = "yes" ; then
+- AC_MSG_ERROR([taglib-config executable is missing])
+- fi
+ fi
+ fi
+
+--
+2.38.1
+
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
new file mode 100644
index 000000000000..4c09ce6aed9e
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock lto outputs taglib visualizer"
+
+RDEPEND="
+ >=media-libs/libmpdclient-2.1
+ dev-libs/boost:=[icu,nls]
+ dev-libs/icu:=
+ net-misc/curl
+ sys-libs/ncurses:=[unicode(+)]
+ sys-libs/readline:=
+ taglib? ( media-libs/taglib )
+ visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-taglib-pc.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+
+ sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+ sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+ filter-flags '-flto*'
+
+ econf \
+ $(use_enable clock) \
+ $(use_enable outputs) \
+ $(use_enable visualizer) \
+ $(use_with lto) \
+ $(use_with taglib) \
+ $(use_with visualizer fftw)
+}
+
+src_install() {
+ default
+
+ dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+ echo
+ elog "Example configuration files have been installed at"
+ elog "${EROOT}/usr/share/doc/${PF}"
+ elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+ elog "as user configuration files."
+ echo
+ if use visualizer; then
+ elog "If you want to use the visualizer, you need mpd with fifo enabled."
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-11 21:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-11 21:57 [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/files/, media-sound/ncmpcpp/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2021-05-17 6:53 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox