diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-sound/herrie | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-sound/herrie')
| -rw-r--r-- | media-sound/herrie/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch | 14 | ||||
| -rw-r--r-- | media-sound/herrie/herrie-2.2-r1.ebuild | 6 |
3 files changed, 13 insertions, 11 deletions
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest index c32387b398ad..78c7fffbca17 100644 --- a/media-sound/herrie/Manifest +++ b/media-sound/herrie/Manifest @@ -1,6 +1,6 @@ -AUX herrie-2.2-fix-buildsystem.patch 1183 BLAKE2B fc3752e625b75d50f0aa3c72bcf73879c57eb9caa929b68520475eb7d0dedb5217badf5c3ead7cc41be9001864c6a3916de1afbbdddbd7c125319322d8c26c13 SHA512 474d9ed85589e6bb6f640389d76d035e506434a7ae8ce8e11fe620e4b27cbe124edae797ed34e0e06c80b3ad594f7420103e9e73ce1d3ac9297b7982c8144738 +AUX herrie-2.2-fix-buildsystem.patch 1132 BLAKE2B af945efc12c6ab5604fada1e7d123d7fcfdd0c319b36a73a04ba90c574c895bb4caaff8d78b9fe0deb5b1ba0a440eee977a7fbe446b6ab5d9fa30be68ec5b0be SHA512 250d5f75a48a3fc5a0ece1f7a33d2b066f9ceb16d96a98b3b6cdf28168561ae221a2ab3c13501f4dcd0a7d169ed325c27dd78799c459458da1be121677c84937 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213 -EBUILD herrie-2.2-r1.ebuild 1832 BLAKE2B 2b43836390c97a1415f11268e9b0f08a38549a4596cac0f65a8b7042f2977c8a8408c75ddb0da320de1cae177f76c2962ead87a70dbf536470742c98d16ade03 SHA512 e08c98b79cb238770b4fa37acebffe41298034e36b4e54e0c8746c918ac13514fa91c346ac557ec2fdae32342f367c29c7053aa18855698e0ce81031991a7352 +EBUILD herrie-2.2-r1.ebuild 1845 BLAKE2B dcdb0be2847093b640388237398fabb82fb78be71be1b9346ae69eff613a931232a5d65cc5e972fc977ac529c28704d16c7e4829fecea5d829731ba45fc9103c SHA512 7bf9151d124a66e005dd58b65c1523b58ad6c3a5a5a4dea71b455f1b4adae4f9658bb5fafd493de02acd94d9abef885640c6d960c6dbba4cc969a7bfdfb9024c MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3 diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch index 03a2c7397da8..ce01e5c0c6ed 100644 --- a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch +++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch @@ -3,19 +3,19 @@ Fix ncurses underlinking by using the pkg-config output instead of assuming directive. See also: https://bugs.gentoo.org/show_bug.cgi?id=573522 ---- herrie-2.2/configure -+++ herrie-2.2/configure +--- a/configure ++++ b/configure @@ -215,7 +215,7 @@ exit 1 fi CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\"" -LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB" -+LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`" ++LDFLAGS="$LDFLAGS -L$PREFIX/lib `${PKG_CONFIG} --libs $CFG_CURSES_LIB`" SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \ gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \ playq_xmms vfs vfs_playlist vfs_regular" ---- herrie-2.2/src/audio_format_modplug.c -+++ herrie-2.2/src/audio_format_modplug.c +--- a/src/audio_format_modplug.c ++++ b/src/audio_format_modplug.c @@ -31,7 +31,7 @@ #include "stdinc.h" @@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=573522 #include "audio_file.h" #include "audio_format.h" ---- herrie-2.2/src/main.c -+++ herrie-2.2/src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -165,7 +165,7 @@ #endif /* CLOSE_STDERR */ if ((errmsg = vfs_lockup()) != NULL) { diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild index b54555ffc4fc..d50e37ef8671 100644 --- a/media-sound/herrie/herrie-2.2-r1.ebuild +++ b/media-sound/herrie/herrie-2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Herrie is a command line music player" HOMEPAGE="http://herrie.info/" @@ -52,6 +52,8 @@ src_configure() { use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis" use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf" + tc-export PKG_CONFIG + einfo "./configure ${EXTRA_CONF}" CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \ ./configure ${EXTRA_CONF} || die "configure failed" |